diff options
author | Mark Wells <mark@freeside.biz> | 2016-03-10 01:20:21 -0800 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2016-03-10 01:20:49 -0800 |
commit | 5a9a411b980edea1b0f9690fc92e3b93574ee974 (patch) | |
tree | ef7133da8ea9bf680c6b9a5913dba44cff6191a5 /FS | |
parent | efad6767531821f6796e193a53aed4d2981cb983 (diff) |
add svc_fiber circuit id field, OLT sites, and other improvements, #35260
Diffstat (limited to 'FS')
-rw-r--r-- | FS/FS/Mason.pm | 1 | ||||
-rw-r--r-- | FS/FS/Schema.pm | 24 | ||||
-rw-r--r-- | FS/FS/fiber_olt.pm | 32 | ||||
-rw-r--r-- | FS/FS/olt_site.pm | 106 | ||||
-rw-r--r-- | FS/FS/svc_fiber.pm | 18 | ||||
-rw-r--r-- | FS/MANIFEST | 2 | ||||
-rw-r--r-- | FS/t/olt_site.t | 5 |
7 files changed, 181 insertions, 7 deletions
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm index ff0baee..3a00f42 100644 --- a/FS/FS/Mason.pm +++ b/FS/FS/Mason.pm @@ -408,6 +408,7 @@ if ( -e $addl_handler_use_file ) { use FS::password_history; use FS::svc_fiber; use FS::fiber_olt; + use FS::olt_site; # Sammath Naur if ( $FS::Mason::addl_handler_use ) { diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index aa0bcd7..97ef89c 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -6899,8 +6899,9 @@ sub tables_hashref { 'ont_typenum', 'int', 'NULL', '', '', '', 'ont_serial', 'varchar', 'NULL', $char_d, '', '', 'ont_port', 'varchar', 'NULL', 16, '', '', + 'circuit_id', 'varchar', 'NULL', $char_d, '', '', 'vlan', 'int', 'NULL', '', '', '', - 'signal', 'int', 'NULL', '', '', '', + 'signal', 'decimal', 'NULL', '10,2', '', '', 'speed_up', 'int', 'NULL', '', '', '', 'speed_down', 'int', 'NULL', '', '', '', 'ont_install','varchar', 'NULL', $char_d, '', '', @@ -6926,14 +6927,35 @@ sub tables_hashref { 'columns' => [ 'oltnum', 'serial', '', '', '', '', 'oltname', 'varchar', '', $char_d, '', '', + 'sitenum', 'int', '', '', '', '', 'serial', 'varchar', '', $char_d, '', '', 'disabled', 'char', 'NULL', 1, '', '', ], 'primary_key' => 'oltnum', 'unique' => [ ], 'index' => [ ], + 'foreign_keys' => [ + { columns => [ 'sitenum' ], + table => 'olt_site', + }, + ], }, + 'olt_site' => { + 'columns' => [ + 'sitenum', 'serial', '', '', '', '', + 'market', 'varchar', '', $char_d, '', '', + 'site', 'varchar', '', $char_d, '', '', + ], + 'primary_key' => 'sitenum', + 'unique' => [ [ 'market', 'site' ] ], + 'index' => [ ], + }, + + + + + 'vend_main' => { 'columns' => [ 'vendnum', 'serial', '', '', '', '', diff --git a/FS/FS/fiber_olt.pm b/FS/FS/fiber_olt.pm index a0de38d..a9a46ef 100644 --- a/FS/FS/fiber_olt.pm +++ b/FS/FS/fiber_olt.pm @@ -3,6 +3,7 @@ use base qw( FS::Record ); use strict; use FS::Record qw( qsearch qsearchs ); +use FS::olt_site; =head1 NAME @@ -37,6 +38,8 @@ FS::Record. The following fields are currently supported: =item serial - serial number +=item sitenum - the L<FS::olt_site> where this OLT is installed + =item disabled - set to 'Y' to make this OLT unavailable for new connections =back @@ -87,6 +90,7 @@ sub check { $self->ut_numbern('oltnum') || $self->ut_text('oltname') || $self->ut_text('serial') + || $self->ut_foreign_keyn('sitenum', 'olt_site', 'sitenum') || $self->ut_flag('disabled') ; return $error if $error; @@ -94,11 +98,37 @@ sub check { $self->SUPER::check; } +=item site_description + +Returns the OLT's site description. + +=cut + +sub site_description { + my $self = shift; + return '' if !$self->sitenum; + my $olt_site = FS::olt_site->by_key($self->sitenum); + return $olt_site->description; +} + +=item description + +Returns the OLT's site name and unit name. + +=cut + +sub description { + my $self = shift; + my $desc = $self->oltname; + $desc = $self->site_description . '/' . $desc if $self->sitenum; + return $desc; +} + =back =head1 SEE ALSO -L<FS::svc_fiber>, L<FS::Record> +L<FS::svc_fiber>, L<FS::olt_site>, L<FS::Record> =cut diff --git a/FS/FS/olt_site.pm b/FS/FS/olt_site.pm new file mode 100644 index 0000000..1c826f8 --- /dev/null +++ b/FS/FS/olt_site.pm @@ -0,0 +1,106 @@ +package FS::olt_site; + +use strict; +use base qw( FS::Record ); +use FS::Record qw( qsearch qsearchs ); + +=head1 NAME + +FS::olt_site - Object methods for olt_site records + +=head1 SYNOPSIS + + use FS::olt_site; + + $record = new FS::olt_site \%hash; + $record = new FS::olt_site { 'column' => 'value' }; + + $error = $record->insert; + + $error = $new_record->replace($old_record); + + $error = $record->delete; + + $error = $record->check; + +=head1 DESCRIPTION + +An FS::olt_site object represents a central office housing Optical Line +Terminals (L<FS::fiber_olt>). FS::olt_site inherits from +FS::Record. The following fields are currently supported: + +=over 4 + +=item sitenum - primary key + +=item market - market designator, indicating the general area the site serves + +=item site - site designator + +=back + +=head1 METHODS + +=over 4 + +=item new HASHREF + +Creates a new record. To add the record to the database, see L<"insert">. + +=cut + +sub table { 'olt_site'; } + +=item insert + +Adds this record to the database. If there is an error, returns the error, +otherwise returns false. + +=item delete + +Delete this record from the database. + +=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. + +=item check + +Checks all fields to make sure this is a valid example. If there is +an error, returns the error, otherwise returns false. Called by the insert +and replace methods. + +=cut + +# the check method should currently be supplied - FS::Record contains some +# data checking routines + +sub check { + my $self = shift; + + my $error = + $self->ut_numbern('sitenum') + || $self->ut_text('market') + || $self->ut_text('site') + ; + return $error if $error; + + $self->SUPER::check; +} + +sub description { + my $self = shift; + return $self->market . '/' . $self->site; +} + +=back + +=head1 SEE ALSO + +L<FS::Record>, L<FS::fiber_olt> + +=cut + +1; + diff --git a/FS/FS/svc_fiber.pm b/FS/FS/svc_fiber.pm index c4036dc..c604943 100644 --- a/FS/FS/svc_fiber.pm +++ b/FS/FS/svc_fiber.pm @@ -108,6 +108,13 @@ sub table_info { 'disable_inventory' => 1, 'disable_select' => 1, }, + # ODN circuit + 'circuit_id' => { + 'label' => 'ODN circuit', + 'type' => 'input-fiber_circuit', + 'disable_inventory' => 1, + 'disable_select' => 1, + }, # ONT stuff 'ont_id' => { 'label' => 'ONT #', @@ -180,15 +187,14 @@ sub search_sql { =item label -Returns a description of this fiber service containing the OLT name and -port location, and the ONT serial number. +Returns a description of this fiber service containing the circuit ID +and the ONT serial number. =cut sub label { my $self = shift; - $self->ont_serial . ' @ ' . $self->fiber_olt->oltname . ' ' . - join('-', $self->shelf, $self->card, $self->olt_port); + $self->ont_serial . ' @ ' . $self->circuit_id; } # nothing special for insert, delete, or replace @@ -247,13 +253,15 @@ sub check { || $self->ut_alphan('ont_serial') || $self->ut_alphan('ont_port') || $self->ut_numbern('vlan') - || $self->ut_snumbern('signal') + || $self->ut_sfloatn('signal') || $self->ut_numbern('speed_up') || $self->ut_numbern('speed_down') || $self->ut_textn('ont_install') ; return $error if $error; + $self->set('signal', sprintf('%.2f', $self->get('signal'))); + $self->SUPER::check; } diff --git a/FS/MANIFEST b/FS/MANIFEST index 176fe78..9b30672 100644 --- a/FS/MANIFEST +++ b/FS/MANIFEST @@ -862,3 +862,5 @@ FS/password_history.pm t/password_history.t FS/fiber_olt.pm t/fiber_olt.t +FS/olt_site.pm +t/olt_site.t diff --git a/FS/t/olt_site.t b/FS/t/olt_site.t new file mode 100644 index 0000000..d475da1 --- /dev/null +++ b/FS/t/olt_site.t @@ -0,0 +1,5 @@ +BEGIN { $| = 1; print "1..1\n" } +END {print "not ok 1\n" unless $loaded;} +use FS::olt_site; +$loaded=1; +print "ok 1\n"; |