Update make-switches.pl for TG07.

[nms] / zyxel / konfgen.py

diff --git a/zyxel/konfgen.py b/zyxel/konfgen.py
index 3d55528a6f5b43e9d1ebebb71f376278f07d9f36..1e21c2b3097f97e7053ce1fd1294a46bcd4f4bca 100755 (executable)
--- a/zyxel/konfgen.py
+++ b/zyxel/konfgen.py
@@ -24,21 +24,14 @@
 p1 = 1
 p2 = 24+1
 
-NETWORK="81.162"
-TRAPHOST="81.162.254.60"
-LOGHOST="81.162.254.61"
-
 #MODE="RAW"
 MODE="minicom"
 
 
-# z = antall svitsjer pr. distro
-# DEN FANTASTISKE Z-KONSTANTEN
-Z = 42
-
 import sys
 import os
 import time
+from zyxelcommon import *
 
 sys.stderr = open("/tmp/err","w+")
 #sys.stdout = open("/tmp/out","w+")
@@ -90,19 +83,6 @@ def send(text):
     else: 
         sys.stdout.write(text + "\n")
 
-def retSubnet(sw):
-    (rad,num) = sw
-    b = (((rad * 3)-4) / Z) + 1
-    if b == 6:
-        b=5
-    return "24%s" % b
-
-def retIP(sw):
-    (rad,num) = sw
-    gangefaktor = rad - ((rad - 1) / 2)
-    lopenr = 2 + 6 * gangefaktor + num
-    return NETWORK + ".%s.%s" % (retSubnet(sw), lopenr)
-
 sw = deduceSwitch()
 
 if ((sw[0] % 2) == 0):