equal
deleted
inserted
replaced
100 filepath = os.path.join(self.EDSFolder, file) |
100 filepath = os.path.join(self.EDSFolder, file) |
101 if os.path.isfile(filepath) and os.path.splitext(filepath)[-1] == ".eds": |
101 if os.path.isfile(filepath) and os.path.splitext(filepath)[-1] == ".eds": |
102 result = self.LoadEDS(file) |
102 result = self.LoadEDS(file) |
103 if result != None: |
103 if result != None: |
104 return result |
104 return result |
105 |
105 |
106 print "Load Master" |
|
107 result = self.LoadMasterNode(netname) |
106 result = self.LoadMasterNode(netname) |
108 if result != None: |
107 if result != None: |
109 return result |
108 return result |
110 |
109 |
111 print "Load Slaves" |
|
112 result = self.LoadSlaveNodes(netname) |
110 result = self.LoadSlaveNodes(netname) |
113 if result != None: |
111 if result != None: |
114 return result |
112 return result |
115 |
113 |
116 self.NetworkName = netname |
114 self.NetworkName = netname |