Changeset 6280b1f for fedd/federation

Timestamp:

Mar 4, 2010 3:18:09 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

289ff7e

Parents:

f81aba7

Message:

SSH port numbers

File:

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

fedd/federation/emulab_access.py

@@ -74 +74 @@
         self.ssh_privkey_file = config.get("access","ssh_privkey_file")
         self.ssh_pubkey_file = config.get("access","ssh_pubkey_file")
+        self.ssh_port = config.get("access","ssh_port") or "22"
         self.create_debug = config.getboolean("access", "create_debug")
         self.cleanup = not config.getboolean("access", "leave_tmpfiles")
@@ -1046 +1047 @@
                                 s.get('visibility','') == 'import':
                             client_service_out[s['name']](f, s)
-                    # Does seer need this?
-                    # print >>f, "ExperimentID: %s/%s" % (mproj, meid)
+                    # Does seer need this? (evidently so)
+                    print >>f, "ExperimentID: %s/%s" % (mproj, meid)
                     f.close()
                 except IOError, e:
@@ -1212 +1213 @@
                     if p.get('type', '') == 'output']:
 
-                if p.get('name', '') != 'peer':
+                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.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.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
-
-                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.call_SetValue(surl, req, cf)
-                else:
-                    self.log.error("Bad export request: %s" % p)
 
     def import_store_info(self, cf, connInfo):