Changeset 8fbef04 for fedd/federation/emulab_access.py
- Timestamp:
- Mar 10, 2014 5:25:42 PM (11 years ago)
- Branches:
- master
- Children:
- d75005b
- Parents:
- a2ca699
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
fedd/federation/emulab_access.py
ra2ca699 r8fbef04 32 32 import list_log 33 33 import emulab_segment 34 import emulab_shared_nat_segment 34 35 35 36 … … 91 92 self.node_startcommand = config.get("access", "node_startcommand") 92 93 self.nat_portal = config.get("access", "nat_portal") 94 self.shared_nat = config.getboolean("access", "shared_nat") 93 95 94 96 self.uri = 'https://%s:%d' % (socket.getfqdn(), … … 100 102 101 103 self.access_type = self.access_type.lower() 102 self.start_segment = emulab_segment.start_segment 103 self.stop_segment = emulab_segment.stop_segment 104 self.info_segment = emulab_segment.info_segment 105 self.operation_segment = emulab_segment.operation_segment 106 self.exports_segment = emulab_segment.exports_segment 104 if self.shared_nat: 105 self.start_segment = emulab_shared_nat_segment.start_segment 106 self.stop_segment = emulab_shared_nat_segment.stop_segment 107 self.info_segment = emulab_shared_nat_segment.info_segment 108 self.operation_segment = emulab_shared_nat_segment.operation_segment 109 self.exports_segment = emulab_shared_nat_segment.exports_segment 110 else: 111 self.start_segment = emulab_segment.start_segment 112 self.stop_segment = emulab_segment.stop_segment 113 self.info_segment = emulab_segment.info_segment 114 self.operation_segment = emulab_segment.operation_segment 115 self.exports_segment = emulab_segment.exports_segment 107 116 108 117 self.restricted = [ ] … … 541 550 542 551 if self.portal_command: 552 if self.shared_nat: suffix = 'shared nat 0/0/tcp rdr 22/tcp' 553 else: suffix = '' 554 543 555 filters.append(topdl.generate_portal_command_filter( 544 self.portal_command, add_filter=add_filter ))556 self.portal_command, add_filter=add_filter, suffix=suffix)) 545 557 546 558 if self.portal_image: … … 977 989 debug=self.create_debug, log=alloc_log, boss=self.boss, 978 990 ops=self.ops, cert=xmlrpc_cert) 979 exporter(self, ename, proj, user, connInfo, tmpdir, gid) 991 if not exporter(self, ename, proj, user, connInfo, tmpdir, gid): 992 raise service_error(service_error.internal, 993 'Failed to gather export variables') 980 994 self.export_store_info(certfile, proj, ename, connInfo) 981 995 self.import_store_info(certfile, connInfo)
Note: See TracChangeset
for help on using the changeset viewer.