Changeset 8fbef04 for fedd

Timestamp:

Mar 10, 2014 5:25:42 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

d75005b

Parents:

a2ca699

Message:

Shared NAT integrated

Location:

fedd

Files:

• deter/topdl.py (modified) (2 diffs)
• federation/emulab_access.py (modified) (5 diffs)
• federation/ssh_emulab_segment.py (modified) (1 diff)
• federation/xmlrpc_emulab_segment.py (modified) (2 diffs)

fedd/deter/topdl.py

@@ -998 +998 @@
     return t
 
-def generate_portal_command_filter(cmd, add_filter=None):
+def generate_portal_command_filter(cmd, add_filter=None, suffix=''):
     def rv(e):
         s =""
@@ -1008 +1008 @@
                 add = True
             if gw and add:
-                s = "%s ${%s}\n" % (cmd, to_tcl_name(e.name))
+                s = "%s ${%s} %s\n" % (cmd, to_tcl_name(e.name), suffix)
         return s
     return rv

fedd/federation/emulab_access.py

@@ -32 +32 @@
 import list_log
 import emulab_segment
+import emulab_shared_nat_segment
 
 
@@ -91 +92 @@
         self.node_startcommand = config.get("access", "node_startcommand")
         self.nat_portal = config.get("access", "nat_portal")
+        self.shared_nat = config.getboolean("access", "shared_nat")
 
         self.uri = 'https://%s:%d' % (socket.getfqdn(), 
@@ -100 +102 @@
 
         self.access_type = self.access_type.lower()
-        self.start_segment = emulab_segment.start_segment
-        self.stop_segment = emulab_segment.stop_segment
-        self.info_segment = emulab_segment.info_segment
-        self.operation_segment = emulab_segment.operation_segment
-        self.exports_segment = emulab_segment.exports_segment
+        if self.shared_nat:
+            self.start_segment = emulab_shared_nat_segment.start_segment
+            self.stop_segment = emulab_shared_nat_segment.stop_segment
+            self.info_segment = emulab_shared_nat_segment.info_segment
+            self.operation_segment = emulab_shared_nat_segment.operation_segment
+            self.exports_segment = emulab_shared_nat_segment.exports_segment
+        else:
+            self.start_segment = emulab_segment.start_segment
+            self.stop_segment = emulab_segment.stop_segment
+            self.info_segment = emulab_segment.info_segment
+            self.operation_segment = emulab_segment.operation_segment
+            self.exports_segment = emulab_segment.exports_segment
 
         self.restricted = [ ]
@@ -541 +550 @@
 
         if self.portal_command:
+            if self.shared_nat: suffix = 'shared nat 0/0/tcp rdr 22/tcp'
+            else: suffix = ''
+
             filters.append(topdl.generate_portal_command_filter(
-                self.portal_command, add_filter=add_filter))
+                self.portal_command, add_filter=add_filter, suffix=suffix))
 
         if self.portal_image:
@@ -977 +989 @@
                     debug=self.create_debug, log=alloc_log, boss=self.boss,
                     ops=self.ops, cert=xmlrpc_cert)
-            exporter(self, ename, proj, user, connInfo, tmpdir, gid)
+            if not exporter(self, ename, proj, user, connInfo, tmpdir, gid):
+                raise service_error(service_error.internal,
+                        'Failed to gather export variables')
             self.export_store_info(certfile, proj, ename, connInfo)
             self.import_store_info(certfile, connInfo)

fedd/federation/ssh_emulab_segment.py

@@ -59 +59 @@
         return rv == 0
 
+    def scp_file_from(self, file, user, host, dest=""):
+        """
+        scp a file to the remote host.  If debug is set the action is only
+        logged.
+        """
+
+        scp_cmd = [self.scp_exec, '-o', 'IdentitiesOnly yes',
+                '-o', 'StrictHostKeyChecking no', '-o', 'ForwardX11 no','-i',
+                self.ssh_privkey_file, "%s@%s:%s" % (user, host, file), dest]
+        rv = 0
+
+        try:
+            dnull = open("/dev/null", "w")
+        except EnvironmentError:
+            self.log.debug("[ssh_file]: failed to open " + \
+                    "/dev/null for redirect")
+            dnull = Null
+
+        self.log.debug("[scp_file]: %s" % " ".join(scp_cmd))
+        if not self.debug:
+            rv = subprocess.call(scp_cmd, stdout=dnull,
+                    stderr=dnull, close_fds=True)
+
+        return rv == 0
+
     def ssh_cmd(self, user, host, cmd, wname=None, timeout=None):
         """

fedd/federation/xmlrpc_emulab_segment.py

@@ -141 +141 @@
         return state
 
-    def make_null_experiment(self, pid, eid, tmpdir, gid=None):
+    def make_null_experiment(self, pid, eid, tmpdir, gid=None, ns_str=None):
         """
         Create a null copy of the experiment so that we capture any logs there
         if the modify fails.  Emulab software discards the logs from a failed
-        startexp.
-        """
+        startexp.  If ns_str is given, use that to construct the null
+        experiment.
+        """
+
+        if ns_str is None:
+            ns_str = self.null
 
         if self.debug:
@@ -157 +161 @@
                     'proj': pid,
                     'exp': eid, 
-                    'nsfilestr': self.null,
+                    'nsfilestr': ns_str,
                     'batch': False,
                     'idleswap': 0,