Changeset 8fbef04 for fedd/federation/emulab_access.py

Timestamp:

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

Author:

Ted Faber <faber@…>

Branches:

master

Children:

d75005b

Parents:

a2ca699

Message:

Shared NAT integrated

File:

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

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)