Merge branch 'master' of github.com:tech-server/tgmanage

1 files changed, 11 insertions, 6 deletions

diff --git a/include/nms/util.pm b/include/nms/util.pm
index 79598d7..64637b8 100644
--- a/include/nms/util.pm
+++ b/include/nms/util.pm
@@ -15,10 +15,9 @@ sub parse_switch {
 		'sysname' => "$switch",
 		'subnet4' => "$subnet4",
 		'subnet6' => "$subnet6",
-		'mgtmt4' => "$mgtmt4",
-		'mgtmt6' => "$mgtmt6",
-		'lolid' => "$lolid",
-		'ip' => "$mgtmt4",
+		'mgmt_v4_addr' => "$mgtmt4",
+		'mgmt_v6_addr' => "$mgtmt6",
+		'traffic_vlan' => "$lolid",
 		'distro' => "$distro"
 	);
 	%{$ret{'placement'}} = guess_placement($switch);
@@ -91,7 +90,7 @@ sub guess_placement {
 		$yy -= 20 if ($e >= 79 and $s == 1);
 		$yy -= 30 if ($e >= 81 and $s == 1);
 
-	} elsif ($name =~ /^sw(\d+)-creativia$/) {
+	} elsif ($name =~ /^creativia(\d+)$/) {
 		my ($s) = ($1);
 		$src = "creativia";
 		$x = 1535;
@@ -114,7 +113,13 @@ sub guess_placement {
 		$y = int(759 + 20.5 * $s);
 		$xx = $x + 65;
 		$yy = $y + 14;
-
+	} elsif ($name =~ /^distro(\d)/) {
+		my $d = ($1);
+		$src = "distro";
+		$x = 292 + $d * 165;
+		$y = 415;
+		$xx = $x + 130;
+		$yy = $y + 20;
 	} else {
 		# Fallback to have _some_ position
 		$src = "random";