Changeset 14a2f95 for fedd

Timestamp:

Feb 13, 2009 10:27:10 AM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

8dfc06c

Parents:

c8c2c64

Message:

Add support for a command to be issued with the new gateway as the first parameter. The command is set by the destination testbed using the slaveconnectorcmd attribute and any additional parameters using the slaveconnectorcmdparams sttribute. There are analogous master attributes.

File:

• fedd/federation/experiment_control.py (modified) (4 diffs)

fedd/federation/experiment_control.py

@@ -913 +913 @@
             'tunnelinterface': 'tunnelinterface',
             'smbshare': 'smbshare',
+            'slaveconnectorcmd': 'gwcmd',
+            'slaveconnectorcmdparams': 'gwcmdparams',
+            'masterconnectorcmd': 'mgwcmd',
+            'masterconnectorcmdparams': 'mgwcmdparams',
         }
 
@@ -1101 +1105 @@
             self.def_gwimage = "FBSD61-TUNNEL2";
             self.def_gwtype = "pc";
+            self.def_mgwcmd = '# '
+            self.def_mgwcmdparams = ''
+            self.def_gwcmd = '# '
+            self.def_gwcmdparams = ''
 
             self.eid = eid
@@ -1157 +1165 @@
                             self.def_expstart)
                     project = tbparams[self.current_testbed].get('project')
+                    gwcmd = tbparams[self.current_testbed].get('gwcmd', 
+                            self.def_gwcmd)
+                    gwcmdparams = tbparams[self.current_testbed].get(\
+                            'gwcmdparams', self.def_gwcmdparams)
+                    mgwcmd = tbparams[self.current_testbed].get('mgwcmd', 
+                            self.def_gwcmd)
+                    mgwcmdparams = tbparams[self.current_testbed].get(\
+                            'mgwcmdparams', self.def_gwcmdparams)
                     line = re.sub("GWTYPE", gwtype, line)
                     line = re.sub("GWIMAGE", gwimage, line)
@@ -1162 +1178 @@
                         line = re.sub("GWSTART", mgwstart, line)
                         line = re.sub("EXPSTART", mexpstart, line)
+                        # NB GWCMDPARAMS is a prefix of GWCMD, so expand first
+                        line = re.sub("GWCMDPARAMS", mgwcmdparams, line)
+                        line = re.sub("(#\s*)?GWCMD", mgwcmd, line)
                     else:
                         line = re.sub("GWSTART", gwstart, line)
                         line = re.sub("EXPSTART", expstart, line)
+                        # NB GWCMDPARAMS is a prefix of GWCMD, so expand first
+                        line = re.sub("GWCMDPARAMS", gwcmdparams, line)
+                        line = re.sub("(#\s*)?GWCMD", gwcmd, line)
                     line = re.sub("GWCONF", "FEDDIR`hostname`.gw.conf", line)
                     line = re.sub("PROJDIR", "/proj/%s/" % project, line)