Corrected bug at for record creation (slice manager) in slab-import.

First modifications to use the slabdriver in OARrspec.py .
sfa/generic/slab.py : SliceManager class .

diff --git a/sfa/generic/slab.py b/sfa/generic/slab.py
index 83e5f6f..07579db 100644 (file)
--- a/sfa/generic/slab.py
+++ b/sfa/generic/slab.py
@@ -16,7 +16,7 @@ class slab (Generic):
     def registry_manager_class (self) : 
         return sfa.managers.registry_manager_slab
     def slicemgr_manager_class (self) : 
-        return sfa.managers.slice_manager_slab
+        return sfa.managers.slice_manager_slab.SliceManager
     def aggregate_manager_class (self) :
         return sfa.managers.aggregate_manager_slab
 

diff --git a/sfa/senslab/OARrspec.py b/sfa/senslab/OARrspec.py
index bed7fd3..e5fdc2e 100644 (file)
--- a/sfa/senslab/OARrspec.py
+++ b/sfa/senslab/OARrspec.py
@@ -15,6 +15,8 @@ from sfa.rspecs.rspec import RSpec
 #from sfa.rspecs.rspec_version import RSpecVersion
 from sfa.rspecs.version_manager import VersionManager
 from sfa.senslab.OARrestapi import *
+from sfa.senslab.slabdriver import SlabDriver
+from sfa.util.config import Config
 
 class OARrspec:
 
@@ -32,6 +34,7 @@ class OARrspec:
 
     def __init__(self ,api, user_options={}):
        self.OARImporter = OARapi()     
+        self.driver = SlabDriver(Config())
        self.user_options = user_options
        self.api = api 
        print >>sys.stderr,"\r\n \r\n \t\t_____________INIT OARRSPEC__ api : %s" %(api)
@@ -46,7 +49,8 @@ class OARrspec:
     
     def prepare_nodes(self, force=False):
         if not self.nodes or force:
-            for node in self.OARImporter.GetNodes():
+            for node in self.driver.GetNodes():
+            #for node in self.OARImporter.GetNodes():
                 self.nodes[node['node_id']] = node
                print >>sys.stderr,'prepare_nodes:node', node
 
@@ -66,7 +70,7 @@ class OARrspec:
 
     def prepare(self, force=False):
         if not self.prepared or force:
-            self.prepare_sites(force)
+            #self.prepare_sites(force)
             self.prepare_nodes(force)
             #self.prepare_links(force)
             #self.prepare_interfaces(force)
@@ -74,20 +78,20 @@ class OARrspec:
             # add site/interface info to nodes
             for node_id in self.nodes:
                 node = self.nodes[node_id]
-                site = self.sites[node['site_id']]
+                #site = self.sites[node['site_id']]
                 #interfaces = [self.interfaces[interface_id] for interface_id in node['interface_ids']]
                 #tags = [self.node_tags[tag_id] for tag_id in node['node_tag_ids']]
-               node['network'] = "senslab"     
+               node['network'] = self.driver.root_auth 
                 node['network_urn'] = hrn_to_urn(node['network'], 'authority+am')
-                node['urn'] = hostname_to_urn(node['network'], site['login_base'], node['hostname'])
-                node['site_urn'] = hrn_to_urn(PlXrn.site_hrn(node['network'], site['login_base']), 'authority+sa') 
-                node['site'] = site
+                node['urn'] = hostname_to_urn(node['network'], node['site_login_base'], node['hostname'])
+                node['site_urn'] = hrn_to_urn(PlXrn.site_hrn(node['network'], node['site_login_base']), 'authority+sa') 
+                #node['site'] = site
                 #node['interfaces'] = interfaces
                 #node['tags'] = tags
                #print >>sys.stderr, "\r\n OAR  prepare ", node 
                
         self.prepared = True  
-       
+       print >>sys.stderr, " \r\n \t\t prepare prepare_nodes \r\n %s " %(self.nodes)
 #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" 

diff --git a/sfa/senslab/slab-import.py b/sfa/senslab/slab-import.py
index c4ac20c..9699f4b 100644 (file)
--- a/sfa/senslab/slab-import.py
+++ b/sfa/senslab/slab-import.py
@@ -28,7 +28,7 @@ if not table.exists():
     table.create()
     
     
-def create_sm_client_record(self):
+def create_sm_client_record():
     """
     Create a user record for the Slicemanager service.
     """
@@ -205,7 +205,7 @@ def main():
             create_top_level_auth_records(interface_hrn)
     
         # create s user record for the slice manager Do we need this?
-        #create_sm_client_record()
+        create_sm_client_record()
         
         # create interface records ADDED 18 nov 11 Do we need this?