[freeside-commits] freeside/torrus/perllib/Torrus/DevDiscover FTOS.pm, 1.1.1.1, 1.1.1.1.2.1 F5BigIp.pm, 1.1.1.1, 1.1.1.1.2.1 Arbor_E.pm, 1.1.1.1, 1.1.1.1.2.1
Ivan,,,
ivan at wavetail.420.am
Fri Dec 16 14:43:58 PST 2011
Update of /home/cvs/cvsroot/freeside/torrus/perllib/Torrus/DevDiscover
In directory wavetail.420.am:/tmp/cvs-serv330
Modified Files:
Tag: FREESIDE_2_3_BRANCH
FTOS.pm F5BigIp.pm Arbor_E.pm
Log Message:
backport some fixes for "Using a hash as a reference is deprecated" warnings from torrus 2.01, so we can get the actual error messages we do want, RT#15536
Index: FTOS.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/torrus/perllib/Torrus/DevDiscover/FTOS.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -w -d -r1.1.1.1 -r1.1.1.1.2.1
--- FTOS.pm 27 Dec 2010 00:03:54 -0000 1.1.1.1
+++ FTOS.pm 16 Dec 2011 22:43:56 -0000 1.1.1.1.2.1
@@ -165,7 +165,7 @@
if( defined( $chassisSerial ) )
{
$data->{'param'}{'comment'} =
- %f10ChassisType->{$chassisSerial->{'chType'}} .
+ $f10ChassisType{$chassisSerial->{'chType'}} .
', Hw Serial#: ' . $chassisSerial->{'chSerialNumber'};
}
else
@@ -191,7 +191,7 @@
( $dd->oiddef('chRpmCpuIndex') ) )
{
my $cpuType = $dd->oiddef('chRpmCpuIndex') . "." . $ftosCPUidx;
- my $cpuName = %f10CPU->{$ftosCpuTable->{$cpuType}};
+ my $cpuName = $f10CPU{$ftosCpuTable->{$cpuType}};
Debug("FTOS::CPU index $ftosCPUidx, $cpuName");
Index: F5BigIp.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/torrus/perllib/Torrus/DevDiscover/F5BigIp.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -w -d -r1.1.1.1 -r1.1.1.1.2.1
--- F5BigIp.pm 27 Dec 2010 00:03:48 -0000 1.1.1.1
+++ F5BigIp.pm 16 Dec 2011 22:43:56 -0000 1.1.1.1.2.1
@@ -167,8 +167,8 @@
my $result = $dd->retrieveSnmpOIDs( '4.x_globalAttrProductCode' );
my $product_code = $result->{'4.x_globalAttrProductCode'};
- $product_name = %f5_product->{$product_code}->{'product'};
- if( %f5_product->{$product_code}->{'supported'} )
+ $product_name = $f5_product{$product_code}->{'product'};
+ if( $f5_product{$product_code}->{'supported'} )
{
$devdetails->setCap( 'BigIp_' . $product_name );
}
Index: Arbor_E.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/torrus/perllib/Torrus/DevDiscover/Arbor_E.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -w -d -r1.1.1.1 -r1.1.1.1.2.1
--- Arbor_E.pm 27 Dec 2010 00:03:52 -0000 1.1.1.1
+++ Arbor_E.pm 16 Dec 2011 22:43:56 -0000 1.1.1.1.2.1
@@ -1049,7 +1049,7 @@
Debug(" Offer: $offerName");
- foreach my $bundleID ( @{%{$offerBundle}->{$offerNameID}} )
+ foreach my $bundleID ( @{$offerBundle->{$offerNameID}} )
{
my @btemplates;
my $bundleName = $data->{'arbor_e'}{'bundleName'}{$bundleID};
More information about the freeside-commits
mailing list