Minor opticalUtils.py patch

Change-Id: I03e1daf02da024c9a27baf3e1de719f36868e6f9

@@ -251,7 +251,7 @@ class LINCSwitch(OpticalSwitch):
     #--------------------------------------------------------------------------
     #--------------------------------------------------------------------------
     def start_oe(self):
     def start_oe(self):
         '''
         '''
-        start the existing LINC switch
+         existing LINC switch
         '''
         '''
         #starting Switch
         #starting Switch
         cmd = "linc:start_switch({}).\r\n".format(self.lincId)
         cmd = "linc:start_switch({}).\r\n".format(self.lincId)
@@ -344,7 +344,7 @@ class LINCSwitch(OpticalSwitch):
     @staticmethod
     @staticmethod
     def bootOE(net):
     def bootOE(net):
         "Start the LINC optical emulator within a mininet instance"
         "Start the LINC optical emulator within a mininet instance"
-        opticalJSON = {}
+        LINCSwitch.opticalJSON = {}
         linkConfig = []
         linkConfig = []
         devices = []
         devices = []
         #setting up the controllers for LINCSwitch class
         #setting up the controllers for LINCSwitch class
@@ -355,24 +355,24 @@ class LINCSwitch(OpticalSwitch):
                 devices.append(switch.json())
                 devices.append(switch.json())
             else:
             else:
                 devices.append(LINCSwitch.switchJSON(switch))
                 devices.append(LINCSwitch.switchJSON(switch))
-        opticalJSON[ 'devices' ] = devices
+        LINCSwitch.opticalJSON[ 'devices' ] = devices
 
 
         for link in net.links:
         for link in net.links:
             if isinstance(link, LINCLink) :
             if isinstance(link, LINCLink) :
                 linkConfig.append(link.json())
                 linkConfig.append(link.json())
-        opticalJSON[ 'links' ] = linkConfig
+        LINCSwitch.opticalJSON[ 'links' ] = linkConfig
 
 
         info('*** Writing Topology.json file\n')
         info('*** Writing Topology.json file\n')
         with open('Topology.json', 'w') as outfile:
         with open('Topology.json', 'w') as outfile:
-            json.dump(opticalJSON, outfile, indent=4, separators=(',', ': '))
+            json.dump(LINCSwitch.opticalJSON, outfile, indent=4, separators=(',', ': '))
 
 
         info('*** Converting Topology.json to linc-oe format (TopoConfig.json) file (no oecfg) \n')
         info('*** Converting Topology.json to linc-oe format (TopoConfig.json) file (no oecfg) \n')
         
         
         topoConfigJson = {};
         topoConfigJson = {};
         dpIdToName = {};
         dpIdToName = {};
 
 
-        topoConfigJson["switchConfig"] = getSwitchConfig(dpIdToName);
-        topoConfigJson["linkConfig"] = getLinkConfig(dpIdToName);
+        topoConfigJson["switchConfig"] = LINCSwitch.getSwitchConfig(dpIdToName);
+        topoConfigJson["linkConfig"] = LINCSwitch.getLinkConfig(dpIdToName);
 
 
         #Writing to TopoConfig.json
         #Writing to TopoConfig.json
         with open( 'TopoConfig.json', 'w' ) as outfile:
         with open( 'TopoConfig.json', 'w' ) as outfile:
@@ -459,17 +459,19 @@ class LINCSwitch(OpticalSwitch):
                 warn('***WARNING: Could not push topology file to ONOS: %s\n' % output)
                 warn('***WARNING: Could not push topology file to ONOS: %s\n' % output)
 
 
     #converts node ids to linc-oe format, with colons every two chars
     #converts node ids to linc-oe format, with colons every two chars
+    @staticmethod
     def dpId(id):
     def dpId(id):
         nodeDpid = ""
         nodeDpid = ""
         id = id.split("/", 1)[0]
         id = id.split("/", 1)[0]
         for i in range(3, len(id) - 1, 2):
         for i in range(3, len(id) - 1, 2):
             nodeDpid += (id[i:(i + 2):]) + ":"
             nodeDpid += (id[i:(i + 2):]) + ":"
-        return nodeDpid[0:(len(nodeDpid) - 1)];
+        return nodeDpid[0:-1];
 
 
+    @staticmethod
     def getSwitchConfig (dpIdToName):
     def getSwitchConfig (dpIdToName):
         switchConfig = [];
         switchConfig = [];
         #Iterate through all switches and convert the ROADM switches to linc-oe format
         #Iterate through all switches and convert the ROADM switches to linc-oe format
-        for switch in opticalJSON["devices"]:
+        for switch in LINCSwitch.opticalJSON["devices"]:
             if switch.get("type", "none") == "ROADM":
             if switch.get("type", "none") == "ROADM":
                 builtSwitch = {}
                 builtSwitch = {}
 
 
@@ -482,7 +484,7 @@ class LINCSwitch(OpticalSwitch):
                 nodeId = switch["uri"]
                 nodeId = switch["uri"]
 
 
                 #convert the nodeId to linc-oe format
                 #convert the nodeId to linc-oe format
-                nodeDpid = dpId(nodeId);
+                nodeDpid = LINCSwitch.dpId(nodeId);
 
 
                 builtSwitch["name"] = switch.get("name", "none");
                 builtSwitch["name"] = switch.get("name", "none");
 
 
@@ -500,18 +502,18 @@ class LINCSwitch(OpticalSwitch):
                 switchConfig.append(builtSwitch);
                 switchConfig.append(builtSwitch);
         return switchConfig
         return switchConfig
 
 
-
+    @staticmethod
     def getLinkConfig (dpIdToName):
     def getLinkConfig (dpIdToName):
         newLinkConfig = [];
         newLinkConfig = [];
         #Iterate through all optical links and convert them to linc-oe format
         #Iterate through all optical links and convert them to linc-oe format
-        for link in opticalJSON["links"]:
+        for link in LINCSwitch.opticalJSON["links"]:
             if link.get("type", "none") == "OPTICAL":
             if link.get("type", "none") == "OPTICAL":
                 builtLink = {}
                 builtLink = {}
 
 
                 #set basic link params for src and dst
                 #set basic link params for src and dst
                 builtLink["allowed"] = True;
                 builtLink["allowed"] = True;
-                builtLink["nodeDpid1"] = dpId(link["src"])
-                builtLink["nodeDpid2"] = dpId(link["dst"])
+                builtLink["nodeDpid1"] = LINCSwitch.dpId(link["src"])
+                builtLink["nodeDpid2"] = LINCSwitch.dpId(link["dst"])
 
 
                 #set more params such as name/bandwidth/port/waves if they exist
                 #set more params such as name/bandwidth/port/waves if they exist
                 params = {}
                 params = {}