Changeset f96be61

Timestamp:

Jul 19, 2012 4:36:45 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

5e0b7dc, e5a595e

Parents:

558d829

Message:

Send an error back on service requests to unknown testbeds

File:

• fedd/federation/experiment_control.py (modified) (1 diff)

fedd/federation/experiment_control.py

@@ -1826 +1826 @@
         testbeds to service objects only for services requiring portals.
         """
+
+        # Sanity check the services.  Exports or imports from unknown testbeds
+        # cause an exception.
+        for s in req.get('service', []):
+            for t in s.get('import', []):
+                if t not in testbeds:
+                    raise service_error(service_error.req, 
+                            'Service import to unknown testbed: %s' %t)
+            for t in s.get('export', []):
+                if t not in testbeds:
+                    raise service_error(service_error.req, 
+                            'Service export from unknown testbed: %s' %t)
+
+
         # We construct both dicts here because deriving the second is more
-        # comples than it looks - both the keys and lists can differ, and it's
+        # complex than it looks - both the keys and lists can differ, and it's
         # much easier to generate both in one pass.
         masters = { }