Changeset 14a2f95 for fedd/federation
- Timestamp:
- Feb 13, 2009 10:27:10 AM (16 years ago)
- Branches:
- axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02
- Children:
- 8dfc06c
- Parents:
- c8c2c64
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
fedd/federation/experiment_control.py
rc8c2c64 r14a2f95 913 913 'tunnelinterface': 'tunnelinterface', 914 914 'smbshare': 'smbshare', 915 'slaveconnectorcmd': 'gwcmd', 916 'slaveconnectorcmdparams': 'gwcmdparams', 917 'masterconnectorcmd': 'mgwcmd', 918 'masterconnectorcmdparams': 'mgwcmdparams', 915 919 } 916 920 … … 1101 1105 self.def_gwimage = "FBSD61-TUNNEL2"; 1102 1106 self.def_gwtype = "pc"; 1107 self.def_mgwcmd = '# ' 1108 self.def_mgwcmdparams = '' 1109 self.def_gwcmd = '# ' 1110 self.def_gwcmdparams = '' 1103 1111 1104 1112 self.eid = eid … … 1157 1165 self.def_expstart) 1158 1166 project = tbparams[self.current_testbed].get('project') 1167 gwcmd = tbparams[self.current_testbed].get('gwcmd', 1168 self.def_gwcmd) 1169 gwcmdparams = tbparams[self.current_testbed].get(\ 1170 'gwcmdparams', self.def_gwcmdparams) 1171 mgwcmd = tbparams[self.current_testbed].get('mgwcmd', 1172 self.def_gwcmd) 1173 mgwcmdparams = tbparams[self.current_testbed].get(\ 1174 'mgwcmdparams', self.def_gwcmdparams) 1159 1175 line = re.sub("GWTYPE", gwtype, line) 1160 1176 line = re.sub("GWIMAGE", gwimage, line) … … 1162 1178 line = re.sub("GWSTART", mgwstart, line) 1163 1179 line = re.sub("EXPSTART", mexpstart, line) 1180 # NB GWCMDPARAMS is a prefix of GWCMD, so expand first 1181 line = re.sub("GWCMDPARAMS", mgwcmdparams, line) 1182 line = re.sub("(#\s*)?GWCMD", mgwcmd, line) 1164 1183 else: 1165 1184 line = re.sub("GWSTART", gwstart, line) 1166 1185 line = re.sub("EXPSTART", expstart, line) 1186 # NB GWCMDPARAMS is a prefix of GWCMD, so expand first 1187 line = re.sub("GWCMDPARAMS", gwcmdparams, line) 1188 line = re.sub("(#\s*)?GWCMD", gwcmd, line) 1167 1189 line = re.sub("GWCONF", "FEDDIR`hostname`.gw.conf", line) 1168 1190 line = re.sub("PROJDIR", "/proj/%s/" % project, line)
Note: See TracChangeset
for help on using the changeset viewer.