Changeset 2453416

Timestamp:

Dec 7, 2010 12:50:48 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

9556f2a

Parents:

c179764 (diff), 1660f7c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

Location:

fedd

Files:

• Makefile (modified) (1 diff)
• fedd_create.py (modified) (2 diffs)
• federation/experiment_control.py (modified) (2 diffs)
• federation/parse_detail.py (modified) (1 diff)
• federation/remote_service.py (modified) (2 diffs)

fedd/Makefile

@@ -15 +15 @@
 
 ${GENERATED_MODS}:      ${WSDL_FILES}
-        wsdl2py --file ../wsdl/fedd.wsdl --complexType --output-dir=${MODULE_DIR}
-        wsdl2py --file ../wsdl/fedd_internal.wsdl --complexType \
-                --types=fedd_services_types --output-dir=${MODULE_DIR}
+        wsdl2py --complexType --output-dir=${MODULE_DIR} ../wsdl/fedd.wsdl 
+        wsdl2py --complexType --output-dir=${MODULE_DIR} ../wsdl/fedd_internal.wsdl 
 
 clean:

fedd/fedd_create.py

@@ -153 +153 @@
 (opts, args) = parser.parse_args()
 
+svcs = []
 # Option processing
 cert, fid, url = wrangle_standard_options(opts)
@@ -199 +200 @@
 
 # Fill in services
-svcs = []
 if opts.master and opts.project:
     svcs.append(project_export_service(opts.master, opts.project))

fedd/federation/experiment_control.py

@@ -1609 +1609 @@
         return top
 
-    def get_testbed_services(self, req):
+    def get_testbed_services(self, req, testbeds):
         """
         Parse the services section of the request into into two dicts mapping
@@ -1924 +1924 @@
                         testbeds.append(tb)
 
-            masters, pmasters = self.get_testbed_services(req)
+            masters, pmasters = self.get_testbed_services(req, testbeds)
             allocated = { }         # Testbeds we can access
             topo ={ }               # Sub topologies

fedd/federation/parse_detail.py

@@ -1 +1 @@
 #!/usr/local/bin/python
 
-from fedd_services import *
+from fedd_client import *
 
 from ZSI.TC import QName, String, URI, AnyElement, UNBOUNDED, Any

fedd/federation/remote_service.py

@@ -18 +18 @@
 from service_error import service_error
 from xmlrpclib import ServerProxy, dumps, loads, Fault, Error, Binary
-
-import fedd_services
-import fedd_internal_services
+try:
+    import fedd_services
+    import fedd_internal_services
+except ImportError:
+    import fedd_server
+    import fedd_client
+
 from util import fedd_ssl_context
 from fedid import fedid
@@ -279 +283 @@
         self.service_name = service_name
 
-        if getattr(fedd_services.feddBindingSOAP, service_name, None):
-            self.locator = fedd_services.feddServiceLocator
-            self.port_name = 'getfeddPortType'
-        elif getattr(fedd_internal_services.feddInternalBindingSOAP, 
-                service_name, None):
-            self.locator = fedd_internal_services.feddInternalServiceLocator
-            self.port_name = 'getfeddInternalPortType'
+        try:
+            if getattr(fedd_services.feddBindingSOAP, service_name, None):
+                self.locator = fedd_services.feddServiceLocator
+                self.port_name = 'getfeddPortType'
+            elif getattr(fedd_internal_services.feddInternalBindingSOAP, 
+                    service_name, None):
+                self.locator = fedd_internal_services.feddInternalServiceLocator
+                self.port_name = 'getfeddInternalPortType'
+        except NameError:
+            if getattr(fedd_client.feddBindingSOAP, service_name, None):
+                self.locator = fedd_client.feddServiceLocator
+                self.port_name = 'getfeddPort'
+            elif getattr(fedd_internal_client.feddInternalBindingSOAP, 
+                    service_name, None):
+                self.locator = fedd_internal_client.feddInternalServiceLocator
+                self.port_name = 'getfedd_internalPort'
+
 
         if request_message: self.request_message = request_message
         else:
             request_message_name = "%sRequestMessage" % service_name
-            self.request_message = \
-                    getattr(fedd_services, request_message_name, None) or \
-                    getattr(fedd_internal_services, request_message_name, None)
+            try:
+                self.request_message = \
+                        getattr(fedd_services, request_message_name, None) or \
+                        getattr(fedd_internal_services, request_message_name,
+                                None)
+            except NameError:
+                self.request_message = \
+                        getattr(fedd_client, request_message_name, None) or \
+                        getattr(fedd_internal_client, request_message_name, 
+                                None)
             if not self.request_message and strict:
                 raise service_error(service_error.internal,