Changeset c261c0f for fedd

Timestamp:

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

Author:

Ted Faber <faber@…>

Branches:

master

Children:

e48d8eb

Parents:

f7fc551

Message:

Moving to new name and creating real federation connections

Location:

fedd/federation

Files:

• containers_access.py (moved) (moved from fedd/federation/benito_access.py) (5 diffs)
• containers_segment.py (moved) (moved from fedd/federation/benito_segment.py) (3 diffs)
• deter_impl.py (modified) (2 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:

fedd/federation/containers_segment.py

@@ -24 +24 @@
         ssh_emulab_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
         xmlrpc_emulab_segment.__init__(self, boss=boss, ops=ops, cert=cert)
-        self.start_mixed = '/share/benito/start_mixed %s %s %s'
-        self.start_qemu =  '/share/benito/start_qemu %s %s %s'
+        # XXX: better way to work this...
+        self.containerize = '/share/containers-dev/containerize.py --config /share/containers-dev/site.conf %s %s %s'
 
     def get_mapping(self, pid, eid):
         """
-        Benito's info reporting is not sufficient to support this yet
+        Containers's info reporting is not sufficient to support this yet
         """
         pass
@@ -103 +103 @@
         """
 
-        # benito listens to the filename extension.  tclfile here is really
+        # containers listens to the filename extension.  tclfile here is really
         # topdl, but we'll move it to a different filename.
         if tclfile.endswith('.tcl'):
             topdlfile = os.path.join(tmpdir, 'experiment.xml')
-            os.rename(tclfile, topdlfile)
+            self.ssh_cmd(user, self.ops, 'mv %s %s' % (tclfile, topdlfile))
         else:
             topdlfile = tclfile
@@ -117 +117 @@
             self.terminate_exp(pid, eid)
 
-        top = topdl.topology_from_xml(filename=topdlfile, top='experiment')
-        embedded = False
-        for e in top.elements:
-            if isinstance(e, topdl.Computer) and \
-                    e.get_attribute('partition') is not None:
-                embedded = True
-                break
-        # on the for
-        else:
-            embedded = False
-
-        if embedded:
-            cmd = self.start_mixed  %  (pid, eid, topdlfile)
-        else:
-            cmd = self.start_qemu % (pid, eid, topdlfile, 20)
+        cmd = self.containerize  %  (pid, eid, topdlfile)
 
         if not self.ssh_cmd(user, self.ops, cmd):
-            self.log.error("Cannot create benito experiment")
+            self.log.error("Cannot create containers experiment")
+            return False
+
+        if not self.set_up_experiment_filespace(user, self.ops, 
+                pid, eid, tmpdir):
             return False
 

fedd/federation/deter_impl.py

@@ -7 +7 @@
 import protogeni_access
 import deter_internal_access
-import benito_access
+import containers_access
 import desktop_access
 import skeleton_access
@@ -88 +88 @@
                     self.access = deter_internal_access.access(config,
                             self.auth)
-                elif self.access_type == "benito":
-                    self.access = benito_access.access(config, self.auth)
+                elif self.access_type == "containers":
+                    self.access = containers_access.access(config, self.auth)
                 elif self.access_type == "desktop":
                     self.access = desktop_access.access(config, self.auth)