Changeset 222290f for fedd

Timestamp:

May 29, 2009 5:15:39 PM (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:

b8a9fb7

Parents:

0648279

Message:

Add gatewaykit, which allows the testbed admins to put other software on
gateway nodes - for example, seer - that's put on experiment nodes
automatically. This mechanism may not be the final one to distribute such
code.

Location:

fedd

Files:

• federation/experiment_control.py (modified) (8 diffs)
• wsdl/fedd_types.xsd (modified) (1 diff)

fedd/federation/experiment_control.py

@@ -197 +197 @@
         self.splitter_url = config.get("experiment_control", "splitter_uri")
         self.fedkit = config.get("experiment_control", "fedkit")
+        self.gatewaykit = config.get("experiment_control", "gatewaykit")
         accessdb_file = config.get("experiment_control", "accessdb")
 
@@ -1068 +1069 @@
                 'description' : { 'ns2description': desc },
                 'master': master,
-                'include_fedkit': bool(self.fedkit)
+                'include_fedkit': bool(self.fedkit),
+                'include_gatewaykit': bool(self.gatewaykit)
             }
 
@@ -1090 +1092 @@
         subsittuted line by line.
         """
-        def __init__(self, eid, tmpdir, fedkit):
+        def __init__(self, eid, tmpdir, fedkit, gatewaykit):
             self.begin_testbed = re.compile("^#\s+Begin\s+Testbed\s+\((\w+)\)")
             self.end_testbed = re.compile("^#\s+End\s+Testbed\s+\((\w+)\)")
@@ -1113 +1115 @@
             self.tmpdir = tmpdir
             self.fedkit = fedkit
+            self.gatewaykit = gatewaykit
 
         def __call__(self, line, master, allocated, tbparams):
@@ -1195 +1198 @@
                         line = re.sub("FEDKIT", os.path.basename(self.fedkit),
                                 line)
+                    if self.gatewaykit:
+                        line = re.sub("GATEWAYKIT",
+                                os.path.basename(self.gatewaykit), line)
                     print >>self.testbed_file, line
                 return True
@@ -1650 +1656 @@
                     tclcmd.append('-k')
 
+                if self.gatewaykit:
+                    tclcmd.append('-K')
+
                 tclcmd.extend([pid, gid, eid, tclfile])
 
@@ -1662 +1671 @@
             # Objects to parse the splitter output (defined above)
             parse_current_testbed = self.current_testbed(eid, tmpdir,
-                    self.fedkit)
+                    self.fedkit, self.gatewaykit)
             parse_allbeds = self.allbeds(self.get_access)
             parse_gateways = self.gateways(eid, master, tmpdir,
@@ -1722 +1731 @@
                 if self.fedkit:
                     parse_tarfiles.list.append(self.fedkit)
+                if self.gatewaykit:
+                    parse_tarfiles.list.append(self.gatewaykit)
                 for t in parse_tarfiles.list:
                     if not os.path.exists("%s/tarfiles" % tmpdir):

fedd/wsdl/fedd_types.xsd

@@ -583 +583 @@
       <xsd:element name="master" type="xsd:string"/>
       <xsd:element name="include_fedkit" type="xsd:bool"/>
+      <xsd:element name="include_gatewaykit" type="xsd:bool"/>
     </xsd:sequence>
   </xsd:complexType>