First modifications to use the slabdriver in OARrspec.py .
sfa/generic/slab.py : SliceManager class .
def registry_manager_class (self) :
return sfa.managers.registry_manager_slab
def slicemgr_manager_class (self) :
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
def aggregate_manager_class (self) :
return sfa.managers.aggregate_manager_slab
#from sfa.rspecs.rspec_version import RSpecVersion
from sfa.rspecs.version_manager import VersionManager
from sfa.senslab.OARrestapi import *
#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
def __init__(self ,api, user_options={}):
self.OARImporter = OARapi()
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)
self.user_options = user_options
self.api = api
print >>sys.stderr,"\r\n \r\n \t\t_____________INIT OARRSPEC__ api : %s" %(api)
def prepare_nodes(self, force=False):
if not self.nodes or force:
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
self.nodes[node['node_id']] = node
print >>sys.stderr,'prepare_nodes:node', node
def prepare(self, force=False):
if not self.prepared or force:
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)
self.prepare_nodes(force)
#self.prepare_links(force)
#self.prepare_interfaces(force)
# add site/interface info to nodes
for node_id in self.nodes:
node = self.nodes[node_id]
# 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']]
#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['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
#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"
#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"
-def create_sm_client_record(self):
+def create_sm_client_record():
"""
Create a user record for the Slicemanager service.
"""
"""
Create a user record for the Slicemanager service.
"""
create_top_level_auth_records(interface_hrn)
# create s user record for the slice manager Do we need this?
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?
# create interface records ADDED 18 nov 11 Do we need this?