Changeset 4ffa6f8 for fedd/federation/emulab_access.py

Timestamp:

Jul 12, 2012 5:48:44 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

87b1a06

Parents:

4708875

Message:

Add support for nat_portal parameter. Remove old half-assed active
endpoints

File:

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

fedd/federation/emulab_access.py

@@ -90 +90 @@
         self.portal_startcommand = config.get("access", "portal_startcommand")
         self.node_startcommand = config.get("access", "node_startcommand")
+        self.nat_portal = config.get("access", "nat_portal")
 
         self.uri = 'https://%s:%d' % (socket.getfqdn(), 
@@ -552 +553 @@
                     k = p.get('key', None)
                     surl = p.get('store', None)
-                    if surl and k and k.index('/') != -1:
-                        value = "%s.%s.%s%s" % \
+                    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)
-                        req = { 'name': k, 'value': value }
+                        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: