From: Tony Mack Date: Tue, 1 Dec 2009 22:41:34 +0000 (+0000) Subject: dont forget to provide fromlist when using __import__() X-Git-Tag: sfa-0.9-7~235 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c4557de759ba454cb0cd36740d2701884b7047cf;p=sfa.git dont forget to provide fromlist when using __import__() --- diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py index f51a4c9f..46b73b4c 100644 --- a/sfa/methods/create_slice.py +++ b/sfa/methods/create_slice.py @@ -73,12 +73,12 @@ class create_slice(Method): if self.api.interface in ['aggregate']: mgr_type = self.api.config.SFA_AGGREGATE_TYPE manager_module = manager_base + ".agregate_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.create_slice(self.api, hrn, rspec) elif self.api.interface in ['slicemgr']: mgr_type = self.api.config.SFA_SM_TYPE manager_module = manager_base + ".slice_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.create_slice(self.api, hrn, rspec, caller_cred) return 1 diff --git a/sfa/methods/delete_slice.py b/sfa/methods/delete_slice.py index c2172014..82a0f299 100644 --- a/sfa/methods/delete_slice.py +++ b/sfa/methods/delete_slice.py @@ -49,17 +49,17 @@ class delete_slice(Method): if self.api.interface in ['component']: mgr_type = self.api.config.SFA_CM_TYPE manager_module = manager_base + ".component_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.delete_slice(self.api, hrn) elif self.api.interface in ['aggregate']: mgr_type = self.api.config.SFA_AGGREGATE_TYPE manager_module = manager_base + ".agregate_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.delete_slice(self.api, hrn) elif self.api.interface in ['slicemgr']: mgr_type = self.api.config.SFA_SM_TYPE manager_module = manager_base + ".slice_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.delete_slice(self.api, hrn, caller_cred) return 1 diff --git a/sfa/methods/get_slices.py b/sfa/methods/get_slices.py index f979f35d..3968e431 100644 --- a/sfa/methods/get_slices.py +++ b/sfa/methods/get_slices.py @@ -41,17 +41,17 @@ class get_slices(Method): if self.api.interface in ['component']: mgr_type = self.api.config.SFA_CM_TYPE manager_module = manager_base + ".component_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) slices = manager.get_slices(self.api) elif self.api.interface in ['aggregate']: mgr_type = self.api.config.SFA_AGGREGATE_TYPE manager_module = manager_base + ".agregate_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) slices = manager.get_slices(self.api) elif self.api.interface in ['slicemgr']: mgr_type = self.api.config.SFA_SM_TYPE manager_module = manager_base + ".slice_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) slices = manager.get_slices(self.api) return slices diff --git a/sfa/methods/reset_slice.py b/sfa/methods/reset_slice.py index bee42ebe..817645ee 100644 --- a/sfa/methods/reset_slice.py +++ b/sfa/methods/reset_slice.py @@ -41,17 +41,17 @@ class reset_slice(Method): if self.api.interface in ['component']: mgr_type = self.api.config.SFA_CM_TYPE manager_module = manager_base + ".component_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.reset_slice(self.api, hrn) elif self.api.interface in ['aggregate']: mgr_type = self.api.config.SFA_AGGREGATE_TYPE manager_module = manager_base + ".agregate_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.reset_slice(self.api, hrn) elif self.api.interface in ['slicemgr']: mgr_type = self.api.config.SFA_SM_TYPE manager_module = manager_base + ".slice_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.reset_slice(self.api, hrn) return 1 diff --git a/sfa/methods/start_slice.py b/sfa/methods/start_slice.py index 51a2868e..07ea6ca3 100644 --- a/sfa/methods/start_slice.py +++ b/sfa/methods/start_slice.py @@ -42,17 +42,17 @@ class start_slice(Method): if self.api.interface in ['component']: mgr_type = self.api.config.SFA_CM_TYPE manager_module = manager_base + ".component_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.start_slice(self.api, hrn) elif self.api.interface in ['aggregate']: mgr_type = self.api.config.SFA_AGGREGATE_TYPE manager_module = manager_base + ".agregate_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.start_slice(self.api, hrn) elif self.api.interface in ['slicemgr']: mgr_type = self.api.config.SFA_SM_TYPE manager_module = manager_base + ".slice_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.start_slice(self.api, hrn) return 1 diff --git a/sfa/methods/stop_slice.py b/sfa/methods/stop_slice.py index 2d40ebb4..8ca6e0f8 100644 --- a/sfa/methods/stop_slice.py +++ b/sfa/methods/stop_slice.py @@ -42,17 +42,17 @@ class stop_slice(Method): if self.api.interface in ['component']: mgr_type = self.api.config.SFA_CM_TYPE manager_module = manager_base + ".component_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.stop_slice(self.api, hrn) elif self.api.interface in ['aggregate']: mgr_type = self.api.config.SFA_AGGREGATE_TYPE manager_module = manager_base + ".agregate_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.stop_slice(self.api, hrn) elif self.api.interface in ['slicemgr']: mgr_type = self.api.config.SFA_SM_TYPE manager_module = manager_base + ".slice_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager = __import__(manager_module, fromlist=manager_base) manager.stop_slice(self.api, hrn) return 1