X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=zyxel%2Fswitchmap.py;h=479d08289a849f74c0450cfaed5acdc6ec8265bf;hb=40d6c7e02855fa3bb3cf35805efe853051c88ea5;hp=9dee86afe65f2ea3d87d9af83a48dffdb8278e42;hpb=4ea0cb1089851877c7979056ef83f32e19a7008e;p=nms

diff --git a/zyxel/switchmap.py b/zyxel/switchmap.py
index 9dee86a..479d082 100755
--- a/zyxel/switchmap.py
+++ b/zyxel/switchmap.py
@@ -23,7 +23,8 @@ for row in range(1,73,2):
 		else:
 			ip = retIP((row,sw))
 			distro = int(retSubnet((row,sw))) - 241
-			vlan = (distro_num_switches[distro] / switches_per_cnet) + distro_vlan_start[distro]
+#			vlan = (distro_num_switches[distro] / switches_per_cnet) + distro_vlan_start[distro]
+			vlan = row * 10 + sw
 			distro_num_switches[distro] = distro_num_switches[distro] + 1
 
 			text = "%s/%u" % (ip, vlan)
@@ -51,5 +52,16 @@ vlan_list.sort()
 
 i = 1;
 for vlan in vlan_list:
-	switches.write("194.0.%u.0 24 split:%s\n" % (i, ",".join(vlans[vlan])))
+	row = vlan / 10
+	num = vlan % 10
+
+	cnet_major = row
+	if (num > 3):
+		cnet_major = cnet_major + 1
+		cnet_minor = (num-4) * 64
+	else:
+		cnet_minor = (num-1) * 64	
+	
+#	switches.write("194.0.%u.0 24 split:%s\n" % (i, ",".join(vlans[vlan])))
+	switches.write("194.0.%u.%u 26 e%u-sw%u\n" % (cnet_major, cnet_minor, row, num))
 	i = i + 1