scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-01 11:18:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

firemod: fixes parsing short eids for use_ports parameter

Browse Source
This commit is contained in:
Jed Reynolds
2020-03-03 11:26:45 -08:00
parent a716e240e3
commit 3cedf0d99f
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lf_firemod.pl
View File

@@ -670,7 +670,10 @@ elsif ($::action eq "create_cx") {
my $max_speed_b = $::max_speed; my $max_speed_b = $::max_speed;
if ("NA" ne $::use_ports_str) { if ("NA" ne $::use_ports_str) {
($port_a,$port_b) = split(',', $::use_ports_str); ($port_a, $port_b) = split(',', $::use_ports_str);
if (!(defined $port_a) || !(defined $port_b)) {
die("Error with port names. Please format as short EIDs: 1.1.sta0000,1.2.eth1");
}
die("Please name your cross connect: --cx_name\n$::usage") die("Please name your cross connect: --cx_name\n$::usage")
if ($::cx_name eq ""); if ($::cx_name eq "");
$end_a = "${main::cx_name}-A"; $end_a = "${main::cx_name}-A";
@@ -678,9 +681,8 @@ elsif ($::action eq "create_cx") {
$::cx_endps = "$end_a,$end_b"; $::cx_endps = "$end_a,$end_b";
} }
elsif ((defined $::cx_endps) && ("" ne $::cx_endps)) { elsif ((defined $::cx_endps) && ("" ne $::cx_endps)) {
print "zzzzzzzzzzzzzzzzzzzzzzzz\n";
($end_a, $end_b) = split(/,/, $::cx_endps); ($end_a, $end_b) = split(/,/, $::cx_endps);
die("Specify two endpoints like: eth1,eth2 \n$::usage") die("Specify two endpoints like: tcp123-A,tcp123-B \n$::usage")
if ((length($end_a) < 1) || (length($end_b) < 1)); if ((length($end_a) < 1) || (length($end_b) < 1));
} }
else { else {
@@ -697,9 +699,22 @@ elsif ($::action eq "create_cx") {
} }
# create endpoints # create endpoints
my $resource_a = $::resource;
create_endp($end_a, $::resource, $port_a, $::endp_type, $speed_a, $max_speed_a); my $resource_b = $::resource;
create_endp($end_b, $::resource, $port_b, $::endp_type, $speed_b, $max_speed_b); my $shelf;
my @hunks;
if ($port_a =~ /1\.\d+\.\S+/) {
@hunks = split(/[.]/, $port_a);
($shelf, $resource_a, $port_a) = @hunks;
}
if ($port_b =~ /1\.\d+\.\S+/) {
@hunks = split(/[.]/, $port_b);
($shelf, $resource_b, $port_b) = @hunks;
}
print ("end_a[$end_a] resource_a[$resource_a] port_a[$port_a], type[$::endp_type] speed[$speed_a] max[$max_speed_a]\n");
print ("end_b[$end_b] resource_b[$resource_b] port_b[$port_b], type[$::endp_type] speed[$speed_b] max[$max_speed_b]\n");
create_endp($end_a, $resource_a, $port_a, $::endp_type, $speed_a, $max_speed_a);
create_endp($end_b, $resource_b, $port_b, $::endp_type, $speed_b, $max_speed_b);
my $cmd = $::utils->fmt_cmd("add_cx", $::cx_name, $::test_mgr, $end_a, $end_b); my $cmd = $::utils->fmt_cmd("add_cx", $::cx_name, $::test_mgr, $end_a, $end_b);
$::utils->doCmd($cmd); $::utils->doCmd($cmd);