X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fglobalpops_voip.pm;h=67b48bb4a76370d237a4bc73f4034176a4275499;hb=7934ac2de21debc15ce89405ed0f4c061c4f0236;hp=49bc2152f65f320c7be81885583a4307ddb24034;hpb=16302a5c91267095f9c6eb6c2ad21238b6f1b781;p=freeside.git

diff --git a/FS/FS/part_export/globalpops_voip.pm b/FS/FS/part_export/globalpops_voip.pm
index 49bc2152f..67b48bb4a 100644
--- a/FS/FS/part_export/globalpops_voip.pm
+++ b/FS/FS/part_export/globalpops_voip.pm
@@ -9,8 +9,10 @@ use FS::phone_avail;
 @ISA = qw(FS::part_export);
 
 tie my %options, 'Tie::IxHash',
-  'login'    => { label=>'GlobalPOPs Media Services API login' },
-  'password' => { label=>'GlobalPOPs Media Services API password' },
+  'login'         => { label=>'GlobalPOPs Media Services API login' },
+  'password'      => { label=>'GlobalPOPs Media Services API password' },
+  'endpointgroup' => { label=>'GlobalPOPs endpoint group number' },
+  'dry_run'       => { label=>"Test mode - don't actually provision" },
 ;
 
 %info = (
@@ -30,7 +32,7 @@ sub get_dids {
   my $self = shift;
   my %opt = ref($_[0]) ? %{$_[0]} : @_;
 
-  my %search = ();
+  my %getdids = ();
   #  'orderby' => 'npa', #but it doesn't seem to work :/
 
   if ( $opt{'areacode'} && $opt{'exchange'} ) { #return numbers
@@ -64,8 +66,6 @@ sub get_dids {
 
   my $search = $dids->{'search'};
 
-  #warn Dumper($search);
-
   if ( $search->{'statuscode'} == 302200 ) {
     return [];
   } elsif ( $search->{'statuscode'} != 100 ) {
@@ -76,7 +76,6 @@ sub get_dids {
   my @return = ();
 
   #my $latas = $search->{state}{lata};
-
   my %latas;
   if ( grep $search->{state}{lata}{$_}, qw(name rate_center) ) {
     %latas = map $search->{state}{lata}{$_},
@@ -255,44 +254,96 @@ sub gp_command {
 
 sub _export_insert {
   my( $self, $svc_phone ) = (shift, shift);
+
+  return '' if $self->option('dry_run');
+
   #we want to provision and catch errors now, not queue
+
+  my $r = $self->gp_command('reserveDID',
+    'did'           => $svc_phone->phonenum,
+    'minutes'       => 1,
+    'endpointgroup' => $self->option('endpointgroup'),
+  );
+
+  my $rdid = $r->{did};
+
+  if ( $rdid->{'statuscode'} != 100 ) {
+    return "Error running globalpop reserveDID: ".
+           $rdid->{'statuscode'}. ': '. $rdid->{'status'};
+  }
+
+  my $a = $self->gp_command('assignDID',
+    'did'           => $svc_phone->phonenum,
+    'endpointgroup' => $self->option('endpointgroup'),
+    #'rewrite'
+    #'cnam'
+  );
+
+  my $adid = $a->{did};
+
+  if ( $adid->{'statuscode'} != 100 ) {
+    return "Error running globalpop assignDID: ".
+           $adid->{'statuscode'}. ': '. $adid->{'status'};
+  }
+
+  '';
 }
 
 sub _export_replace {
   my( $self, $new, $old ) = (shift, shift, shift);
+
   #hmm, what's to change?
+  '';
 }
 
 sub _export_delete {
   my( $self, $svc_phone ) = (shift, shift);
-  #probably okay to queue the deletion...
+
+  return '' if $self->option('dry_run');
+
+  #probably okay to queue the deletion...?
+  #but hell, let's do it inline anyway, who wants phone numbers hanging around
+
+  my $r = $self->gp_command('releaseDID',
+    'did'           => $svc_phone->phonenum,
+  );
+
+  my $rdid = $r->{did};
+
+  if ( $rdid->{'statuscode'} != 100 ) {
+    return "Error running globalpop releaseDID: ".
+           $rdid->{'statuscode'}. ': '. $rdid->{'status'};
+  }
+
+  '';
 }
 
 sub _export_suspend {
   my( $self, $svc_phone ) = (shift, shift);
   #nop for now
+  '';
 }
 
 sub _export_unsuspend {
   my( $self, $svc_phone ) = (shift, shift);
   #nop for now
+  '';
 }
 
 #hmm, might forgo queueing entirely for most things, data is too much of a pita
-
-sub globalpops_voip_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => 'FS::part_export::globalpops_voip::globalpops_voip_command',
-  };
-  $queue->insert(
-    $self->option('login'),
-    $self->option('password'),
-    $method,
-    @_,
-  );
-}
+#sub globalpops_voip_queue {
+#  my( $self, $svcnum, $method ) = (shift, shift, shift);
+#  my $queue = new FS::queue {
+#    'svcnum' => $svcnum,
+#    'job'    => 'FS::part_export::globalpops_voip::globalpops_voip_command',
+#  };
+#  $queue->insert(
+#    $self->option('login'),
+#    $self->option('password'),
+#    $method,
+#    @_,
+#  );
+#}
 
 sub globalpops_voip_command {
   my($login, $password, $method, @args) = @_;