Changeset 3551ae1 for fedd/federation/proxy_protogeni_segment.py

Timestamp:

May 28, 2010 10:12:41 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

703859f

Parents:

623a2c9

Message:

access is looking better, but segment is a screaming mess. I'm not sure that division makes any sense at all.

File:

• fedd/federation/proxy_protogeni_segment.py (modified) (9 diffs)

fedd/federation/proxy_protogeni_segment.py

@@ -139 +139 @@
 
     def generate_portal_configs(self, parent, topo, pubkey_base, 
-            secretkey_base, tmpdir, master, leid, connInfo, services, nodes):
+            secretkey_base, tmpdir, leid, connInfo, services, nodes):
 
         def conninfo_to_dict(key, info):
@@ -218 +218 @@
         for e in [ e for e in topo.elements \
                 if isinstance(e, topdl.Computer) and e.get_attribute('portal')]:
-            myname = e.name[0]
+            myname = e.name
             type = e.get_attribute('portal_type')
             testbed = e.get_attribute('testbed')
@@ -243 +243 @@
 
             cfn = "%s/%s.gw.conf" % (tmpdir, myname.lower())
-            tunnelconfig = parent.attrs.has_key('TunnelCfg')
+            tunnelconfig = parent.tunnel_config
             try:
                 f = open(cfn, "w")
@@ -277 +277 @@
                     # dir.
                     print >>f, "ExperimentID: %s/%s" % (mproj, meid)
-                    if testbed == master:
-                        print >>f, "SEERBase: True"
                     f.close()
                 except EnvironmentError, e:
@@ -370 +368 @@
 
         for e in [ e for e in topo.elements if isinstance(e, topdl.Computer)]:
-            vname = e.name[0]
+            vname = e.name
             node = nodes.get(vname, {})
             pname = node.get('hostname', None)
@@ -471 +469 @@
 
 
-    def __call__(self, parent, aid, user, rspec, pubkey, secretkey, master,
+    def __call__(self, parent, aid, user, rspec, pubkey, secretkey,
             ename, stagingdir, tmpdir, certfile, certpw, export_certfile, topo,
             connInfo, services, timeout=0):
@@ -489 +487 @@
 
         host = parent.staging_host
+        if not os.access(certfile, os.R_OK):
+            self.log.error("[start_segment]: Cannot read certfile: %s" % \
+                    certfile)
+            return False
         ctxt = fedd_ssl_context(my_cert=certfile, password=certpw)
         # Local software dir
@@ -599 +601 @@
                 connInfo)
         self.generate_portal_configs(parent, topo, pubkey, secretkey, tmpdir, 
-                master, ename, connInfo, services, nodes)
+                ename, connInfo, services, nodes)
 
         # Copy software to the staging machine (done after generation to copy
@@ -651 +653 @@
             parent.state_lock.release()
 
-        # The startcmds for portals and standard nodes (the Master Slave
-        # distinction is going away)
-        gate_cmd = parent.attrs.get('SlaveConnectorStartCmd', '/bin/true')
-        node_cmd = parent.attrs.get('SlaveNodeStartCmd', 'bin/true')
-
         # Now we have configuration to do for ProtoGENI
         self.configure_nodes(topo, nodes, user, parent.staging_host,
-                parent.sshd, parent.sshd_config, gate_cmd, node_cmd, 
+                parent.sshd, parent.sshd_config, parent.portal_startcommand,
+                parent.node_startcommand, 
                 pubkey, secretkey, parent.federation_software, 
                 parent.portal_software, stagingdir, tmpdir)