Changeset ab847bc for fedd/federation/emulab_access.py

Timestamp:

Apr 28, 2010 4:09:53 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

12658df

Parents:

05fceef

Message:

New syntax for testbeds that includes a /instance rider. This allows users to
request multiple segments from a single testbed.

File:

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

fedd/federation/emulab_access.py

@@ -4 +4 @@
 import stat # for chmod constants
 import re
+import random
 import string
 import copy
@@ -1458 +1459 @@
                     copy_file(f, "%s/%s" % (softdir, base))
 
+            ename = None
+            pubkey_base = None
+            secretkey_base = None
             for a in attrs:
                 if a['attribute'] in configs:
@@ -1474 +1478 @@
                 if a['attribute'] == 'experiment_name':
                     ename = a['value']
+
+            if not ename:
+                ename = ""
+                for i in range(0,5):
+                    ename += random.choice(string.ascii_letters)
+                self.log.warn("No experiment name: picked one randomly: %s" \
+                        % ename)
+
+            if not pubkey_base:
+                raise service_error(service_error.req, 
+                        "No public key attribute")
+
+            if not secretkey_base:
+                raise service_error(service_error.req, 
+                        "No secret key attribute")
 
             # If the userconf service was imported, collect the configuration