Changeset e40c7ee for fedd/fedd_create_experiment.py

Timestamp:

Sep 10, 2008 1:17:43 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

89d9502

Parents:

03e0290

Message:

more data on a create request, including user requested local name

File:

• fedd/fedd_create_experiment.py (modified) (8 diffs)

fedd/fedd_create_experiment.py

@@ -624 +624 @@
                 'destinationTestbed' : { 'uri' : uri },
                 'user':  user,
-                'allocID' : { 'username': 'test' },
+                'allocID' : { 'localname': 'test' },
                 'access' : [ { 'sshPubkey' : self.ssh_pubkey } ]
             }
@@ -1077 +1077 @@
         pid = "dummy"
         gid = "dummy"
-        eid = self.exp_stem
-        if self.randomize_experiments:
-            for i in range(0,5):
-                eid += random.choice(string.ascii_letters)
         # XXX
         fail_soft = False
@@ -1106 +1102 @@
         else:
             raise service_error(service_error.req, "No experiment description")
+
+        if req.has_key('experimentID') and \
+                req['experimentID'].has_key('localname'):
+            eid = req['experimentID']['localname']
+            while (self.state.has_key(eid)):
+                eid += random.choice(string.ascii_letters)
+        else:
+            eid = self.exp_stem
+            for i in range(0,5):
+                eid += random.choice(string.ascii_letters)
+            while (self.state.has_key(eid)):
+                eid = self.exp_stem
+                for i in range(0,5):
+                    eid += random.choice(string.ascii_letters)
 
         try:
@@ -1172 +1182 @@
                     "Failed to generate visualization")
 
+        # save federant information
+        for k in allocated.keys():
+            tbparams[k]['federant'] = {\
+                    'name': [ { 'localname' : k} ],\
+                    'emulab': tbparams[k]['emulab'],\
+                    'master' : k == master,\
+                }
+
+
         # Copy tarfiles and rpms needed at remote sites into a staging area
         try:
@@ -1254 +1273 @@
         os.rmdir(tmpdir)
 
-        resp = { 'emulab' : [ tbparams[tb]['emulab'] \
+        resp = { 'federant' : [ tbparams[tb]['federant'] \
                 for tb in tbparams.keys() \
-                    if tbparams[tb].has_key('emulab') ],\
+                    if tbparams[tb].has_key('federant') ],\
                     'experiment': vtopo,\
                     'vis' : vis,
-                    'experimentID' : { 'fedid': expid },\
+                    'experimentID' : [\
+                            { 'fedid': expid }, { 'localname': eid },\
+                        ],\
                     'experimentAccess': { 'X509' : expcert },\
                 }
         
         self.state[expid] = {\
-                'emulab': [ tbparams[tb]['emulab'] \
+                'fedid': expid,
+                'localname': eid,
+                'federant': [ tbparams[tb]['federant'] \
                     for tb in tbparams.keys() \
-                        if tbparams[tb].has_key('emulab') ],\
+                        if tbparams[tb].has_key('federant') ],\
                 'vis': vis,\
                 'vtopo': vtopo,\
             }
+        self.state[eid] = self.state[expid]
             
         return resp
@@ -1279 +1303 @@
             raise service_error(service_error.req,
                     "Bad request format (no VtopoRequestBody)")
-        if req.has_key('experiment') and req['experiment'].has_key('fedid'):
-            qfedid = req['experiment']['fedid']
+        exp = req.get('experiment', None)
+        if exp:
+            if exp.has_key('fedid'):
+                key = fedid(bits=exp['fedid'])
+                keytype = "fedid"
+            elif exp.has_key('localname'):
+                key = exp['localname']
+                keytype = "localname"
+            else:
+                raise service_error(service_error.req, "Unknown lookup type")
         else:
-            raise service_error(service_error.req, "Use fedid for lookup")
-
-        if self.state.has_key(qfedid):
-            return { 'experiment' : {'fedid': qfedid },\
-                    'vtopo': self.state[qfedid]['vtopo'],\
+            raise service_error(service_error.req, "No request?")
+
+        if self.state.has_key(key):
+            return { 'experiment' : {keytype: key },\
+                    'vtopo': self.state[key]['vtopo'],\
                     }
         else:
@@ -1297 +1329 @@
             raise service_error(service_error.req,
                     "Bad request format (no VisRequestBody)")
-        if req.has_key('experiment') and req['experiment'].has_key('fedid'):
-            qfedid = req['experiment']['fedid']
+        exp = req.get('experiment', None)
+        if exp:
+            if exp.has_key('fedid'):
+                key = fedid(bits=exp['fedid'])
+                keytype = "fedid"
+            elif exp.has_key('localname'):
+                key = exp['localname']
+                keytype = "localname"
+            else:
+                raise service_error(service_error.req, "Unknown lookup type")
         else:
-            raise service_error(service_error.req, "Use fedid for lookup")
-
-        if self.state.has_key(qfedid):
-            return { 'experiment' : {'fedid': qfedid },\
-                    'vis': self.state[qfedid]['vis'],\
+            raise service_error(service_error.req, "No request?")
+
+        if self.state.has_key(key):
+            return { 'experiment' : {keytype: key },\
+                    'vis': self.state[key]['vis'],\
                     }
         else:
@@ -1366 +1406 @@
             'experimentdescription' : content, 
             'master' : opts.master, 
-            'user': [ {'userID' : { 'username' : 'faber' } } ],
+            'user': [ {'userID' : { 'localname' : 'faber' } } ],
             },
             None)