Changeset 9c3e77f for fedd

Timestamp:

Apr 13, 2012 6:08:12 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

934dd99

Parents:

66795cf0

Message:

Add information about the project and experiment into the experiment
description

File:

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

fedd/federation/emulab_access.py

@@ -11 +11 @@
 import subprocess
 import traceback
+import socket
 
 from threading import *
@@ -89 +90 @@
         self.portal_startcommand = config.get("access", "portal_startcommand")
         self.node_startcommand = config.get("access", "node_startcommand")
+
+        self.uri = 'https://%s:%d' % (socket.getfqdn(), 
+                self.get_port(config.get("globals", "services", "23235")))
 
         self.federation_software = self.software_list(self.federation_software)
@@ -172 +176 @@
         self.call_SetValue = service_caller('SetValue')
         self.call_GetValue = service_caller('GetValue', log=self.log)
+
+    @staticmethod
+    def get_port(ps):
+        '''
+        Take a fedd service string and return the first port.  Used in 
+        creating the testbed uri identifier.
+        '''
+        p = ps.split(',')
+        smallport = p[0].split(':')
+        try:
+            rv = int(smallport[0])
+        except ValueError:
+            rv = 23235
+        return rv
 
     @staticmethod
@@ -818 +836 @@
         the response that may need to be replayed, and return the response.
         """
+        def get_localnames(t):
+            names = [ ]
+            for e in t.elements:
+                if isinstance(e, topdl.Computer):
+                    n = e.get_attribute('testbed')
+                    if n is not None and n not in names:
+                        names.append(n)
+            return names
         i = 0
         t = topo.clone()
@@ -824 +850 @@
         # sorry)
         self.state_lock.acquire()
+        # Put information about this testbed into the topdl
+        tb = topdl.Testbed(self.uri, "deter",
+                localname=get_localnames(t), 
+                attribute=[ 
+                    { 
+                        'attribute': 'project', 
+                        'value': self.allocation[aid]['project']
+                    },
+                    { 
+                        'attribute': 'experiment', 
+                        'value': self.allocation[aid]['experiment']
+                    }])
+        t.elements.append(tb)
         logv = "".join(self.allocation[aid]['log'])
         # It's possible that the StartSegment call gets retried (!).