X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fnetsapiens.pm;h=9181344fb767c3c73f07ff2341d40c824caa063c;hb=b898dc674b2d5158a2ecccd3424ad2ea7dc264e0;hp=10b53ef51e457f63d8172659c78f7fb879fc9884;hpb=2b968bffd937b19d2314aa5e304fccc8ec1e1350;p=freeside.git

diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm
index 10b53ef51..9181344fb 100644
--- a/FS/FS/part_export/netsapiens.pm
+++ b/FS/FS/part_export/netsapiens.pm
@@ -1,18 +1,23 @@
 package FS::part_export::netsapiens;
 
-use vars qw(@ISA %info);
+use vars qw(@ISA $me %info);
 use URI;
 use MIME::Base64;
 use Tie::IxHash;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
+$me = '[FS::part_export::netsapiens]';
 
 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' },
+  'debug'           => { label=>'Enable debugging', type=>'checkbox' },
 ;
 
 %info = (
@@ -29,23 +34,42 @@ END
 sub rebless { shift; }
 
 sub ns_command {
-  my( $self, $method, $command, @args ) = @_;
+  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 $content = $method eq 'PUT' ? $ns->buildQuery( { @args } ) : '';
-  $content =~ s/^\?//;
+  my @args = ( $command );
 
-  warn $content;
+  if ( $method eq 'PUT' ) {
+    my $content = $ns->buildQuery( { @_ } );
+    $content =~ s/^\?//;
+    push @args, $content;
+  } elsif ( $method eq 'GET' ) {
+    $args[0] .= $ns->buildQuery( { @_ } );
+  }
 
-  my $auth =
-    encode_base64( $self->option('login'). ':'. $self->option('password') );
+  warn "$me $method ". $self->option($prefix.'url').
+       " $command ". join(', ', @_). "\n"
+    if $self->option('debug');
 
-  $ns->$method( $command, $content, { 'Authorization' => "Basic $auth" } );
+  my $auth = encode_base64( $self->option($prefix.'login'). ':'.
+                            $self->option($prefix.'password')    );
+  push @args, { 'Authorization' => "Basic $auth" };
 
+  $ns->$method( @args );
   $ns;
 }
 
@@ -58,11 +82,51 @@ 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);
+
+  my $countrycode = $svc_phone->countrycode;
+  my $phonenum    = $svc_phone->phonenum;
+
+  "/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*$/ ) {
@@ -75,59 +139,44 @@ sub ns_create_or_update {
     $lastname  = $cust_main->get('last');
   }
 
+  # Piece 1 (already done) - User creation
+
   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
-                            );
+    '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 ) );
   }
 
+  #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 ) );
+  }
+
   '';
 }
 
@@ -136,6 +185,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 ) );
@@ -148,14 +199,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/^.*?<p>\s*<b>(.+?)<\/b>\s*<(\w+)>(.+?)<\/\2><\/p>//i ) {
   while ( $content =~ s/^.*?<p>\s*<b>(.+?)<\/b>\s*(.+?)\s*<\/p>//is ) {
     ( $hash{$1} = $2 ) =~ s/^\s*<(\w+)>(.+?)<\/\1>/$2/is;
   }
 
-  #warn $content; #probably useless
-
   %hash;
 }
 
@@ -179,7 +228,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 {
@@ -188,6 +237,68 @@ 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!<A HREF="http://example.com/~!. $svc_phone->username.