diff options
| author | Ole Mathias Heggem <ole@sdok.no> | 2017-04-19 23:16:07 +0200 |
|---|---|---|
| committer | Ole Mathias Heggem <ole@sdok.no> | 2017-04-19 23:16:07 +0200 |
| commit | 7b97188b728c85c498acc8acdce1750c472f2c85 (patch) | |
| tree | 12c1436ab7eb97e9434e774671e8ffea134d61db /include/nms | |
| parent | f70f65f7466a480a45a8260b35887cb7ed36b466 (diff) | |
| parent | 7d404abf07d865d253ac2cfc353741e8d4af4867 (diff) | |
Merge remote-tracking branch 'refs/remotes/tech-server/master'
Diffstat (limited to 'include/nms')
| -rw-r--r-- | include/nms/util.pm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/nms/util.pm b/include/nms/util.pm index 3e8596e..511da33 100644 --- a/include/nms/util.pm +++ b/include/nms/util.pm @@ -17,7 +17,7 @@ sub parse_switch { 'mgmt_v4_addr' => "$mgtmt4", 'mgmt_v6_addr' => "$mgtmt6", 'traffic_vlan' => "$lolid", - 'distro' => "$distro" + 'distro_name' => "$distro" ); %{$ret{'placement'}} = guess_placement($switch); return %ret; @@ -132,10 +132,10 @@ sub guess_placement_tg { $x = int(292 + (($e-1)/2) * 31.1); $y = undef; - $x += 14 if ($e >= 13); - $x += 14 if ($e >= 25); - $x += 14 if ($e >= 41); - $x += 14 if ($e >= 59); + $x += 14 if ($e >= 21); + $x += 14 if ($e >= 37); + $x += 14 if ($e >= 55); + $x += 14 if ($e >= 69); if ($s > 2) { $y = 405 - 120 * ($s-2); @@ -151,9 +151,9 @@ sub guess_placement_tg { $y += 20 if $name eq "e3-4"; $y += 15 if $name eq "e5-4"; $yy -= 25 if $name eq "e7-1"; - $y += 10 if $name eq "e5-2"; - $yy -= 25 if $name eq "e5-2"; - $y += 20 if ($e >= 81 and $s == 2); + $yy -= 25 if $name eq "e5-1"; + $yy -= 25 if $name eq "e3-1"; + $y += 20 if ($e >= 79 and $s == 2); $yy -= 20 if ($e >= 79 and $s == 1); $yy -= 30 if ($e >= 81 and $s == 1); |