From 2b968bffd937b19d2314aa5e304fccc8ec1e1350 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 20 May 2009 01:06:41 +0000 Subject: first pass at netsapiens integration, RT#5226 --- FS/FS/part_export/netsapiens.pm | 198 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) create mode 100644 FS/FS/part_export/netsapiens.pm (limited to 'FS/FS/part_export/netsapiens.pm') diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm new file mode 100644 index 0000000..10b53ef --- /dev/null +++ b/FS/FS/part_export/netsapiens.pm @@ -0,0 +1,198 @@ +package FS::part_export::netsapiens; + +use vars qw(@ISA %info); +use URI; +use MIME::Base64; +use Tie::IxHash; +use FS::part_export; + +@ISA = qw(FS::part_export); + +tie my %options, 'Tie::IxHash', + 'login' => { label=>'NetSapiens tac2 API username' }, + 'password' => { label=>'NetSapiens tac2 API password' }, + 'url' => { label=>'NetSapiens tac2 URL' }, + 'domain' => { label=>'NetSapiens Domain' }, +; + +%info = ( + 'svc' => 'svc_phone', + 'desc' => 'Provision phone numbers to NetSapiens', + 'options' => \%options, + 'notes' => <<'END' +Requires installation of +REST::Client +from CPAN. +END +); + +sub rebless { shift; } + +sub ns_command { + my( $self, $method, $command, @args ) = @_; + + eval 'use REST::Client'; + die $@ if $@; + + my $ns = new REST::Client 'host'=>$self->option('url'); + + my $content = $method eq 'PUT' ? $ns->buildQuery( { @args } ) : ''; + $content =~ s/^\?//; + + warn $content; + + my $auth = + encode_base64( $self->option('login'). ':'. $self->option('password') ); + + $ns->$method( $command, $content, { 'Authorization' => "Basic $auth" } ); + + $ns; +} + +sub ns_subscriber { + my($self, $svc_phone) = (shift, shift); + + my $domain = $self->option('domain'); + my $phonenum = $svc_phone->phonenum; + + "/domains_config/$domain/subscriber_config/$phonenum"; +} + +sub ns_create_or_update { + my($self, $svc_phone, $dial_policy) = (shift, shift, shift); + + my $domain = $self->option('domain'); + my $phonenum = $svc_phone->phonenum; + + my( $firstname, $lastname ); + if ( $svc_phone->phone_name =~ /^\s*(\S+)\s+(\S.*\S)\s*$/ ) { + $firstname = $1; + $lastname = $2; + } else { + #deal w/unaudited netsapiens services? + my $cust_main = $svc_phone->cust_svc->cust_pkg->cust_main; + $firstname = $cust_main->get('first'); + $lastname = $cust_main->get('last'); + } + + my $ns = $self->ns_command( 'PUT', $self->ns_subscriber($svc_phone), + 'subscriber_login' => $phonenum.'@'.$domain, + 'firstname' => $firstname, #4? + 'lastname' => $lastname, #5? + 'subscriber_pin' => $svc_phone->pin, #6? + 'dial_plan' => 'Default', #config? #7? + 'dial_policy' => $dial_policy, #8? +#no_answer_timeout30 +# simultaneous_ringyes +# gmt_offset-8 +# aor_schemesip: +# do_not_disturbyes +# email_vmail +# data_limit0 +# screen +# last_update2008-10-01 12:19:01.0 +# domain_diryes +# callid_name[*] +# admin_vmailyes +# subscriber_name +# rcv_broadcast +# directory_order1 +# accept +# rating_required +# date_created2008-02-22 08:38:01 +# message_waiting +# rate +# directory_listingno +# time_zoneUS/Pacific +# forward_no_answeryes +# vmail_sort_lifo +# modeover-capacity +# subscriber_groupn/a +# vmail_say_time +# presenceinactive +# directory_match826 +# language +# forward_busyyes +# callid_nmbr[*] +# vmail +# subscriber_login1007@vbox.netsapiens.com +# rejectyes +# forwardyes +# vmail_say_cidno +# email_address +# greeting_index + ); + + if ( $ns->responseCode !~ /^2/ ) { + return $ns->responseCode. ' '. + join(', ', $self->ns_parse_response( $ns->responseContent ) ); + } + + ''; +} + +sub ns_delete { + my($self, $svc_phone) = (shift, shift); + + my $ns = $self->ns_command( 'DELETE', $self->ns_subscriber($svc_phone) ); + + if ( $ns->responseCode !~ /^2/ ) { + return $ns->responseCode. ' '. + join(', ', $self->ns_parse_response( $ns->responseContent ) ); + } + + ''; + +} + +sub ns_parse_response { + my( $self, $content ) = ( shift, shift ); + + tie my %hash, Tie::IxHash; + #while ( $content =~ s/^.*?

\s*(.+?)<\/b>\s*<(\w+)>(.+?)<\/\2><\/p>//i ) { + while ( $content =~ s/^.*?

\s*(.+?)<\/b>\s*(.+?)\s*<\/p>//is ) { + ( $hash{$1} = $2 ) =~ s/^\s*<(\w+)>(.+?)<\/\1>/$2/is; + } + + #warn $content; #probably useless + + %hash; +} + +sub _export_insert { + my($self, $svc_phone) = (shift, shift); + $self->ns_create_or_update($svc_phone, 'Permit All'); +} + +sub _export_replace { + my( $self, $new, $old ) = (shift, shift, shift); + return "can't change phonenum with NetSapiens (unprovision and reprovision?)" + if $old->phonenum ne $new->phonenum; + $self->_export_insert($new); +} + +sub _export_delete { + my( $self, $svc_phone ) = (shift, shift); + + $self->ns_delete($svc_phone); +} + +sub _export_suspend { + my( $self, $svc_phone ) = (shift, shift); + $self->ns_create_or_udpate($svc_phone, 'Deny'); +} + +sub _export_unsuspend { + my( $self, $svc_phone ) = (shift, shift); + #$self->ns_create_or_update($svc_phone, 'Permit All'); + $self->_export_insert($svc_phone); +} + +sub export_links { + my($self, $svc_phone, $arrayref) = (shift, shift, shift); + #push @$arrayref, qq!!. $svc_phone->username. qq!!; + ''; +} + +1; -- cgit v1.1 From 2fd929f5185673c55f46cca2e8c846c47e7cf959 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 20 May 2009 08:27:39 +0000 Subject: get subscriber deletion working and remove devel cruft, RT#5226 --- FS/FS/part_export/netsapiens.pm | 68 +++++++++-------------------------------- 1 file changed, 15 insertions(+), 53 deletions(-) (limited to 'FS/FS/part_export/netsapiens.pm') diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm index 10b53ef..e19e95c 100644 --- a/FS/FS/part_export/netsapiens.pm +++ b/FS/FS/part_export/netsapiens.pm @@ -29,23 +29,26 @@ END sub rebless { shift; } sub ns_command { - my( $self, $method, $command, @args ) = @_; + my( $self, $method, $command ) = splice(@_,0,3); eval 'use REST::Client'; die $@ if $@; my $ns = new REST::Client 'host'=>$self->option('url'); - my $content = $method eq 'PUT' ? $ns->buildQuery( { @args } ) : ''; - $content =~ s/^\?//; + my @args = ( $command ); - warn $content; + if ( $method eq 'PUT' ) { + my $content = $method eq 'PUT' ? $ns->buildQuery( { @_ } ) : ''; + $content =~ s/^\?//; + push @args, $content; + } my $auth = encode_base64( $self->option('login'). ':'. $self->option('password') ); + push @args, { 'Authorization' => "Basic $auth" }; - $ns->$method( $command, $content, { 'Authorization' => "Basic $auth" } ); - + $ns->$method( @args ); $ns; } @@ -77,50 +80,11 @@ sub ns_create_or_update { my $ns = $self->ns_command( 'PUT', $self->ns_subscriber($svc_phone), 'subscriber_login' => $phonenum.'@'.$domain, - 'firstname' => $firstname, #4? - 'lastname' => $lastname, #5? - 'subscriber_pin' => $svc_phone->pin, #6? - 'dial_plan' => 'Default', #config? #7? - 'dial_policy' => $dial_policy, #8? -#no_answer_timeout30 -# simultaneous_ringyes -# gmt_offset-8 -# aor_schemesip: -# do_not_disturbyes -# email_vmail -# data_limit0 -# screen -# last_update2008-10-01 12:19:01.0 -# domain_diryes -# callid_name[*] -# admin_vmailyes -# subscriber_name -# rcv_broadcast -# directory_order1 -# accept -# rating_required -# date_created2008-02-22 08:38:01 -# message_waiting -# rate -# directory_listingno -# time_zoneUS/Pacific -# forward_no_answeryes -# vmail_sort_lifo -# modeover-capacity -# subscriber_groupn/a -# vmail_say_time -# presenceinactive -# directory_match826 -# language -# forward_busyyes -# callid_nmbr[*] -# vmail -# subscriber_login1007@vbox.netsapiens.com -# rejectyes -# forwardyes -# vmail_say_cidno -# email_address -# greeting_index + 'firstname' => $firstname, + 'lastname' => $lastname, + 'subscriber_pin' => $svc_phone->pin, + 'dial_plan' => 'Default', #config? + 'dial_policy' => $dial_policy, ); if ( $ns->responseCode !~ /^2/ ) { @@ -148,14 +112,12 @@ sub ns_delete { sub ns_parse_response { my( $self, $content ) = ( shift, shift ); + #try to screen-scrape something useful tie my %hash, Tie::IxHash; - #while ( $content =~ s/^.*?

\s*(.+?)<\/b>\s*<(\w+)>(.+?)<\/\2><\/p>//i ) { while ( $content =~ s/^.*?

\s*(.+?)<\/b>\s*(.+?)\s*<\/p>//is ) { ( $hash{$1} = $2 ) =~ s/^\s*<(\w+)>(.+?)<\/\1>/$2/is; } - #warn $content; #probably useless - %hash; } -- cgit v1.1 From 6ef8f43327f534f8e6f03265ecd97bd654730c07 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 31 May 2009 04:57:00 +0000 Subject: necessary for bin/cdr-netsapeins.import --- FS/FS/part_export/netsapiens.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'FS/FS/part_export/netsapiens.pm') diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm index e19e95c..172f7b0 100644 --- a/FS/FS/part_export/netsapiens.pm +++ b/FS/FS/part_export/netsapiens.pm @@ -39,9 +39,11 @@ sub ns_command { my @args = ( $command ); if ( $method eq 'PUT' ) { - my $content = $method eq 'PUT' ? $ns->buildQuery( { @_ } ) : ''; + my $content = $ns->buildQuery( { @_ } ); $content =~ s/^\?//; push @args, $content; + } elsif ( $method eq 'GET' ) { + $args[0] .= $ns->buildQuery( { @_ } ); } my $auth = -- cgit v1.1 From 55c933db01346b350ad08c03246ca0db0473c056 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 30 Jun 2009 02:54:54 +0000 Subject: add DID association w/user? docs from netsapiens rough... RT#5226 --- FS/FS/part_export/netsapiens.pm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'FS/FS/part_export/netsapiens.pm') diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm index 172f7b0..22124e9 100644 --- a/FS/FS/part_export/netsapiens.pm +++ b/FS/FS/part_export/netsapiens.pm @@ -63,6 +63,15 @@ sub ns_subscriber { "/domains_config/$domain/subscriber_config/$phonenum"; } +sub ns_dialplan { + my($self, $svc_phone) = (shift, shift); + + my $countrycode = $svc_phone->countrycode; + my $phonenum = $svc_phone->phonenum; + + "/dialplans/DID+Table/dialplan_config/sip:$countrycode$phonenum@*" +} + sub ns_create_or_update { my($self, $svc_phone, $dial_policy) = (shift, shift, shift); @@ -80,6 +89,8 @@ sub ns_create_or_update { $lastname = $cust_main->get('last'); } + #create user + my $ns = $self->ns_command( 'PUT', $self->ns_subscriber($svc_phone), 'subscriber_login' => $phonenum.'@'.$domain, 'firstname' => $firstname, @@ -94,6 +105,17 @@ sub ns_create_or_update { join(', ', $self->ns_parse_response( $ns->responseContent ) ); } + #map DID to user + my $ns2 = $self->ns_command( 'PUT', $self->ns_dialplan($svc_phone), + 'to_user' => $phonenum.'@'.$domain, + 'to_host' => $domain, + ); + + if ( $ns2->responseCode !~ /^2/ ) { + return $ns2->responseCode. ' '. + join(', ', $self->ns_parse_response( $ns2->responseContent ) ); + } + ''; } -- cgit v1.1 From ef49390629d8bd97cc4f607b559c9552aa86b482 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 30 Jun 2009 09:38:41 +0000 Subject: more steps to netsapiens export, RT#5226 --- FS/FS/part_export/netsapiens.pm | 166 ++++++++++++++++++++++++++++++++++------ 1 file changed, 143 insertions(+), 23 deletions(-) (limited to 'FS/FS/part_export/netsapiens.pm') diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm index 22124e9..a1957d4 100644 --- a/FS/FS/part_export/netsapiens.pm +++ b/FS/FS/part_export/netsapiens.pm @@ -9,10 +9,13 @@ use FS::part_export; @ISA = qw(FS::part_export); tie my %options, 'Tie::IxHash', - 'login' => { label=>'NetSapiens tac2 API username' }, - 'password' => { label=>'NetSapiens tac2 API password' }, - 'url' => { label=>'NetSapiens tac2 URL' }, - 'domain' => { label=>'NetSapiens Domain' }, + 'login' => { label=>'NetSapiens tac2 User API username' }, + 'password' => { label=>'NetSapiens tac2 User API password' }, + 'url' => { label=>'NetSapiens tac2 User URL' }, + 'device_login' => { label=>'NetSapiens tac2 Device API username' }, + 'device_password' => { label=>'NetSapiens tac2 Device API password' }, + 'device_url' => { label=>'NetSapiens tac2 Device URL' }, + 'domain' => { label=>'NetSapiens Domain' }, ; %info = ( @@ -29,12 +32,22 @@ END sub rebless { shift; } sub ns_command { - my( $self, $method, $command ) = splice(@_,0,3); + my $self = shift; + $self->_ns_command('', @_); +} + +sub ns_device_command { + my $self = shift; + $self->_ns_command('device', @_); +} + +sub ns_command { + my( $self, $prefix, $method, $command ) = splice(@_,0,4); eval 'use REST::Client'; die $@ if $@; - my $ns = new REST::Client 'host'=>$self->option('url'); + my $ns = new REST::Client 'host'=>$self->option($prefix.'url'); my @args = ( $command ); @@ -46,8 +59,8 @@ sub ns_command { $args[0] .= $ns->buildQuery( { @_ } ); } - my $auth = - encode_base64( $self->option('login'). ':'. $self->option('password') ); + my $auth = encode_base64( $self->option($prefix.'login'). ':'. + $self->option($prefix.'password') ); push @args, { 'Authorization' => "Basic $auth" }; $ns->$method( @args ); @@ -63,6 +76,27 @@ sub ns_subscriber { "/domains_config/$domain/subscriber_config/$phonenum"; } +sub ns_registrar { + my($self, $svc_phone) = (shift, shift); + + my $domain = $self->option('domain'); + my $countrycode = $svc_phone->countrycode; + my $phonenum = $svc_phone->phonenum; + + $self->ns_subscriber($svc_phone). + '/registrar_config/'. $self->ns_devicename($svc_phone); +} + +sub ns_devicename { + my( $self, $svc_phone ) = (shift, shift); + + my $domain = $self->option('domain'); + my $countrycode = $svc_phone->countrycode; + my $phonenum = $svc_phone->phonenum; + + "sip:$countrycode$phonenum@$domain"; +} + sub ns_dialplan { my($self, $svc_phone) = (shift, shift); @@ -72,11 +106,21 @@ sub ns_dialplan { "/dialplans/DID+Table/dialplan_config/sip:$countrycode$phonenum@*" } +sub ns_device { + my($self, $svc_phone, $phone_device ) = (shift, shift, shift); + + #my $countrycode = $svc_phone->countrycode; + #my $phonenum = $svc_phone->phonenum; + + "/phones_config/". $phone_device->mac_addr; +} + sub ns_create_or_update { my($self, $svc_phone, $dial_policy) = (shift, shift, shift); my $domain = $self->option('domain'); - my $phonenum = $svc_phone->phonenum; + my $countrycode = $svc_phone->countrycode; + my $phonenum = $svc_phone->phonenum; my( $firstname, $lastname ); if ( $svc_phone->phone_name =~ /^\s*(\S+)\s+(\S.*\S)\s*$/ ) { @@ -89,33 +133,44 @@ sub ns_create_or_update { $lastname = $cust_main->get('last'); } - #create user + # Piece 1 (already done) - User creation my $ns = $self->ns_command( 'PUT', $self->ns_subscriber($svc_phone), - 'subscriber_login' => $phonenum.'@'.$domain, - 'firstname' => $firstname, - 'lastname' => $lastname, - 'subscriber_pin' => $svc_phone->pin, - 'dial_plan' => 'Default', #config? - 'dial_policy' => $dial_policy, - ); + 'subscriber_login' => $phonenum.'@'.$domain, + 'firstname' => $firstname, + 'lastname' => $lastname, + 'subscriber_pin' => $svc_phone->pin, + 'dial_plan' => 'Default', #config? + 'dial_policy' => $dial_policy, + ); if ( $ns->responseCode !~ /^2/ ) { return $ns->responseCode. ' '. join(', ', $self->ns_parse_response( $ns->responseContent ) ); } - #map DID to user - my $ns2 = $self->ns_command( 'PUT', $self->ns_dialplan($svc_phone), - 'to_user' => $phonenum.'@'.$domain, - 'to_host' => $domain, - ); + #Piece 2 - sip device creation + + my $ns2 = $self->ns_command( 'PUT', $self->ns_registrar($svc_phone), + ); if ( $ns2->responseCode !~ /^2/ ) { return $ns2->responseCode. ' '. join(', ', $self->ns_parse_response( $ns2->responseContent ) ); } + #Piece 3 - DID mapping to user + + my $ns3 = $self->ns_command( 'PUT', $self->ns_dialplan($svc_phone), + 'to_user' => $countrycode.$phonenum, + 'to_host' => $domain, + ); + + if ( $ns3->responseCode !~ /^2/ ) { + return $ns3->responseCode. ' '. + join(', ', $self->ns_parse_response( $ns3->responseContent ) ); + } + ''; } @@ -124,6 +179,8 @@ sub ns_delete { my $ns = $self->ns_command( 'DELETE', $self->ns_subscriber($svc_phone) ); + #delete other things? + if ( $ns->responseCode !~ /^2/ ) { return $ns->responseCode. ' '. join(', ', $self->ns_parse_response( $ns->responseContent ) ); @@ -165,7 +222,7 @@ sub _export_delete { sub _export_suspend { my( $self, $svc_phone ) = (shift, shift); - $self->ns_create_or_udpate($svc_phone, 'Deny'); + $self->ns_create_or_update($svc_phone, 'Deny'); } sub _export_unsuspend { @@ -174,6 +231,69 @@ sub _export_unsuspend { $self->_export_insert($svc_phone); } +sub export_device_insert { + my( $self, $svc_phone, $phone_device ) = (shift, shift, shift); + + #my $domain = $self->option('domain'); + my $countrycode = $svc_phone->countrycode; + my $phonenum = $svc_phone->phonenum; + + my $device = $self->ns_devicename($svc_phone); + + my $ns = $self->ns_device_command( + 'PUT', $self->ns_device($svc_phone, $phone_device), + 'line1_enable' => 'yes', + 'device1' => $self->ns_devicename($svc_phone), + 'line1_ext' => $countrycode.$phonenum, +, + #'line2_enable' => 'yes', + #'device2' => + #'line2_ext' => + + #'notes' => + 'server' => 'SiPbx', + 'domain' => $self->option('domain'), + + 'brand' => $phone_device->part_device->devicename, + + ); + + if ( $ns->responseCode !~ /^2/ ) { + return $ns->responseCode. ' '. + join(', ', $self->ns_parse_response( $ns->responseContent ) ); + } + + ''; + +} + +sub export_device_delete { + my( $self, $svc_phone, $phone_device ) = (shift, shift, shift); + + my $ns = $self->ns_device_command( + 'DELETE', $self->ns_device($svc_phone, $phone_device), + ); + + if ( $ns->responseCode !~ /^2/ ) { + return $ns->responseCode. ' '. + join(', ', $self->ns_parse_response( $ns->responseContent ) ); + } + + ''; + + +} + + +sub export_device_replace { + my( $self, $svc_phone, $new_phone_device, $old_phone_device ) = + (shift, shift, shift, shift); + + #? + $self->export_device_insert( $svc_phone, $new_phone_device ); + +} + sub export_links { my($self, $svc_phone, $arrayref) = (shift, shift, shift); #push @$arrayref, qq!option($prefix.'url'). + " $command ". join(', ', @_). "\n" + if $self->option('debug'); + my $auth = encode_base64( $self->option($prefix.'login'). ':'. $self->option($prefix.'password') ); push @args, { 'Authorization' => "Basic $auth" }; -- cgit v1.1 From b3e081bbd2ba95554687a531bc134c00026a3669 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 6 Aug 2009 00:41:41 +0000 Subject: pass mac addresses as lower-case to netsapiens, RT#5226 --- FS/FS/part_export/netsapiens.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'FS/FS/part_export/netsapiens.pm') diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm index 9181344..a24bc37 100644 --- a/FS/FS/part_export/netsapiens.pm +++ b/FS/FS/part_export/netsapiens.pm @@ -118,7 +118,7 @@ sub ns_device { #my $countrycode = $svc_phone->countrycode; #my $phonenum = $svc_phone->phonenum; - "/phones_config/". $phone_device->mac_addr; + "/phones_config/". lc($phone_device->mac_addr); } sub ns_create_or_update { -- cgit v1.1 From 165423e6ce43f8f87f329330bf92f422e718a768 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 10 Aug 2009 21:44:08 +0000 Subject: last nits on netsapiens export, RT#5226 --- FS/FS/part_export/netsapiens.pm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'FS/FS/part_export/netsapiens.pm') diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm index a24bc37..cf4b5e3 100644 --- a/FS/FS/part_export/netsapiens.pm +++ b/FS/FS/part_export/netsapiens.pm @@ -85,10 +85,6 @@ sub ns_subscriber { sub ns_registrar { my($self, $svc_phone) = (shift, shift); - my $domain = $self->option('domain'); - my $countrycode = $svc_phone->countrycode; - my $phonenum = $svc_phone->phonenum; - $self->ns_subscriber($svc_phone). '/registrar_config/'. $self->ns_devicename($svc_phone); } @@ -97,19 +93,21 @@ sub ns_devicename { my( $self, $svc_phone ) = (shift, shift); my $domain = $self->option('domain'); - my $countrycode = $svc_phone->countrycode; + #my $countrycode = $svc_phone->countrycode; my $phonenum = $svc_phone->phonenum; - "sip:$countrycode$phonenum@$domain"; + #"sip:$countrycode$phonenum\@$domain"; + "sip:$phonenum\@$domain"; } sub ns_dialplan { my($self, $svc_phone) = (shift, shift); - my $countrycode = $svc_phone->countrycode; + #my $countrycode = $svc_phone->countrycode; my $phonenum = $svc_phone->phonenum; - "/dialplans/DID+Table/dialplan_config/sip:$countrycode$phonenum@*" + #"/dialplans/DID+Table/dialplan_config/sip:$countrycode$phonenum\@*" + "/dialplans/DID+Table/dialplan_config/sip:$phonenum\@*" } sub ns_device { @@ -125,7 +123,7 @@ sub ns_create_or_update { my($self, $svc_phone, $dial_policy) = (shift, shift, shift); my $domain = $self->option('domain'); - my $countrycode = $svc_phone->countrycode; + #my $countrycode = $svc_phone->countrycode; my $phonenum = $svc_phone->phonenum; my( $firstname, $lastname ); @@ -158,6 +156,7 @@ sub ns_create_or_update { #Piece 2 - sip device creation my $ns2 = $self->ns_command( 'PUT', $self->ns_registrar($svc_phone), + 'termination_match' => $self->ns_devicename($svc_phone) ); if ( $ns2->responseCode !~ /^2/ ) { @@ -168,7 +167,7 @@ sub ns_create_or_update { #Piece 3 - DID mapping to user my $ns3 = $self->ns_command( 'PUT', $self->ns_dialplan($svc_phone), - 'to_user' => $countrycode.$phonenum, + 'to_user' => $phonenum, 'to_host' => $domain, ); @@ -250,7 +249,7 @@ sub export_device_insert { 'PUT', $self->ns_device($svc_phone, $phone_device), 'line1_enable' => 'yes', 'device1' => $self->ns_devicename($svc_phone), - 'line1_ext' => $countrycode.$phonenum, + 'line1_ext' => $phonenum, , #'line2_enable' => 'yes', #'device2' => -- cgit v1.1