Bug 1319: New values for BLET_OUT and XLET_OUT on request of Andre Gunst

MAC/Deployment/data/StaticMetaData/RSPDriver.conf.tmpl

@@ -114,62 +114,61 @@ RSPDriver.MAC_ADDR_23=10:FA:00:00:17:00
 # IP-addresses.
 #
 RSPDriver.LANE_00_BLET_OUT= 0
-RSPDriver.LANE_00_XLET_OUT= 0
+RSPDriver.LANE_00_XLET_OUT= 5
 RSPDriver.LANE_00_SRCMAC  = 00:22:86:@RING_ID@:@STATION_HID@:00
 RSPDriver.LANE_00_SRCIP   = 10.@IP_PREFIX_00@.@IP_SUBNET_00@.@IP_EXTEN_00@
 RSPDriver.LANE_00_DSTMAC  = @LANE_00_MAC@
 RSPDriver.LANE_00_DSTIP   = @LANE_00_IP@
 
 RSPDriver.LANE_01_BLET_OUT=1
-RSPDriver.LANE_01_XLET_OUT=0
+RSPDriver.LANE_01_XLET_OUT=5
 RSPDriver.LANE_01_SRCMAC  = 00:22:86:@RING_ID@:@STATION_HID@:01
 RSPDriver.LANE_01_SRCIP   = 10.@IP_PREFIX_01@.@IP_SUBNET_01@.@IP_EXTEN_01@
 RSPDriver.LANE_01_DSTMAC  = @LANE_01_MAC@
 RSPDriver.LANE_01_DSTIP   = @LANE_01_IP@
 
 RSPDriver.LANE_02_BLET_OUT=2
-RSPDriver.LANE_02_XLET_OUT=0
+RSPDriver.LANE_02_XLET_OUT=5
 RSPDriver.LANE_02_SRCMAC  = 00:22:86:@RING_ID@:@STATION_HID@:02
 RSPDriver.LANE_02_SRCIP   = 10.@IP_PREFIX_02@.@IP_SUBNET_02@.@IP_EXTEN_02@
 RSPDriver.LANE_02_DSTMAC  = @LANE_02_MAC@
 RSPDriver.LANE_02_DSTIP   = @LANE_02_IP@
 
 RSPDriver.LANE_03_BLET_OUT=3
-RSPDriver.LANE_03_XLET_OUT=0
+RSPDriver.LANE_03_XLET_OUT=5
 RSPDriver.LANE_03_SRCMAC  = 00:22:86:@RING_ID@:@STATION_HID@:03
 RSPDriver.LANE_03_SRCIP   = 10.@IP_PREFIX_03@.@IP_SUBNET_03@.@IP_EXTEN_03@
 RSPDriver.LANE_03_DSTMAC  = @LANE_03_MAC@
 RSPDriver.LANE_03_DSTIP   = @LANE_03_IP@
 
-RSPDriver.LANE_10_BLET_OUT= 8
-RSPDriver.LANE_10_XLET_OUT= 6
+RSPDriver.LANE_10_BLET_OUT= 6
+RSPDriver.LANE_10_XLET_OUT= @LAST_XLET_OUT@
 RSPDriver.LANE_10_SRCMAC  = 00:22:86:@RING_ID@:@STATION_HID@:00
 RSPDriver.LANE_10_SRCIP   = 10.@IP_PREFIX_00@.@IP_SUBNET_00@.@IP_EXTEN_00@
 RSPDriver.LANE_10_DSTMAC  = @LANE_10_MAC@
 RSPDriver.LANE_10_DSTIP   = @LANE_10_IP@
 
-RSPDriver.LANE_11_BLET_OUT=9
-RSPDriver.LANE_11_XLET_OUT=6
+RSPDriver.LANE_11_BLET_OUT=7
+RSPDriver.LANE_11_XLET_OUT=@LAST_XLET_OUT@
 RSPDriver.LANE_11_SRCMAC  = 00:22:86:@RING_ID@:@STATION_HID@:01
 RSPDriver.LANE_11_SRCIP   = 10.@IP_PREFIX_01@.@IP_SUBNET_01@.@IP_EXTEN_01@
 RSPDriver.LANE_11_DSTMAC  = @LANE_11_MAC@
 RSPDriver.LANE_11_DSTIP   = @LANE_11_IP@
 
-RSPDriver.LANE_12_BLET_OUT=10
-RSPDriver.LANE_12_XLET_OUT=6
+RSPDriver.LANE_12_BLET_OUT=8
+RSPDriver.LANE_12_XLET_OUT=@LAST_XLET_OUT@
 RSPDriver.LANE_12_SRCMAC  = 00:22:86:@RING_ID@:@STATION_HID@:02
 RSPDriver.LANE_12_SRCIP   = 10.@IP_PREFIX_02@.@IP_SUBNET_02@.@IP_EXTEN_02@
 RSPDriver.LANE_12_DSTMAC  = @LANE_12_MAC@
 RSPDriver.LANE_12_DSTIP   = @LANE_12_IP@
 
-RSPDriver.LANE_13_BLET_OUT=11
-RSPDriver.LANE_13_XLET_OUT=6
+RSPDriver.LANE_13_BLET_OUT=9
+RSPDriver.LANE_13_XLET_OUT=@LAST_XLET_OUT@
 RSPDriver.LANE_13_SRCMAC  = 00:22:86:@RING_ID@:@STATION_HID@:03
 RSPDriver.LANE_13_SRCIP   = 10.@IP_PREFIX_03@.@IP_SUBNET_03@.@IP_EXTEN_03@
 RSPDriver.LANE_13_DSTMAC  = @LANE_13_MAC@
 RSPDriver.LANE_13_DSTIP   = @LANE_13_IP@
 
-
 #
 # IGNORE_REMOTE_DATA
 # ------------------

MAC/Deployment/data/StaticMetaData/createFiles

@@ -245,13 +245,15 @@ def createRSPDriverFile(resultDir, stationName, dataDir):
         RSPconfig = RSPconfig.replace("@IP_SUBNET_01@",   ip_parts[2])
         RSPconfig = RSPconfig.replace("@IP_SUBNET_02@",   ip_parts[2])
         RSPconfig = RSPconfig.replace("@IP_SUBNET_03@",   ip_parts[2])
-    else: 
+        RSPconfig = RSPconfig.replace("@LAST_XLET_OUT@",  "11")
+    else: # Non-NL station
         RSPconfig = RSPconfig.replace("@SPLITTER@",str(0))
         hexStationID = str("%02x" % int(stationName[3:6]))
         ringID = '0'+stationName[2]
         RSPconfig = RSPconfig.replace("@STATION_NAME@", stationName)
         RSPconfig = RSPconfig.replace("@RING_ID@",   ringID)
         RSPconfig = RSPconfig.replace("@STATION_HID@",  hexStationID)
+        RSPconfig = RSPconfig.replace("@LAST_XLET_OUT@",  "23")
         rspinfo = findRSPIP(stationName, dataDir)
         for rspNr in range(len(rspinfo)):        
             rspip = rspinfo[rspNr][1]