From: Tony Mack Date: Tue, 1 Dec 2009 22:51:08 +0000 (+0000) Subject: fix typo X-Git-Tag: sfa-0.9-7~234 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b80489d0345d12655dfcbb9dfd4563b43eabaab0;p=sfa.git fix typo --- diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py index 46b73b4c..03dcad98 100644 --- a/sfa/methods/create_slice.py +++ b/sfa/methods/create_slice.py @@ -72,7 +72,7 @@ class create_slice(Method): manager_base = 'sfa.managers' if self.api.interface in ['aggregate']: mgr_type = self.api.config.SFA_AGGREGATE_TYPE - manager_module = manager_base + ".agregate_manager_%s" % mgr_type + manager_module = manager_base + ".aggregate_manager_%s" % mgr_type manager = __import__(manager_module, fromlist=manager_base) manager.create_slice(self.api, hrn, rspec) elif self.api.interface in ['slicemgr']: diff --git a/sfa/methods/delete_slice.py b/sfa/methods/delete_slice.py index 82a0f299..0f1fe9e8 100644 --- a/sfa/methods/delete_slice.py +++ b/sfa/methods/delete_slice.py @@ -53,7 +53,7 @@ class delete_slice(Method): 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_module = manager_base + ".aggregate_manager_%s" % mgr_type manager = __import__(manager_module, fromlist=manager_base) manager.delete_slice(self.api, hrn) elif self.api.interface in ['slicemgr']: diff --git a/sfa/methods/get_slices.py b/sfa/methods/get_slices.py index 3968e431..023840b3 100644 --- a/sfa/methods/get_slices.py +++ b/sfa/methods/get_slices.py @@ -45,7 +45,7 @@ class get_slices(Method): 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_module = manager_base + ".aggregate_manager_%s" % mgr_type manager = __import__(manager_module, fromlist=manager_base) slices = manager.get_slices(self.api) elif self.api.interface in ['slicemgr']: diff --git a/sfa/methods/reboot.py b/sfa/methods/reboot.py index 90315f84..bed4d0b9 100644 --- a/sfa/methods/reboot.py +++ b/sfa/methods/reboot.py @@ -30,6 +30,6 @@ class reboot(Method): # send the call to the right manager manager_base = 'sfa.managers' mgr_type = self.api.config.SFA_CM_TYPE - manager_module = manger_base + ".component_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager_module = manager_base + ".component_manager_%s" % mgr_type + manager = __import__(manager_module, fromlist=[manager_base]) manager.reboot() diff --git a/sfa/methods/reset_slice.py b/sfa/methods/reset_slice.py index 817645ee..f8795151 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, fromlist=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, fromlist=manager_base) + manager_module = manager_base + ".aggregate_manager_%s" % mgr_type + 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, fromlist=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 07ea6ca3..717c7da6 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, fromlist=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, fromlist=manager_base) + manager_module = manager_base + ".aggregate_manager_%s" % mgr_type + 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, fromlist=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 8ca6e0f8..7cbd54ee 100644 --- a/sfa/methods/stop_slice.py +++ b/sfa/methods/stop_slice.py @@ -46,7 +46,7 @@ class stop_slice(Method): 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_module = manager_base + ".aggregate_manager_%s" % mgr_type manager = __import__(manager_module, fromlist=manager_base) manager.stop_slice(self.api, hrn) elif self.api.interface in ['slicemgr']: