Changeset 7e67ab9

Timestamp:

Apr 28, 2010 10:09:36 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

8e54792

Parents:

12658df

Message:

Add an explicit way to say "export this to everyone" (importall service)

Files:

• fedd/fedd_client.py (modified) (1 diff)
• fedd/federation/experiment_control.py (modified) (1 diff)
• wsdl/fedd_types.xsd (modified) (1 diff)

fedd/fedd_client.py

@@ -1496 +1496 @@
                     'name': 'project_export', 
                     'export': [opts.master], 
+                    'importall': True,
                     'fedAttr': [ 
                         { 'attribute': 'project', 'value': opts.project },

fedd/federation/experiment_control.py

@@ -1690 +1690 @@
             masters = { }           # testbeds exporting services
             for s in tb_services:
-                # If this is a project_export request with the imports field
-                # blank, fill it in.
-                if s.get('name', '') == 'project_export':
-                    if 'import' not in s or len(s['import']) == 0:
-                        s['import'] = [ tb for tb in testbeds \
-                                if tb not in s.get('export',[])]
+                # If this is a project_export request with the importall field
+                # set, fill it out.
+
+                if s.get('importall', False):
+                    s['import'] = [ tb for tb in testbeds \
+                            if tb not in s.get('export',[])]
+                    del s['importall']
+
                 # Add the service to masters
                 for tb in s.get('export', []):

wsdl/fedd_types.xsd

@@ -433 +433 @@
       <xsd:element name="export" type="xsd:string" 
         minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="import" type="xsd:string" 
-        minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:choice>
+        <xsd:element name="import" type="xsd:string" 
+          minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="importall" type="xsd:boolean"/>
+      </xsd:choice>
       <xsd:element name="fedAttr" type="tns:fedAttrType" minOccurs="0"
         maxOccurs="unbounded"/>