From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 29 Jan 2009 12:13:36 +0000 (+0000)
Subject: updates
X-Git-Tag: sfa-0.9-0@14641~678
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=88070d8edf4faad92b07da22cad4823a41d21d8b;p=sfa.git

updates
---

diff --git a/geni/slicemgr.py b/geni/slicemgr.py
index 2768cd70..a64a8b01 100644
--- a/geni/slicemgr.py
+++ b/geni/slicemgr.py
@@ -10,22 +10,23 @@ from geni.util.trustedroot import *
 from geni.util.excep import *
 from geni.util.misc import *
 from geni.util.config import Config
+from geni.util.rspec import Rspec
+from geni.util.specdict import *
+from geni.util.storage import SimpleStorage
 
 class SliceMgr(GeniServer):
 
     hrn = None
     key_file = None
     cert_file = None
-    components_file = None
-    slices_file = None    
-    components_ttl = None
-    components = []
-    slices = []    
+    nodes = {}
+    slices = {}
     policy = {}
+    aggregates = {}
     timestamp = None
     threshold = None    
     shell = None
-    aggregates = {}
+    registry = None
     
   
     ##
@@ -42,13 +43,16 @@ class SliceMgr(GeniServer):
         self.cert_file = cert_file
         self.conf = Config(config)
         basedir = self.conf.GENI_BASE_DIR + os.sep
-        server_basedir = basedir + os.sep + "plc" + os.sep
+        server_basedir = basedir + os.sep + "geni" + os.sep
         self.hrn = conf.GENI_INTERFACE_HRN
     
         # Get list of aggregates this sm talks to
         aggregates_file = server_basedir + os.sep + 'aggregates'
+        self.aggregates = SimpleStorage(aggregates_file)
         self.load_aggregates(aggregates_file) 
-        self.components_file = os.sep.join([server_basedir, 'components', 'slicemgr.' + hrn + '.comp'])
+        
+        components_file = os.sep.join([server_basedir, 'components', 'slicemgr.' + hrn + '.comp'])
+        
         self.slices_file = os.sep.join([server_basedir, 'components', 'slicemgr' + hrn + '.slices'])
         self.timestamp_file = os.sep.join([server_basedir, 'components', 'slicemgr' + hrn + '.timestamp']) 
         self.components_ttl = components_ttl