Changeset 222290f for fedd


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

Legend:

Unmodified
Added
Removed
  • fedd/federation/experiment_control.py

    r0648279 r222290f  
    197197        self.splitter_url = config.get("experiment_control", "splitter_uri")
    198198        self.fedkit = config.get("experiment_control", "fedkit")
     199        self.gatewaykit = config.get("experiment_control", "gatewaykit")
    199200        accessdb_file = config.get("experiment_control", "accessdb")
    200201
     
    10681069                'description' : { 'ns2description': desc },
    10691070                'master': master,
    1070                 'include_fedkit': bool(self.fedkit)
     1071                'include_fedkit': bool(self.fedkit),
     1072                'include_gatewaykit': bool(self.gatewaykit)
    10711073            }
    10721074
     
    10901092        subsittuted line by line.
    10911093        """
    1092         def __init__(self, eid, tmpdir, fedkit):
     1094        def __init__(self, eid, tmpdir, fedkit, gatewaykit):
    10931095            self.begin_testbed = re.compile("^#\s+Begin\s+Testbed\s+\((\w+)\)")
    10941096            self.end_testbed = re.compile("^#\s+End\s+Testbed\s+\((\w+)\)")
     
    11131115            self.tmpdir = tmpdir
    11141116            self.fedkit = fedkit
     1117            self.gatewaykit = gatewaykit
    11151118
    11161119        def __call__(self, line, master, allocated, tbparams):
     
    11951198                        line = re.sub("FEDKIT", os.path.basename(self.fedkit),
    11961199                                line)
     1200                    if self.gatewaykit:
     1201                        line = re.sub("GATEWAYKIT",
     1202                                os.path.basename(self.gatewaykit), line)
    11971203                    print >>self.testbed_file, line
    11981204                return True
     
    16501656                    tclcmd.append('-k')
    16511657
     1658                if self.gatewaykit:
     1659                    tclcmd.append('-K')
     1660
    16521661                tclcmd.extend([pid, gid, eid, tclfile])
    16531662
     
    16621671            # Objects to parse the splitter output (defined above)
    16631672            parse_current_testbed = self.current_testbed(eid, tmpdir,
    1664                     self.fedkit)
     1673                    self.fedkit, self.gatewaykit)
    16651674            parse_allbeds = self.allbeds(self.get_access)
    16661675            parse_gateways = self.gateways(eid, master, tmpdir,
     
    17221731                if self.fedkit:
    17231732                    parse_tarfiles.list.append(self.fedkit)
     1733                if self.gatewaykit:
     1734                    parse_tarfiles.list.append(self.gatewaykit)
    17241735                for t in parse_tarfiles.list:
    17251736                    if not os.path.exists("%s/tarfiles" % tmpdir):
  • fedd/wsdl/fedd_types.xsd

    r0648279 r222290f  
    583583      <xsd:element name="master" type="xsd:string"/>
    584584      <xsd:element name="include_fedkit" type="xsd:bool"/>
     585      <xsd:element name="include_gatewaykit" type="xsd:bool"/>
    585586    </xsd:sequence>
    586587  </xsd:complexType>
Note: See TracChangeset for help on using the changeset viewer.