get the prefix for the sfa system slice from config
authorTony Mack <tmack@cs.princeton.edu>
Wed, 6 Jan 2010 02:49:37 +0000 (02:49 +0000)
committerTony Mack <tmack@cs.princeton.edu>
Wed, 6 Jan 2010 02:49:37 +0000 (02:49 +0000)
sfa/plc/api.py
sfa/util/nodemanager.py

index b5c9ce4..2cf4923 100644 (file)
@@ -425,7 +425,7 @@ class ComponentAPI(BaseAPI):
         if config is None:
             return
 
-        self.nodemanager = NodeManager()
+        self.nodemanager = NodeManager(config)
 
     def sliver_exists(self):
         sliver_dict = self.nodemanager.GetXIDs()
index be07cf8..7333e3c 100644 (file)
@@ -6,14 +6,18 @@ class NodeManager:
 
     method = None
 
+    def __init__(self, config):
+        self.config = config
+
     def __getattr__(self, method):
         self.method = method
         return self.__call__
     
     def __call__(self, *args):
         method = self.method
-        ### WARNING -- hardwired name needs to be computed 
-        sfa_slice = "pl_genicw"
+        ### WARNING -- hardwired name needs to be computed
+        sfa_slice_prefix = self.config.SFA_CM_SLICE_PREFIX 
+        sfa_slice = sfa_slice_prefix + "_sfacm"
         python = "/usr/bin/python"
         vserver_path = "/vservers/%s" % (sfa_slice)
         script_path = "/tmp/"