torrus, RT#10574

7 files changed, 292 insertions, 2 deletions

diff --git a/FS/FS/part_pkg/torrus_Common.pm b/FS/FS/part_pkg/torrus_Common.pm
index 229a0c3..d34f724 100644
--- a/FS/FS/part_pkg/torrus_Common.pm
+++ b/FS/FS/part_pkg/torrus_Common.pm
@@ -28,13 +28,13 @@ sub calc_usage {
   my $self = shift;
   my($cust_pkg, $sdate, $details, $param ) = @_;
 
-  my $serviceid = 'TESTING_1'; #XXX from svc_port (loop?)
-
   my $rep_id = 2; #XXX find the one matching the timeframe
   #SELECT id FROM WHERE reportname = 'MonthlyUsage' AND rep_date = ''
 
   #XXX abort if ! iscomplete?
 
+  my $serviceid = 'TESTING_1'; #XXX from svc_port (loop?)
+
   my $sql = "
     SELECT value FROM reportfields
       WHERE rep_id = $rep_id
diff --git a/FS/FS/part_pkg/torrus_bw_percentile.pm b/FS/FS/part_pkg/torrus_bw_percentile.pm
new file mode 100644
index 0000000..7cf254a
--- /dev/null
+++ b/FS/FS/part_pkg/torrus_bw_percentile.pm
@@ -0,0 +1,32 @@
+package FS::part_pkg::torrus_bw_percentile;
+
+use strict;
+use base qw( FS::part_pkg::torrus_Common );
+use List::Util qw(max);
+
+our %info = (
+  'name'      => '95th percentile billing based on the integrated Torrus NMS',
+  'shortname' => 'Bandwidth (95th percentile)',
+  'weight'    => 54.5, #:/
+  'inherit_fields' => [ 'flat', 'global_Mixin' ],
+  'fields' => {
+    #'recur_temporality' => { 'hidden' => 1, 'value' => 'preceding' }, #XXX do
+    'recur_temporality' => { 'disabled' => 1 },
+    'sync_bill_date'    => { 'disabled' => 1 },
+    'cutoff_day'        => { 'disabled' => 1 },
+    'base_mbps'         => { 'name'    => 'Included megabytes/sec (95th percentile)',
+                             'default' => 0,
+                           },
+    'mbps_rate'         => { 'name'    => 'Charge per megabyte/sec (95th percentile)',
+                             'default' => 0,
+                           },
+  },
+  'fieldorder' => [ qw( base_mbps mbps_rate ) ],
+  'freq' => 'm',
+);
+
+sub _torrus_name { '95TH_PERCENTILE'; }
+sub _torrus_base { 'base_mbps'; }
+sub _torrus_rate { 'mbps_rate'; }
+
+1;
diff --git a/FS/FS/part_pkg/torrus_bw_usage.pm b/FS/FS/part_pkg/torrus_bw_usage.pm
new file mode 100644
index 0000000..5ce2005
--- /dev/null
+++ b/FS/FS/part_pkg/torrus_bw_usage.pm
@@ -0,0 +1,32 @@
+package FS::part_pkg::torrus_bw_usage;
+
+use strict;
+use base qw( FS::part_pkg::torrus_Common );
+use List::Util qw(max);
+
+our %info = (
+  'name'      => 'Volume billing based on the integrated Torrus NMS',
+  'shortname' => 'Bandwidth (volume)',
+  'weight'    => 54.7, #:/
+  'inherit_fields' => [ 'flat', 'global_Mixin' ],
+  'fields' => {
+    #'recur_temporality' => { 'hidden' => 1, 'value' => 'preceding' }, #XXX do
+    'recur_temporality' => { 'disabled' => 1 },
+    'sync_bill_date'    => { 'disabled' => 1 },
+    'cutoff_day'        => { 'disabled' => 1 },
+    'base_gb'           => { 'name'    => 'Included gigabytes',
+                             'default' => 0,
+                           },
+    'gb_rate'           => { 'name'    => 'Charge per gigabyte',
+                             'default' => 0,
+                           },
+  },
+  'fieldorder' => [ qw( base_gb gb_rate ) ],
+  'freq' => 'm',
+);
+
+sub _torrus_name { 'VOLUME'; }
+sub _torrus_base { 'base_gb'; }
+sub _torrus_rate { 'gb_rate'; }
+
+1;
diff --git a/FS/FS/svc_port.pm b/FS/FS/svc_port.pm
new file mode 100644
index 0000000..931880e
--- /dev/null
+++ b/FS/FS/svc_port.pm
@@ -0,0 +1,212 @@
+package FS::svc_port;
+
+use strict;
+use base qw( FS::svc_Common );
+#use FS::Record qw( qsearch qsearchs );
+use FS::cust_svc;
+
+=head1 NAME
+
+FS::svc_port - Object methods for svc_port records
+
+=head1 SYNOPSIS
+
+  use FS::svc_port;
+
+  $record = new FS::svc_port \%hash;
+  $record = new FS::svc_port { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+  $error = $record->suspend;
+
+  $error = $record->unsuspend;
+
+  $error = $record->cancel;
+
+=head1 DESCRIPTION
+
+An FS::svc_port object represents a router port.  FS::table_name inherits from
+FS::svc_Common.  The following fields are currently supported:
+
+=over 4
+
+=item svcnum - 
+
+=item serviceid - Torrus serviceid (in srvexport and reportfields tables)
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new port.  To add the port to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'svc_port'; }
+
+sub table_info {
+  {
+    'name' => 'Port',
+    #'name_plural' => 'Ports', #optional,
+    #'longname_plural' => 'Ports', #optional
+    'sorts' => [ 'svcnum', 'serviceid' ], # optional sort field (or arrayref of sort fields, main first)
+    'display_weight' => 75,
+    'cancel_weight'  => 10,
+    'fields' => {
+      'serviceid'         => 'Torrus serviceid',
+    },
+  };
+}
+
+=item search_sql STRING
+
+Class method which returns an SQL fragment to search for the given string.
+
+=cut
+
+#or something more complicated if necessary
+sub search_sql {
+  my($class, $string) = @_;
+  $class->search_sql_field('serviceid', $string);
+}
+
+=item label
+
+Returns a meaningful identifier for this port
+
+=cut
+
+sub label {
+  my $self = shift;
+  $self->serviceid; #or something more complicated if necessary
+}
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
+
+=cut
+
+sub insert {
+  my $self = shift;
+  my $error;
+
+  $error = $self->SUPER::insert;
+  return $error if $error;
+
+  '';
+}
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+sub delete {
+  my $self = shift;
+  my $error;
+
+  $error = $self->SUPER::delete;
+  return $error if $error;
+
+  '';
+}
+
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace {
+  my ( $new, $old ) = ( shift, shift );
+  my $error;
+
+  $error = $new->SUPER::replace($old);
+  return $error if $error;
+
+  '';
+}
+
+=item suspend
+
+Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item unsuspend
+
+Called by the unsuspend method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item cancel
+
+Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
+
+=item check
+
+Checks all fields to make sure this is a valid port.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and repalce methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $x = $self->setfixed;
+  return $x unless ref($x);
+  my $part_svc = $x;
+
+  my $error = $self->ut_textn('serviceid'); #too lenient?
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=item
+
+Returns a PNG graph for this port.
+
+XXX Options
+
+=cut
+
+sub graph_png {
+  my $self = shift;
+  my $serviceid = $self->serviceid;
+
+
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::svc_Common>, L<FS::Record>, L<FS::cust_svc>, L<FS::part_svc>,
+L<FS::cust_pkg>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index f6d6602..cdb2851 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -552,3 +552,7 @@ FS/part_pkg_vendor.pm
 t/part_pkg_vendor.t
 FS/cust_note_class.pm
 t/cust_note_class.t
+FS/svc_port.pm
+t/svc_port.t
+FS/h_svc_port.pm
+t/h_svc_port.t
diff --git a/FS/t/h_svc_port.t b/FS/t/h_svc_port.t
new file mode 100644
index 0000000..c75d203
--- /dev/null
+++ b/FS/t/h_svc_port.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::h_svc_port;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/svc_port.t b/FS/t/svc_port.t
new file mode 100644
index 0000000..d6f2691
--- /dev/null
+++ b/FS/t/svc_port.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::svc_port;
+$loaded=1;
+print "ok 1\n";