Fixed listing resources (resources cmd from client).

[sfa.git] / sfa / senslab / OARrspec.py

diff --git a/sfa/senslab/OARrspec.py b/sfa/senslab/OARrspec.py
index 039b579..b5028e0 100644 (file)
--- a/sfa/senslab/OARrspec.py
+++ b/sfa/senslab/OARrspec.py
@@ -15,10 +15,11 @@ import json
 
 from sfa.util.xrn import *
 from sfa.util.plxrn import *
-from sfa.rspecs.sfa_rspec import SfaRSpec
-from sfa.rspecs.pg_rspec  import PGRSpec
-from sfa.rspecs.rspec_version import RSpecVersion
-
+#from sfa.rspecs.sfa_rspec import SfaRSpec
+from sfa.rspecs.rspec import RSpec
+#from sfa.rspecs.pg_rspec  import PGRSpec
+#from sfa.rspecs.rspec_version import RSpecVersion
+from sfa.rspecs.version_manager import VersionManager
 from sfa.senslab.OARrestapi import *
 
 class OARrspec:
@@ -69,7 +70,7 @@ class OARrspec:
         if not self.prepared or force:
             self.prepare_sites(force)
             self.prepare_nodes(force)
-            self.prepare_links(force)
+            #self.prepare_links(force)
             #self.prepare_interfaces(force)
             #self.prepare_node_tags(force)         
             # add site/interface info to nodes
@@ -85,24 +86,28 @@ class OARrspec:
                 node['site'] = site
                 #node['interfaces'] = interfaces
                 #node['tags'] = tags
-
-       print >>sys.stderr, "\r\n OAR  prepare ", node 
+               print >>sys.stderr, "\r\n OAR  prepare ", node 
+               
         self.prepared = True  
-
+       
+#from plc/aggregate.py 
     def get_rspec(self, slice_xrn=None, version = None):
        print>>sys.stderr, " \r\n OARrspec \t\t get_spec **************\r\n" 
         self.prepare()
        
         rspec = None
-        rspec_version = RSpecVersion(version)
-       print >>sys.stderr, '\r\n \t\t rspec_version type', rspec_version['type']
-        if rspec_version['type'].lower() == 'sfa':
-            rspec = SfaRSpec("",{},self.user_options)
+       version_manager = VersionManager()
+       version = version_manager.get_version(version)
+        #rspec_version = RSpecVersion(version)
+       #print >>sys.stderr, '\r\n \t\t rspec_version type',version_manager['type']
+       
+       if not slice_xrn:
+            rspec_version = version_manager._get_version(version.type, version.version, 'ad')
         else:
-            rspec = SfaRSpec("",{},self.user_options)
-
-
-        rspec.add_nodes(self.nodes.values())
+            rspec_version = version_manager._get_version(version.type, version.version, 'manifest')
+      
+        rspec = RSpec(version=rspec_version, user_options=self.user_options)
+        rspec.version.add_nodes(self.nodes.values())
        print >>sys.stderr, 'after add_nodes'