X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fphone_shellcommands.pm;h=3f01de36b73606f13bf2e603da1e8fefa0fce61d;hb=121510b6337b7f75f25d583730a65f3fc63bbfbe;hp=040af27a7a3f3e08ffbc001f3544f60196f041fa;hpb=f4723862a096bd9eecd47727c9a99ebedc131ac9;p=freeside.git diff --git a/FS/FS/part_export/phone_shellcommands.pm b/FS/FS/part_export/phone_shellcommands.pm index 040af27a7..3f01de36b 100644 --- a/FS/FS/part_export/phone_shellcommands.pm +++ b/FS/FS/part_export/phone_shellcommands.pm @@ -5,6 +5,7 @@ use vars qw(@ISA %info); use Tie::IxHash; use String::ShellQuote; use FS::part_export; +use Carp qw(carp); @ISA = qw(FS::part_export); @@ -13,16 +14,18 @@ use FS::part_export; #- suspension/unsuspension tie my %options, 'Tie::IxHash', - 'user' => { label=>'Remote username', default=>'root', }, - 'useradd' => { label=>'Insert command', }, - 'userdel' => { label=>'Delete command', }, - 'usermod' => { label=>'Modify command', }, - 'suspend' => { label=>'Suspension command', }, - 'unsuspend' => { label=>'Unsuspension command', }, + 'user' => { label=>'Remote username', default=>'root', }, + 'useradd' => { label=>'Insert command', }, + 'userdel' => { label=>'Delete command', }, + 'usermod' => { label=>'Modify command', }, + 'suspend' => { label=>'Suspension command', }, + 'unsuspend' => { label=>'Unsuspension command', }, + 'mac_insert' => { label=>'Device MAC address insert command', }, + 'mac_delete' => { label=>'Device MAC address delete command', }, ; %info = ( - 'svc' => 'svc_phone', + 'svc' => [qw( svc_phone part_device )], 'desc' => 'Run remote commands via SSH, for phone numbers', 'options' => \%options, 'notes' => <<'END' @@ -49,6 +52,11 @@ old_ for replace operations):
$sip_password
- SIP secret (quoted for the shell)
$pin
- Personal identification number
$cust_name
- Customer name (quoted for the shell)
+ $pkgnum
- Internal package number
+ $custnum
- Internal customer number
+ $phone_name
- Phone name (quoted for the shell)
+ $mac_addr
- MAC address (Device MAC address insert and delete commands only)
+ $devicename
- Device type (Device type insert and delete commands only)
END
);
@@ -56,40 +64,66 @@ END
sub rebless { shift; }
sub _export_insert {
- my($self) = shift;
+ my $self = shift;
$self->_export_command('useradd', @_);
}
sub _export_delete {
- my($self) = shift;
+ my $self = shift;
$self->_export_command('userdel', @_);
}
sub _export_suspend {
- my($self) = shift;
+ my $self = shift;
$self->_export_command('suspend', @_);
}
sub _export_unsuspend {
- my($self) = shift;
+ my $self = shift;
$self->_export_command('unsuspend', @_);
}
+sub export_device_insert {
+ my( $self, $svc_phone, $phone_device ) = @_;
+ $self->_export_command('mac_insert', $svc_phone,
+ mac_addr => $phone_device->mac_addr,
+ devicename => $phone_device->part_device->devicename,
+ );
+}
+
+sub export_device_delete {
+ my( $self, $svc_phone, $phone_device ) = @_;
+ $self->_export_command('mac_delete', $svc_phone,
+ mac_addr => $phone_device->mac_addr,
+ devicename => $phone_device->part_device->devicename,
+ );
+}
+
sub _export_command {
- my ( $self, $action, $svc_phone) = (shift, shift, shift);
+ my ( $self, $action, $svc_phone, %addl_vars) = @_;
my $command = $self->option($action);
return '' if $command =~ /^\s*$/;
+ if ( $FS::svc_Common::noexport_hack ) {
+ carp "_export_command($action) suppressed by noexport_hack"
+ if $self->option('debug');
+ return;
+ }
+
#set variable for the command
no strict 'vars';
{
no strict 'refs';
${$_} = $svc_phone->getfield($_) foreach $svc_phone->fields;
+ ${$_} = $addl_vars{$_} foreach keys %addl_vars;
}
my $cust_pkg = $svc_phone->cust_svc->cust_pkg;
+ my $pkgnum = $cust_pkg ? $cust_pkg->pkgnum : '';
+ my $custnum = $cust_pkg ? $cust_pkg->custnum : '';
my $cust_name = $cust_pkg ? $cust_pkg->cust_main->name : '';
$cust_name = shell_quote $cust_name;
my $sip_password = shell_quote $svc_phone->sip_password;
+ my $phone_name = shell_quote $svc_phone->phone_name;
#done setting variables for the command
$self->shellcommands_queue( $svc_phone->svcnum,
@@ -111,7 +145,12 @@ sub _export_replace {
${"new_$_"} = $new->getfield($_) foreach $new->fields;
}
+ my $old_cust_pkg = $old->cust_svc->cust_pkg;
+ my $old_pkgnum = $old_cust_pkg ? $old_cust_pkg->pkgnum : '';
+ my $old_custnum = $old_cust_pkg ? $old_cust_pkg->custnum : '';
my $cust_pkg = $new->cust_svc->cust_pkg;
+ my $new_pkgnum = $cust_pkg ? $cust_pkg->pkgnum : '';
+ my $new_custnum = $new_cust_pkg ? $new_cust_pkg->custnum : '';
my $new_cust_name = $cust_pkg ? $cust_pkg->cust_main->name : '';
$new_cust_name = shell_quote $new_cust_name;
#done setting variables for the command
@@ -138,3 +177,4 @@ sub ssh_cmd { #subroutine, not method
&Net::SSH::ssh_cmd( { @_ } );
}
+1;