Changeset 2c1fd21 for fedd

Timestamp:

May 28, 2010 4:02:20 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

fa4a4a8

Parents:

2f6820c

Message:

Importing is a relatively access semantics free endeavour, but export needs to be in each access controller.

Location:

fedd/federation

Files:

• access.py (modified) (1 diff)
• emulab_access.py (modified) (1 diff)

fedd/federation/access.py

@@ -690 +690 @@
                     "Cannot write client.conf: %s" %s)
 
-    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 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 and k and k.index('/') != -1:
-                        value = "%s.%s.%s%s" % \
-                                (k[k.index('/')+1:], ename, proj, self.domain)
-                        req = { 'name': k, 'value': value }
-                        self.log.debug("Setting %s to %s on %s" % \
-                                (k, value, surl))
-                        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" % \
-                            p.get('name'))
-                    continue
-
     def import_store_info(self, cf, connInfo):
         """

fedd/federation/emulab_access.py

@@ -723 +723 @@
                     "Cannot write experiment file %s: %s" % (expfn,e))
 
+    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 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 and k and k.index('/') != -1:
+                        value = "%s.%s.%s%s" % \
+                                (k[k.index('/')+1:], ename, proj, self.domain)
+                        req = { 'name': k, 'value': value }
+                        self.log.debug("Setting %s to %s on %s" % \
+                                (k, value, surl))
+                        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" % \
+                            p.get('name'))
+                    continue
+
+
     def configure_userconf(self, services):
         """