From: Tony Mack <tmack@cs.princeton.edu>
Date: Wed, 20 May 2009 20:35:43 +0000 (+0000)
Subject: fixed storage path
X-Git-Tag: sfa-0.9-0@14641~373
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0035c82cb74bd4c5e6a970847bf3e7ebcb46d4df;p=sfa.git

fixed storage path
---

diff --git a/geni/util/nodes.py b/geni/util/nodes.py
index 3d7584e8..673d918f 100644
--- a/geni/util/nodes.py
+++ b/geni/util/nodes.py
@@ -20,7 +20,10 @@ class Nodes(SimpleStorage):
         self.api = api
         self.ttl = ttl
         self.threshold = None
-        self.nodes_file = os.sep.join([self.api.server_basedir, self.api.interface +'.'+ self.api.hrn + '.nodes'])
+        path = self.api.config.basepath
+        filename = ".".join([self.api.interface, self.api.hrn, "nodes"])
+        filepath = path + os.sep + filename
+        self.nodes_file = filepath
         SimpleStorage.__init__(self, self.nodes_file)
         self.policy = Policy(api)
         self.load()
diff --git a/geni/util/policy.py b/geni/util/policy.py
index 9d2c5bfb..8b5f5919 100644
--- a/geni/util/policy.py
+++ b/geni/util/policy.py
@@ -6,8 +6,14 @@ from geni.util.debug import log
 class Policy(SimpleStorage):
 
     def __init__(self, api):
-        self.api = api    
-        self.policy_file = os.sep.join([self.api.server_basedir, self.api.interface + '.' + self.api.hrn + '.policy'])
+        self.api = api
+        path = self.api.config.basepath
+        print self.api.config.basepath
+        print path
+        filename = ".".join([self.api.interface, self.api.hrn, "policy"])    
+        print filename
+        filepath = path + os.sep + filename
+        self.policy_file = filepath
         default_policy = {'slice_whitelist': [],
                           'slice_blacklist': [],
                           'node_whitelist': [],
diff --git a/geni/util/slices.py b/geni/util/slices.py
index 5bfc5ee6..7ca3eedd 100644
--- a/geni/util/slices.py
+++ b/geni/util/slices.py
@@ -16,7 +16,10 @@ class Slices(SimpleStorage):
         self.api = api
         self.ttl = ttl
         self.threshold = None
-        self.slices_file = os.sep.join([self.api.server_basedir, self.api.interface +'.'+ self.api.hrn + '.slices'])
+        path = self.api.config.basepath
+        filename = ".".join([self.api.interface, self.api.hrn, "slices"])
+        filepath = path + os.sep + filename
+        self.slices_file = filepath
         SimpleStorage.__init__(self, self.slices_file)
         self.policy = Policy(self.api)    
         self.load()