Changeset d81971a for fedd/fedd_experiment_control.py

Timestamp:

Nov 17, 2008 6:19:40 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

7583a62

Parents:

afa43a8

Message:

checkpoint of the resource management stuff

File:

• fedd/fedd_experiment_control.py (modified) (6 diffs)

fedd/fedd_experiment_control.py

@@ -869 +869 @@
                 "eventserver": e['eventServer'],
                 "project": unpack_id(p['name']),
-                "emulab" : e
+                "emulab" : e,
+                "allocID" : r['allocID'],
                 }
         # Make the testbed name be the label the user applied
@@ -883 +884 @@
                     tbparam[tb][key]= a['value']
         
+    def release_access(self, tb, aid):
+        """
+        Release access to testbed through fedd
+        """
+
+        uri = self.tbmap.get(tb, None)
+        if not uri:
+            raise service_error(serice_error.server_config, 
+                    "Unknown testbed: %s" % tb)
+
+        # The basic request
+        req = { 'allocID' : aid }
+        
+        # No retry loop here.  Proxy servers must correctly authenticate
+        # themselves without help
+
+        try:
+            ctx = fedd_ssl_context(self.cert_file, 
+                    self.trusted_certs, password=self.cert_pwd)
+        except SSL.SSLError:
+            raise service_error(service_error.server_config, 
+                    "Server certificates misconfigured")
+
+        loc = feddServiceLocator();
+        port = loc.getfeddPortType(uri,
+                transport=M2Crypto.httpslib.HTTPSConnection, 
+                transdict={ 'ssl_context' : ctx })
+
+        # Reconstruct the full request message
+        msg = ReleaseAccessRequestMessage()
+        msg.set_element_ReleaseAccessRequestBody(
+                pack_soap(msg, "ReleaseAccessRequestBody", req))
+
+        try:
+            resp = port.ReleaseAccess(msg)
+        except ZSI.ParseException, e:
+            raise service_error(service_error.req,
+                    "Bad format message (XMLRPC??): %s" % str(e))
+        except ZSI.FaultException, e:
+            resp = e.fault.detail[0]
+
+        # better error coding
+
+
+
     def remote_splitter(self, uri, desc, master):
 
@@ -1510 +1556 @@
                     'name': [ { 'localname' : eid} ],\
                     'emulab': tbparams[k]['emulab'],\
+                    'allocID' : tbparams[k]['allocID'],\
                     'master' : k == master,\
                 }
@@ -1789 +1836 @@
                     domain = fed['emulab']['domain']
                     host  = "%s%s" % (fed['emulab']['ops'], domain)
+                    aid = fed['allocID']
                 except KeyError, e:
                     continue
@@ -1797 +1845 @@
                         'host': host,\
                         'eid': eid,\
+                        'aid': aid,\
                     }
             self.state_lock.release()
@@ -1804 +1853 @@
                 self.stop_segment(tb, tbparams[tb]['eid'], tbparams)
 
-            # Remove teh terminated experiment
+            # release the allocations
+            for tb in tbparams.keys():
+                self.release_access(tb, tbparams[tb]['aid'])
+
+            # Remove the terminated experiment
             self.state_lock.acquire()
             for id in ids: