135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change port ordering for Arista and Foundry platforms

Browse Source
This commit is contained in:
Oliver Gorwits
2013-02-02 19:51:31 +00:00
parent 02455af947
commit 6671032952
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Netdisco/Changes
View File

@@ -6,6 +6,10 @@
* Hide Legend item relating to port control if not an admin * Hide Legend item relating to port control if not an admin
* No-Wrap on port name column * No-Wrap on port name column
[BUG FIXES]
* Change port ordering for Arista and Foundry platforms
2.004002 - 2013-01-30 2.004002 - 2013-01-30
[BUG FIXES] [BUG FIXES]

10
Netdisco/lib/App/Netdisco/Util/Web.pm
View File

@@ -29,14 +29,14 @@ sub sort_port {
my ($aval, $bval) = @_; my ($aval, $bval) = @_;
# hack for foundry "10GigabitEthernet" -> cisco-like "TenGigabitEthernet" # hack for foundry "10GigabitEthernet" -> cisco-like "TenGigabitEthernet"
$aval = "Ten$1" if $aval =~ qr/^10(GigabitEthernet.+)$/; $aval = $1 if $aval =~ qr/^10(GigabitEthernet.+)$/;
$bval = "Ten$1" if $bval =~ qr/^10(GigabitEthernet.+)$/; $bval = $1 if $bval =~ qr/^10(GigabitEthernet.+)$/;
my $numbers = qr{^(\d+)$}; my $numbers = qr{^(\d+)$};
my $numeric = qr{^([\d\.]+)$}; my $numeric = qr{^([\d\.]+)$};
my $dotted_numeric = qr{^(\d+)\.(\d+)$}; my $dotted_numeric = qr{^(\d+)\.(\d+)$};
my $letter_number = qr{^([a-zA-Z]+)(\d+)$}; my $letter_number = qr{^([a-zA-Z]+)(\d+)$};
my $wordcharword = qr{^([^:\/.]+)[\ :\/\.]+([^:\/.]+)(\d+)?$}; #port-channel45 my $wordcharword = qr{^([^:\/.]+)[-\ :\/\.]+([^:\/.0-9]+)(\d+)?$}; #port-channel45
my $netgear = qr{^Slot: (\d+) Port: (\d+) }; # "Slot: 0 Port: 15 Gigabit - Level" my $netgear = qr{^Slot: (\d+) Port: (\d+) }; # "Slot: 0 Port: 15 Gigabit - Level"
my $ciscofast = qr{^ my $ciscofast = qr{^
# Word Number slash (Gigabit0/) # Word Number slash (Gigabit0/)
@@ -58,7 +58,7 @@ sub sort_port {
} elsif ($aval =~ $numbers) { } elsif ($aval =~ $numbers) {
@a = ($1); @a = ($1);
} elsif ($aval =~ $ciscofast) { } elsif ($aval =~ $ciscofast) {
@a = ($2,$1); @a = ($1,$2);
push @a, split(/[:\/]/,$3), $4; push @a, split(/[:\/]/,$3), $4;
} elsif ($aval =~ $wordcharword) { } elsif ($aval =~ $wordcharword) {
@a = ($1,$2,$3); @a = ($1,$2,$3);
@@ -75,7 +75,7 @@ sub sort_port {
} elsif ($bval =~ $numbers) { } elsif ($bval =~ $numbers) {
@b = ($1); @b = ($1);
} elsif ($bval =~ $ciscofast) { } elsif ($bval =~ $ciscofast) {
@b = ($2,$1); @b = ($1,$2);
push @b, split(/[:\/]/,$3),$4; push @b, split(/[:\/]/,$3),$4;
} elsif ($bval =~ $wordcharword) { } elsif ($bval =~ $wordcharword) {
@b = ($1,$2,$3); @b = ($1,$2,$3);