From e2c018a18d972679160220b6cf76fa1a337e0a08 Mon Sep 17 00:00:00 2001
From: Kristian Lyngstol <kly@kly@.no>
Date: Mon, 21 Mar 2016 12:26:00 +0100
Subject: NMS: Fix distro

---
 include/nms/util.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'include/nms/util.pm')

diff --git a/include/nms/util.pm b/include/nms/util.pm
index 79598d7..d063bf2 100644
--- a/include/nms/util.pm
+++ b/include/nms/util.pm
@@ -114,7 +114,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";
-- 
cgit v1.2.3


From 50a9e3fcb3e8e6f3ec13eebe1da8df7bdf7af45c Mon Sep 17 00:00:00 2001
From: Kristian Lyngstol <kly@kly@.no>
Date: Wed, 23 Mar 2016 10:53:45 +0100
Subject: NMS: Bump location and placement

---
 include/nms/util.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'include/nms/util.pm')

diff --git a/include/nms/util.pm b/include/nms/util.pm
index d063bf2..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;
-- 
cgit v1.2.3