From: Tony Mack <tmack@cs.princeton.edu>
Date: Wed, 6 Jan 2010 02:49:37 +0000 (+0000)
Subject: get the prefix for the sfa system slice from config
X-Git-Tag: sfa-0.9-8~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e38f9a5b92b76f44006cdecf7ea018f72efb348e;p=sfa.git

get the prefix for the sfa system slice from config
---

diff --git a/sfa/plc/api.py b/sfa/plc/api.py
index b5c9ce49..2cf4923d 100644
--- a/sfa/plc/api.py
+++ b/sfa/plc/api.py
@@ -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()
diff --git a/sfa/util/nodemanager.py b/sfa/util/nodemanager.py
index be07cf80..7333e3c9 100644
--- a/sfa/util/nodemanager.py
+++ b/sfa/util/nodemanager.py
@@ -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/"