fix syntax errors

diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py
index b1a5abf..299c783 100644 (file)
--- 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 b989ca0..764a91f 100644 (file)
--- 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 4f06296..90315f8 100644 (file)
--- 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 1bb8b05..4941f5b 100644 (file)
--- 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 5032a72..65affb0 100644 (file)
--- 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 58f1640..1cf4d03 100644 (file)
--- 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 de65a8d..d8621b1 100755 (executable)
--- 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)