Changeset a2ca699 for fedd/federation/emulab_access.py

Timestamp:

Mar 10, 2014 4:25:32 PM (10 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

8fbef04

Parents:

4a02274 (diff), e1ed2a7b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into shared_nat

File:

• fedd/federation/emulab_access.py (modified) (3 diffs)

fedd/federation/emulab_access.py

@@ -104 +104 @@
         self.info_segment = emulab_segment.info_segment
         self.operation_segment = emulab_segment.operation_segment
+        self.exports_segment = emulab_segment.exports_segment
 
         self.restricted = [ ]
@@ -563 +564 @@
     def export_store_info(self, cf, proj, ename, connInfo):
         """
-        For the export requests in the connection info, install the peer names
-        at the experiment controller via SetValue calls.
+        For the export requests in the connection info, send out teh SetValue
+        calls for parameters initialized by the segment's export_segment
+        object. Values are all in the connInfo parameter's value fields.
         """
 
         for c in connInfo:
-            for p in [ p for p in c.get('parameter', []) \
-                    if p.get('type', '') == 'output']:
-
-                if p.get('name', '') == 'peer':
-                    k = p.get('key', None)
-                    surl = p.get('store', None)
-                    if surl :
-                        if self.nat_portal:
-                            value = self.nat_portal
-                        elif k and k.index('/') != -1:
-                            value = "%s.%s.%s%s" % \
-                                (k[k.index('/')+1:], ename, proj, self.domain)
-                        else: 
-                            self.log.error("Bad export request: %s" % p)
-                            continue
-                        self.log.debug("Setting %s to %s on %s" % \
-                                (k, value, surl))
-                        req = { 'name': k, 'value': value }
-                        self.call_SetValue(surl, req, cf)
-                    else:
-                        self.log.error("Bad export request: %s" % p)
-                elif p.get('name', '') == 'ssh_port':
-                    k = p.get('key', None)
-                    surl = p.get('store', None)
-                    if surl and k:
-                        req = { 'name': k, 'value': self.ssh_port }
-                        self.log.debug("Setting %s to %s on %s" % \
-                                (k, self.ssh_port, surl))
-                        self.call_SetValue(surl, req, cf)
-                    else:
-                        self.log.error("Bad export request: %s" % p)
-                else:
-                    self.log.error("Unknown export parameter: %s" % \
+            for p in c.get('parameter', []):
+                # Ignore non-output parameters
+                if p.get('type', '') != 'output':
+                    continue
+                # Sanity check store, key and value
+                surl = p.get('store', None)
+                key = p.get('key', None)
+                value = p.get('value', None)
+                if surl is None:
+                    self.log.error("Export parameter without store: %s" % \
                             p.get('name'))
                     continue
+                if key is None:
+                    self.log.error("Export parameter without key: %s" % \
+                            p.get('name'))
+                    continue
+                if value is None:
+                    self.log.error("Unknown (unset) export parameter: %s" % \
+                            p.get('name'))
+                    continue
+                # Set the store value
+                req = { 'name': key, 'value': value }
+                self.call_SetValue(surl, req, cf)
 
     def add_seer_node(self, topo, name, startup):
@@ -984 +974 @@
             self.configure_seer_services(services, topo, softdir)
             # Get and send synch store variables
+            exporter = self.exports_segment(keyfile=self.ssh_privkey_file,
+                    debug=self.create_debug, log=alloc_log, boss=self.boss,
+                    ops=self.ops, cert=xmlrpc_cert)
+            exporter(self, ename, proj, user, connInfo, tmpdir, gid)
             self.export_store_info(certfile, proj, ename, connInfo)
             self.import_store_info(certfile, connInfo)