Changeset c261c0f for fedd/federation/containers_access.py

Timestamp:

Feb 1, 2013 5:15:31 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

e48d8eb

Parents:

f7fc551

Message:

Moving to new name and creating real federation connections

File:

• fedd/federation/containers_access.py (moved) (moved from fedd/federation/benito_access.py) (5 diffs)

fedd/federation/containers_access.py

@@ -30 +30 @@
 from deter import topdl
 import list_log
-import benito_segment
+import containers_segment
 
 
@@ -56 +56 @@
         emulab_access.__init__(self, config, auth)
 
+        self.containerize = config.get('access', 'containerize')
+
         # Segment creation is where most of the differences are.
-        self.start_segment = benito_segment.start_segment
-        self.stop_segment = benito_segment.stop_segment
-        self.info_segment = benito_segment.info_segment
+        self.start_segment = containers_segment.start_segment
+        self.stop_segment = containers_segment.stop_segment
+        self.info_segment = containers_segment.info_segment
 
     # These are subroutines for StartSegment
@@ -65 +67 @@
         """
         Benito is expecting a topdl file, so this routine is misnamed.  It does
-        clean up the topdl, removing elements benito doesn't understand and
+        clean up the topdl, removing elements containers doesn't understand and
         writing out the file.
         """
@@ -79 +81 @@
             if isinstance(e, topdl.Segment):
                 t.elements.remove(e)
+            if not isinstance(e, topdl.Computer): continue
+            if e.get_attribute('portal'):
+                e.set_attribute('containers:node_type', 'embedded_pnode')
             # Fix software paths
             for s in getattr(e, 'software', []):
@@ -86 +91 @@
         t.incorporate_elements()
 
-        # Convert to ns and write it out
+        # Write it out
         expfile = topdl.topology_to_xml(t, top='experiment')
         try: