git://git.onelab.eu / sfa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
the big cleanup: no more flash policy
[sfa.git] / sfa / managers / aggregate_manager_max.py
diff --git a/sfa/managers/aggregate_manager_max.py b/sfa/managers/aggregate_manager_max.py
index 0300522..67b115d 100644 (file)
--- a/sfa/managers/aggregate_manager_max.py
+++ b/sfa/managers/aggregate_manager_max.py
@@ -4,6 +4,7 @@ import re
 
 #from sfa.util.faults import *
 from sfa.util.sfalogging import logger
 
 #from sfa.util.faults import *
 from sfa.util.sfalogging import logger
+from sfa.util.sfatime import SFATIME_FORMAT
 from sfa.util.config import Config
 from sfa.util.callids import Callids
 from sfa.util.version import version_core
 from sfa.util.config import Config
 from sfa.util.callids import Callids
 from sfa.util.version import version_core
@@ -14,15 +15,16 @@ from sfa.util.xrn import urn_to_hrn, hrn_to_urn, Xrn
 
 from sfa.managers.aggregate_manager import AggregateManager
 
 
 from sfa.managers.aggregate_manager import AggregateManager
 
-from sfa.plc.plslices import PlSlices
+from sfa.planetlab.plslices import PlSlices
+
 
 class AggregateManagerMax (AggregateManager):
 
 
 class AggregateManagerMax (AggregateManager):
 
-    def __init__ (self, config):
+    def __init__(self, config):
         pass
 
     RSPEC_TMP_FILE_PREFIX = "/tmp/max_rspec"
         pass
 
     RSPEC_TMP_FILE_PREFIX = "/tmp/max_rspec"
-    
+
     # execute shell command and return both exit code and text output
     def shell_execute(self, cmd, timeout):
         pipe = os.popen('{ ' + cmd + '; } 2>&1', 'r')
     # execute shell command and return both exit code and text output
     def shell_execute(self, cmd, timeout):
         pipe = os.popen('{ ' + cmd + '; } 2>&1', 'r')
@@ -32,13 +34,14 @@ class AggregateManagerMax (AggregateManager):
             line = pipe.read()
             text += line
             time.sleep(1)
             line = pipe.read()
             text += line
             time.sleep(1)
-            timeout = timeout-1
+            timeout = timeout - 1
         code = pipe.close()
         code = pipe.close()
-        if code is None: code = 0
-        if text[-1:] == '\n': text = text[:-1]
+        if code is None:
+            code = 0
+        if text[-1:] == '\n':
+            text = text[:-1]
         return code, text
         return code, text
-    
-   
+
     def call_am_apiclient(self, client_app, params, timeout):
         """
         call AM API client with command like in the following example:
     def call_am_apiclient(self, client_app, params, timeout):
         """
         call AM API client with command like in the following example:
@@ -48,56 +51,57 @@ class AggregateManagerMax (AggregateManager):
           ... params ...
         """
         (client_path, am_url) = Config().get_max_aggrMgr_info()
           ... params ...
         """
         (client_path, am_url) = Config().get_max_aggrMgr_info()
-        sys_cmd = "cd " + client_path + "; java -classpath AggregateWS-client-api.jar:lib/* net.geni.aggregate.client.examples." + client_app + " ./repo " + am_url + " " + ' '.join(params)
+        sys_cmd = "cd " + client_path + "; java -classpath AggregateWS-client-api.jar:lib/* net.geni.aggregate.client.examples." + \
+            client_app + " ./repo " + am_url + " " + ' '.join(params)
         ret = self.shell_execute(sys_cmd, timeout)
         logger.debug("shell_execute cmd: %s returns %s" % (sys_cmd, ret))
         return ret
         ret = self.shell_execute(sys_cmd, timeout)
         logger.debug("shell_execute cmd: %s returns %s" % (sys_cmd, ret))
         return ret
-    
+
     # save request RSpec xml content to a tmp file
     def save_rspec_to_file(self, rspec):
         path = AggregateManagerMax.RSPEC_TMP_FILE_PREFIX + "_" + \
     # save request RSpec xml content to a tmp file
     def save_rspec_to_file(self, rspec):
         path = AggregateManagerMax.RSPEC_TMP_FILE_PREFIX + "_" + \
-            time.strftime('%Y%m%dT%H:%M:%S', time.gmtime(time.time())) +".xml"
+            time.strftime(SFATIME_FORMAT, time.gmtime(time.time())) + ".xml"
         file = open(path, "w")
         file.write(rspec)
         file.close()
         return path
         file = open(path, "w")
         file.write(rspec)
         file.close()
         return path
-    
+
     # get stripped down slice id/name plc.maxpl.xislice1 --> maxpl_xislice1
     def get_plc_slice_id(self, cred, xrn):
         (hrn, type) = urn_to_hrn(xrn)
         slice_id = hrn.find(':')
         sep = '.'
         if hrn.find(':') != -1:
     # get stripped down slice id/name plc.maxpl.xislice1 --> maxpl_xislice1
     def get_plc_slice_id(self, cred, xrn):
         (hrn, type) = urn_to_hrn(xrn)
         slice_id = hrn.find(':')
         sep = '.'
         if hrn.find(':') != -1:
-            sep=':'
+            sep = ':'
         elif hrn.find('+') != -1:
         elif hrn.find('+') != -1:
-            sep='+'
+            sep = '+'
         else:
         else:
-            sep='.'
+            sep = '.'
         slice_id = hrn.split(sep)[-2] + '_' + hrn.split(sep)[-1]
         return slice_id
         slice_id = hrn.split(sep)[-2] + '_' + hrn.split(sep)[-1]
         return slice_id
-    
-    # extract xml 
+
+    # extract xml
     def get_xml_by_tag(self, text, tag):
     def get_xml_by_tag(self, text, tag):
-        indx1 = text.find('<'+tag)
-        indx2 = text.find('/'+tag+'>')
+        indx1 = text.find('<' + tag)
+        indx2 = text.find('/' + tag + '>')
         xml = None
         xml = None
-        if indx1!=-1 and indx2>indx1:
-            xml = text[indx1:indx2+len(tag)+2]
+        if indx1 != -1 and indx2 > indx1:
+            xml = text[indx1:indx2 + len(tag) + 2]
         return xml
 
         return xml
 
-    # formerly in aggregate_manager.py but got unused in there...    
+    # formerly in aggregate_manager.py but got unused in there...
     def _get_registry_objects(self, slice_xrn, creds, users):
         """
     def _get_registry_objects(self, slice_xrn, creds, users):
         """
-    
+
         """
         hrn, _ = urn_to_hrn(slice_xrn)
         """
         hrn, _ = urn_to_hrn(slice_xrn)
-    
+
         #hrn_auth = get_authority(hrn)
         #hrn_auth = get_authority(hrn)
-    
+
         # Build up objects that an SFA registry would return if SFA
         # could contact the slice's registry directly
         reg_objects = None
         # Build up objects that an SFA registry would return if SFA
         # could contact the slice's registry directly
         reg_objects = None
-    
+
         if users:
             # dont allow special characters in the site login base
             #only_alphanumeric = re.compile('[^a-zA-Z0-9]+')
         if users:
             # dont allow special characters in the site login base
             #only_alphanumeric = re.compile('[^a-zA-Z0-9]+')
@@ -107,23 +111,26 @@ class AggregateManagerMax (AggregateManager):
             reg_objects = {}
             site = {}
             site['site_id'] = 0
             reg_objects = {}
             site = {}
             site['site_id'] = 0
-            site['name'] = 'geni.%s' % login_base 
+            site['name'] = 'geni.%s' % login_base
             site['enabled'] = True
             site['max_slices'] = 100
             site['enabled'] = True
             site['max_slices'] = 100
-    
+
             # Note:
             # Is it okay if this login base is the same as one already at this myplc site?
             # Note:
             # Is it okay if this login base is the same as one already at this myplc site?
-            # Do we need uniqueness?  Should use hrn_auth instead of just the leaf perhaps?
+            # Do we need uniqueness?  Should use hrn_auth instead of just the
+            # leaf perhaps?
             site['login_base'] = login_base
             site['abbreviated_name'] = login_base
             site['max_slivers'] = 1000
             reg_objects['site'] = site
             site['login_base'] = login_base
             site['abbreviated_name'] = login_base
             site['max_slivers'] = 1000
             reg_objects['site'] = site
-    
+
             slice = {}
             slice = {}
-            
-            # get_expiration always returns a normalized datetime - no need to utcparse
+
+            # get_expiration always returns a normalized datetime - no need to
+            # utcparse
             extime = Credential(string=creds[0]).get_expiration()
             extime = Credential(string=creds[0]).get_expiration()
-            # If the expiration time is > 60 days from now, set the expiration time to 60 days from now
+            # If the expiration time is > 60 days from now, set the expiration
+            # time to 60 days from now
             if extime > datetime.datetime.utcnow() + datetime.timedelta(days=60):
                 extime = datetime.datetime.utcnow() + datetime.timedelta(days=60)
             slice['expires'] = int(time.mktime(extime.timetuple()))
             if extime > datetime.datetime.utcnow() + datetime.timedelta(days=60):
                 extime = datetime.datetime.utcnow() + datetime.timedelta(days=60)
             slice['expires'] = int(time.mktime(extime.timetuple()))
@@ -133,7 +140,7 @@ class AggregateManagerMax (AggregateManager):
             slice['description'] = hrn
             slice['pointer'] = 0
             reg_objects['slice_record'] = slice
             slice['description'] = hrn
             slice['pointer'] = 0
             reg_objects['slice_record'] = slice
-    
+
             reg_objects['users'] = {}
             for user in users:
                 user['key_ids'] = []
             reg_objects['users'] = {}
             for user in users:
                 user['key_ids'] = []
@@ -142,16 +149,16 @@ class AggregateManagerMax (AggregateManager):
                 user['first_name'] = hrn
                 user['last_name'] = hrn
                 reg_objects['users'][user['email']] = user
                 user['first_name'] = hrn
                 user['last_name'] = hrn
                 reg_objects['users'][user['email']] = user
-    
+
             return reg_objects
             return reg_objects
-    
+
     def prepare_slice(self, api, slice_xrn, creds, users):
         reg_objects = self._get_registry_objects(slice_xrn, creds, users)
         (hrn, type) = urn_to_hrn(slice_xrn)
         slices = PlSlices(self.driver)
         peer = slices.get_peer(hrn)
         sfa_peer = slices.get_sfa_peer(hrn)
     def prepare_slice(self, api, slice_xrn, creds, users):
         reg_objects = self._get_registry_objects(slice_xrn, creds, users)
         (hrn, type) = urn_to_hrn(slice_xrn)
         slices = PlSlices(self.driver)
         peer = slices.get_peer(hrn)
         sfa_peer = slices.get_sfa_peer(hrn)
-        slice_record=None
+        slice_record = None
         if users:
             slice_record = users[0].get('slice_record', {})
         registry = api.registries[api.hrn]
         if users:
             slice_record = users[0].get('slice_record', {})
         registry = api.registries[api.hrn]
@@ -162,7 +169,7 @@ class AggregateManagerMax (AggregateManager):
         slice = slices.verify_slice(hrn, slice_record, peer, sfa_peer)
         # ensure person records exists
         persons = slices.verify_persons(hrn, slice, users, peer, sfa_peer)
         slice = slices.verify_slice(hrn, slice_record, peer, sfa_peer)
         # ensure person records exists
         persons = slices.verify_persons(hrn, slice, users, peer, sfa_peer)
-    
+
     def parse_resources(self, text, slice_xrn):
         resources = []
         urn = hrn_to_urn(slice_xrn, 'sliver')
     def parse_resources(self, text, slice_xrn):
         resources = []
         urn = hrn_to_urn(slice_xrn, 'sliver')
@@ -188,13 +195,14 @@ class AggregateManagerMax (AggregateManager):
                 res['geni_status'] = 'configuring'
             resources.append(res)
         return resources
                 res['geni_status'] = 'configuring'
             resources.append(res)
         return resources
-    
+
     def slice_status(self, api, slice_xrn, creds):
         urn = hrn_to_urn(slice_xrn, 'slice')
         result = {}
         top_level_status = 'unknown'
         slice_id = self.get_plc_slice_id(creds, urn)
     def slice_status(self, api, slice_xrn, creds):
         urn = hrn_to_urn(slice_xrn, 'slice')
         result = {}
         top_level_status = 'unknown'
         slice_id = self.get_plc_slice_id(creds, urn)
-        (ret, output) = self.call_am_apiclient("QuerySliceNetworkClient", [slice_id,], 5)
+        (ret, output) = self.call_am_apiclient(
+            "QuerySliceNetworkClient", [slice_id, ], 5)
         # parse output into rspec XML
         if output.find("Unkown Rspec:") > 0:
             top_level_staus = 'failed'
         # parse output into rspec XML
         if output.find("Unkown Rspec:") > 0:
             top_level_staus = 'failed'
@@ -204,9 +212,9 @@ class AggregateManagerMax (AggregateManager):
             all_active = 0
             if output.find("Status => FAILED") > 0:
                 top_level_staus = 'failed'
             all_active = 0
             if output.find("Status => FAILED") > 0:
                 top_level_staus = 'failed'
-            elif (    output.find("Status => ACCEPTED") > 0 or output.find("Status => PENDING") > 0
-                   or output.find("Status => INSETUP") > 0 or output.find("Status => INCREATE") > 0
-                 ):
+            elif (output.find("Status => ACCEPTED") > 0 or output.find("Status => PENDING") > 0
+                  or output.find("Status => INSETUP") > 0 or output.find("Status => INCREATE") > 0
+                  ):
                 top_level_status = 'configuring'
             else:
                 top_level_status = 'ready'
                 top_level_status = 'configuring'
             else:
                 top_level_status = 'ready'
@@ -214,39 +222,46 @@ class AggregateManagerMax (AggregateManager):
         result['geni_urn'] = urn
         result['geni_status'] = top_level_status
         return result
         result['geni_urn'] = urn
         result['geni_status'] = top_level_status
         return result
-    
+
     def create_slice(self, api, xrn, cred, rspec, users):
         indx1 = rspec.find("<RSpec")
         indx2 = rspec.find("</RSpec>")
         if indx1 > -1 and indx2 > indx1:
     def create_slice(self, api, xrn, cred, rspec, users):
         indx1 = rspec.find("<RSpec")
         indx2 = rspec.find("</RSpec>")
         if indx1 > -1 and indx2 > indx1:
-            rspec = rspec[indx1+len("<RSpec type=\"SFA\">"):indx2-1]
+            rspec = rspec[indx1 + len("<RSpec type=\"SFA\">"):indx2 - 1]
         rspec_path = self.save_rspec_to_file(rspec)
         self.prepare_slice(api, xrn, cred, users)
         slice_id = self.get_plc_slice_id(cred, xrn)
         rspec_path = self.save_rspec_to_file(rspec)
         self.prepare_slice(api, xrn, cred, users)
         slice_id = self.get_plc_slice_id(cred, xrn)
-        sys_cmd = "sed -i \"s/rspec id=\\\"[^\\\"]*/rspec id=\\\"" +slice_id+ "/g\" " + rspec_path + ";sed -i \"s/:rspec=[^:'<\\\" ]*/:rspec=" +slice_id+ "/g\" " + rspec_path
+        sys_cmd = "sed -i \"s/rspec id=\\\"[^\\\"]*/rspec id=\\\"" + slice_id + "/g\" " + \
+            rspec_path + \
+            ";sed -i \"s/:rspec=[^:'<\\\" ]*/:rspec=" + \
+            slice_id + "/g\" " + rspec_path
         ret = self.shell_execute(sys_cmd, 1)
         ret = self.shell_execute(sys_cmd, 1)
-        sys_cmd = "sed -i \"s/rspec id=\\\"[^\\\"]*/rspec id=\\\"" + rspec_path + "/g\""
+        sys_cmd = "sed -i \"s/rspec id=\\\"[^\\\"]*/rspec id=\\\"" + \
+            rspec_path + "/g\""
         ret = self.shell_execute(sys_cmd, 1)
         ret = self.shell_execute(sys_cmd, 1)
-        (ret, output) = self.call_am_apiclient("CreateSliceNetworkClient", [rspec_path,], 3)
+        (ret, output) = self.call_am_apiclient(
+            "CreateSliceNetworkClient", [rspec_path, ], 3)
         # parse output ?
         rspec = "<RSpec type=\"SFA\"> Done! </RSpec>"
         return True
         # parse output ?
         rspec = "<RSpec type=\"SFA\"> Done! </RSpec>"
         return True
-    
+
     def delete_slice(self, api, xrn, cred):
         slice_id = self.get_plc_slice_id(cred, xrn)
     def delete_slice(self, api, xrn, cred):
         slice_id = self.get_plc_slice_id(cred, xrn)
-        (ret, output) = self.call_am_apiclient("DeleteSliceNetworkClient", [slice_id,], 3)
+        (ret, output) = self.call_am_apiclient(
+            "DeleteSliceNetworkClient", [slice_id, ], 3)
         # parse output ?
         return 1
         # parse output ?
         return 1
-    
-    
+
     def get_rspec(self, api, cred, slice_urn):
         logger.debug("#### called max-get_rspec")
     def get_rspec(self, api, cred, slice_urn):
         logger.debug("#### called max-get_rspec")
-        #geni_slice_urn: urn:publicid:IDN+plc:maxpl+slice+xi_rspec_test1
+        # geni_slice_urn: urn:publicid:IDN+plc:maxpl+slice+xi_rspec_test1
         if slice_urn == None:
         if slice_urn == None:
-            (ret, output) = self.call_am_apiclient("GetResourceTopology", ['all', '\"\"'], 5)
+            (ret, output) = self.call_am_apiclient(
+                "GetResourceTopology", ['all', '\"\"'], 5)
         else:
             slice_id = self.get_plc_slice_id(cred, slice_urn)
         else:
             slice_id = self.get_plc_slice_id(cred, slice_urn)
-            (ret, output) = self.call_am_apiclient("GetResourceTopology", ['all', slice_id,], 5)
+            (ret, output) = self.call_am_apiclient(
+                "GetResourceTopology", ['all', slice_id, ], 5)
         # parse output into rspec XML
         if output.find("No resouce found") > 0:
             rspec = "<RSpec type=\"SFA\"> <Fault>No resource found</Fault> </RSpec>"
         # parse output into rspec XML
         if output.find("No resouce found") > 0:
             rspec = "<RSpec type=\"SFA\"> <Fault>No resource found</Fault> </RSpec>"
@@ -255,62 +270,66 @@ class AggregateManagerMax (AggregateManager):
             logger.debug("#### computeResource %s" % comp_rspec)
             topo_rspec = self.get_xml_by_tag(output, 'topology')
             logger.debug("#### topology %s" % topo_rspec)
             logger.debug("#### computeResource %s" % comp_rspec)
             topo_rspec = self.get_xml_by_tag(output, 'topology')
             logger.debug("#### topology %s" % topo_rspec)
-            rspec = "<RSpec type=\"SFA\"> <network name=\"" + Config().get_interface_hrn() + "\">"
+            rspec = "<RSpec type=\"SFA\"> <network name=\"" + \
+                Config().get_interface_hrn() + "\">"
             if comp_rspec != None:
                 rspec = rspec + self.get_xml_by_tag(output, 'computeResource')
             if topo_rspec != None:
                 rspec = rspec + self.get_xml_by_tag(output, 'topology')
             rspec = rspec + "</network> </RSpec>"
         return (rspec)
             if comp_rspec != None:
                 rspec = rspec + self.get_xml_by_tag(output, 'computeResource')
             if topo_rspec != None:
                 rspec = rspec + self.get_xml_by_tag(output, 'topology')
             rspec = rspec + "</network> </RSpec>"
         return (rspec)
-    
+
     def start_slice(self, api, xrn, cred):
         # service not supported
         return None
     def start_slice(self, api, xrn, cred):
         # service not supported
         return None
-    
+
     def stop_slice(self, api, xrn, cred):
         # service not supported
         return None
     def stop_slice(self, api, xrn, cred):
         # service not supported
         return None
-    
+
     def reset_slices(self, api, xrn):
         # service not supported
         return None
     def reset_slices(self, api, xrn):
         # service not supported
         return None
-    
-    ### GENI AM API Methods
-    
+
+    # GENI AM API Methods
+
     def SliverStatus(self, api, slice_xrn, creds, options):
         call_id = options.get('call_id')
     def SliverStatus(self, api, slice_xrn, creds, options):
         call_id = options.get('call_id')
-        if Callids().already_handled(call_id): return {}
+        if Callids().already_handled(call_id):
+            return {}
         return self.slice_status(api, slice_xrn, creds)
         return self.slice_status(api, slice_xrn, creds)
-    
+
     def CreateSliver(self, api, slice_xrn, creds, rspec_string, users, options):
         call_id = options.get('call_id')
     def CreateSliver(self, api, slice_xrn, creds, rspec_string, users, options):
         call_id = options.get('call_id')
-        if Callids().already_handled(call_id): return ""
-        #TODO: create real CreateSliver response rspec
+        if Callids().already_handled(call_id):
+            return ""
+        # TODO: create real CreateSliver response rspec
         ret = self.create_slice(api, slice_xrn, creds, rspec_string, users)
         if ret:
             return self.get_rspec(api, creds, slice_xrn)
         else:
             return "<?xml version=\"1.0\" ?> <RSpec type=\"SFA\"> Error! </RSpec>"
         ret = self.create_slice(api, slice_xrn, creds, rspec_string, users)
         if ret:
             return self.get_rspec(api, creds, slice_xrn)
         else:
             return "<?xml version=\"1.0\" ?> <RSpec type=\"SFA\"> Error! </RSpec>"
-    
+
     def DeleteSliver(self, api, xrn, creds, options):
         call_id = options.get('call_id')
     def DeleteSliver(self, api, xrn, creds, options):
         call_id = options.get('call_id')
-        if Callids().already_handled(call_id): return ""
+        if Callids().already_handled(call_id):
+            return ""
         return self.delete_slice(api, xrn, creds)
         return self.delete_slice(api, xrn, creds)
-    
+
     # no caching
     def ListResources(self, api, creds, options):
         call_id = options.get('call_id')
     # no caching
     def ListResources(self, api, creds, options):
         call_id = options.get('call_id')
-        if Callids().already_handled(call_id): return ""
+        if Callids().already_handled(call_id):
+            return ""
         # version_string = "rspec_%s" % (rspec_version.get_version_name())
         slice_urn = options.get('geni_slice_urn')
         return self.get_rspec(api, creds, slice_urn)
         # version_string = "rspec_%s" % (rspec_version.get_version_name())
         slice_urn = options.get('geni_slice_urn')
         return self.get_rspec(api, creds, slice_urn)
-    
+
     def fetch_context(self, slice_hrn, user_hrn, contexts):
         """
         Returns the request context required by sfatables. At some point, this mechanism should be changed
         to refer to "contexts", which is the information that sfatables is requesting. But for now, we just
         return the basic information needed in a dict.
         """
     def fetch_context(self, slice_hrn, user_hrn, contexts):
         """
         Returns the request context required by sfatables. At some point, this mechanism should be changed
         to refer to "contexts", which is the information that sfatables is requesting. But for now, we just
         return the basic information needed in a dict.
         """
-        base_context = {'sfa':{'user':{'hrn':user_hrn}}}
+        base_context = {'sfa': {'user': {'hrn': user_hrn}}}
         return base_context
         return base_context
-
sfa