Changeset 06c1dba for fedd/federation/emulab_access.py

Timestamp:

Jan 9, 2012 4:05:27 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

c7141dc

Parents:

7f57435

Message:

Fisrt step to multi-user - checkpoint

File:

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

fedd/federation/emulab_access.py

@@ -32 +32 @@
 import topdl
 import list_log
-import proxy_emulab_segment
-import local_emulab_segment
+import emulab_segment
 
 
@@ -98 +97 @@
 
         self.access_type = self.access_type.lower()
-        if self.access_type == 'remote_emulab':
-            self.start_segment = proxy_emulab_segment.start_segment
-            self.stop_segment = proxy_emulab_segment.stop_segment
-            self.info_segment = proxy_emulab_segment.info_segment
-            self.operation_segment = proxy_emulab_segment.operation_segment
-        elif self.access_type == 'local_emulab':
-            self.start_segment = local_emulab_segment.start_segment
-            self.stop_segment = local_emulab_segment.stop_segment
-            self.info_segment = local_emulab_segment.info_segment
-            self.operation_segment = local_emulab_segment.operation_segment
-        else:
-            self.start_segment = None
-            self.stop_segment = None
-            self.info_segment = None
-            self.operation_segment = None
+        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.restricted = [ ]