Changeset 17c6d91 for fedd

Timestamp:

Feb 1, 2013 1:53:10 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

f7fc551

Parents:

328e93f

Message:

More principled default testbed handling

File:

• fedd/federation/experiment_control.py (modified) (2 diffs)

fedd/federation/experiment_control.py

@@ -139 +139 @@
         self.auth_dir = config.get('experiment_control', 'auth_dir')
         self.routing = config.get('experiment_control', 'routing')
+        self.default_tb = config.get('experiment_control', 'default_testbed')
         # XXX: document this!
         self.info_cache_limit = \
@@ -2334 +2335 @@
                 if isinstance(e, topdl.Computer):
                     tb = e.get_attribute('testbed')
-                    # Put nodes not in a testbed into the 'default' testbed if
-                    # 'default' is in the fedd map, the instantiation will
-                    # work.
+                    # Put nodes not in a testbed into the default testbed if
+                    # there is one.
                     if tb is None:
-                        tb = 'default'
+                        if self.default_tb is None:
+                            raise service_error(service_error.req, 
+                                '%s not in a testbed (and no default)' % e.name)
+                        tb = self.default_tb
                         e.set_attribute('testbed', tb)
                     if tb in tb_hosts: tb_hosts[tb].append(e.name)