From 27f6f83b1c2748fff3a8a1bd149d98a44f59f51f Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 1 Dec 2009 20:52:42 +0000 Subject: [PATCH] fix syntax errors --- sfa/methods/create_slice.py | 4 ++-- sfa/methods/delete_slice.py | 6 +++--- sfa/methods/reboot.py | 2 +- sfa/methods/reset_slice.py | 6 +++--- sfa/methods/start_slice.py | 6 +++--- sfa/methods/stop_slice.py | 6 +++--- sfa/server/sfa-server.py | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py index b1a5abf0..299c7833 100644 --- a/sfa/methods/create_slice.py +++ b/sfa/methods/create_slice.py @@ -72,12 +72,12 @@ class create_slice(Method): manager_base = 'sfa.managers' if self.api.interface in ['aggregate']: mgr_type = self.api.config.SFA_AGGREGATE_TYPE - manager_module = manger_base+= ".agregate_manager_%s" % mgr_type + manager_module = manger_base + ".agregate_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.create_slice(self.api, hrn, rspec) elif self.api.interface in ['slicemngr']: mgr_type = self.api.config.SFA_SM_TYPE - manager_module = manger_base+= ".slice_manager_%s" % mgr_type + manager_module = manger_base + ".slice_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.create_slice(self.api, hrn, rspec, caller_cred) diff --git a/sfa/methods/delete_slice.py b/sfa/methods/delete_slice.py index b989ca0c..764a91f9 100644 --- a/sfa/methods/delete_slice.py +++ b/sfa/methods/delete_slice.py @@ -48,17 +48,17 @@ class delete_slice(Method): manager_base = 'sfa.managers' if self.api.interface in ['component']: mgr_type = self.api.config.SFA_CM_TYPE - manager_module = manger_base+= ".component_manager_%s" % mgr_type + manager_module = manger_base + ".component_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.delete_slice(self.api, hrn) elif self.api.interface in ['aggregate']: mgr_type = self.api.config.SFA_AGGREGATE_TYPE - manager_module = manger_base+= ".agregate_manager_%s" % mgr_type + manager_module = manger_base + ".agregate_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.delete_slice(self.api, hrn) elif self.api.interface in ['slicemngr']: mgr_type = self.api.config.SFA_SM_TYPE - manager_module = manger_base+= ".slice_manager_%s" % mgr_type + manager_module = manger_base + ".slice_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.delete_slice(self.api, hrn, caller_cred) diff --git a/sfa/methods/reboot.py b/sfa/methods/reboot.py index 4f062969..90315f84 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_module = manger_base + ".component_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.reboot() diff --git a/sfa/methods/reset_slice.py b/sfa/methods/reset_slice.py index 1bb8b054..4941f5b1 100644 --- a/sfa/methods/reset_slice.py +++ b/sfa/methods/reset_slice.py @@ -40,17 +40,17 @@ class reset_slice(Method): manager_base = 'sfa.managers' if self.api.interface in ['component']: mgr_type = self.api.config.SFA_CM_TYPE - manager_module = manger_base+= ".component_manager_%s" % mgr_type + manager_module = manger_base + ".component_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.reset_slice(self.api, hrn) elif self.api.interface in ['aggregate']: mgr_type = self.api.config.SFA_AGGREGATE_TYPE - manager_module = manger_base+= ".agregate_manager_%s" % mgr_type + manager_module = manger_base + ".agregate_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.reset_slice(self.api, hrn) elif self.api.interface in ['slicemngr']: mgr_type = self.api.config.SFA_SM_TYPE - manager_module = manger_base+= ".slice_manager_%s" % mgr_type + manager_module = manger_base + ".slice_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.reset_slice(self.api, hrn) diff --git a/sfa/methods/start_slice.py b/sfa/methods/start_slice.py index 5032a721..65affb08 100644 --- a/sfa/methods/start_slice.py +++ b/sfa/methods/start_slice.py @@ -41,17 +41,17 @@ class start_slice(Method): manager_base = 'sfa.managers' if self.api.interface in ['component']: mgr_type = self.api.config.SFA_CM_TYPE - manager_module = manger_base+= ".component_manager_%s" % mgr_type + manager_module = manger_base + ".component_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.start_slice(self.api, hrn) elif self.api.interface in ['aggregate']: mgr_type = self.api.config.SFA_AGGREGATE_TYPE - manager_module = manger_base+= ".agregate_manager_%s" % mgr_type + manager_module = manger_base + ".agregate_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.start_slice(self.api, hrn) elif self.api.interface in ['slicemngr']: mgr_type = self.api.config.SFA_SM_TYPE - manager_module = manger_base+= ".slice_manager_%s" % mgr_type + manager_module = manger_base + ".slice_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.start_slice(self.api, hrn) diff --git a/sfa/methods/stop_slice.py b/sfa/methods/stop_slice.py index 58f1640d..1cf4d038 100644 --- a/sfa/methods/stop_slice.py +++ b/sfa/methods/stop_slice.py @@ -41,17 +41,17 @@ class stop_slice(Method): manager_base = 'sfa.managers' if self.api.interface in ['component']: mgr_type = self.api.config.SFA_CM_TYPE - manager_module = manger_base+= ".component_manager_%s" % mgr_type + manager_module = manger_base + ".component_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.stop_slice(self.api, hrn) elif self.api.interface in ['aggregate']: mgr_type = self.api.config.SFA_AGGREGATE_TYPE - manager_module = manger_base+= ".agregate_manager_%s" % mgr_type + manager_module = manger_base + ".agregate_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.stop_slice(self.api, hrn) elif self.api.interface in ['slicemngr']: mgr_type = self.api.config.SFA_SM_TYPE - manager_module = manger_base+= ".slice_manager_%s" % mgr_type + manager_module = manger_base + ".slice_manager_%s" % mgr_type manager = __import__(manager_module, manager_base) manager.stop_slice(self.api, hrn) diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-server.py index de65a8da..d8621b14 100755 --- a/sfa/server/sfa-server.py +++ b/sfa/server/sfa-server.py @@ -134,7 +134,7 @@ def main(): help="run slice manager", default=False) parser.add_option("-a", "--aggregate", dest="am", action="store_true", help="run aggregate manager", default=False) - parser.add_option("-c", "--component", dest="component", action="store_true", + parser.add_option("-c", "--component", dest="cm", action="store_true", help="run component server", default=False) parser.add_option("-v", "--verbose", dest="verbose", action="store_true", help="verbose mode", default=False) -- 2.43.0