Changeset 63c6664

Timestamp:

Dec 3, 2010 6:02:51 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

ac05658

Parents:

1d73342

Message:

Consolidate some code. More #10.

File:

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

fedd/federation/experiment_control.py

@@ -1181 +1181 @@
                         "More than one project export is not supported")
 
+        def add_services(svcs, type, slist):
+            """
+            Add the given services to slist.  type is import or export.
+            """
+            for i, s in enumerate(svcs):
+                idx = '%s%d' % (type, i)
+                sr = {'id': idx, 'name': s.name, 'visibility': type }
+                if s.params:
+                    sr['fedAttr'] = [ { 'attribute': k, 'value': v } \
+                            for k, v in s.params.items()]
+                slist.append(sr)
+
         uri = tbmap.get(testbed_base(tb), None)
         if not uri:
@@ -1215 +1227 @@
         e_keys = { }
         if import_svcs or export_svcs:
-            req['service'] = [ ]
-
-            for i, s in enumerate(import_svcs):
-                idx = 'import%d' % i
-                sr = {'id': idx, 'name': s.name, 'visibility': 'import' }
-                if s.params:
-                    sr['fedAttr'] = [ { 'attribute': k, 'value': v } \
-                            for k, v in s.params.items()]
-                req['service'].append(sr)
-
-            for i, s in enumerate(export_svcs):
-                idx = 'export%d' % i
-                e_keys[idx] = s
-                sr = {'id': idx, 'name': s.name, 'visibility': 'export' }
-                if s.params:
-                    sr['fedAttr'] = [ { 'attribute': k, 'value': v } 
-                            for k, v in s.params.items()]
-                req['service'].append(sr)
-
+            slist = []
+            add_services(import_svcs, 'import', slist)
+            add_services(import_svcs, 'export', slist)
+            req['service'] = slist
 
         if self.local_access.has_key(uri):