import time
import xmlrpclib
+from types import StringTypes, ListType
from geni.util.geniserver import GeniServer
from geni.util.geniclient import *
from geni.util.cert import Keypair, Certificate
self.nodes_ttl = 1
self.connectPLC()
- #self.connectRegistry()
- #self.loadCredential()
+ self.connectRegistry()
+ self.loadCredential()
def connectRegistry(self):
"""
# connect to registry using GeniClient
address = self.config.GENI_REGISTRY_HOSTNAME
port = self.config.GENI_REGISTRY_PORT
- url = 'https://%(address)s:%(port)s' % locals()
+ url = 'http://%(address)s:%(port)s' % locals()
self.registry = GeniClient(url, self.key_file, self.cert_file)
Attempt to load credential from file if it exists. If it doesnt get
credential from registry.
"""
-
- self_cred_filename = self.server_basedir + os.sep + "agg." + self.hrn + ".cred"
- ma_cred_filename = self.server_basedir + os.sep + "agg." + self.hrn + ".ma.cred"
# see if this file exists
+ ma_cred_filename = self.server_basedir + os.sep + "agg." + self.hrn + ".ma.cred"
try:
- cred = Credential(filename = ma_cred_filename, subject=self.hrn)
- self.credential = cred.save_to_string()
+ self.credential = Credential(filename = ma_cred_filename)
except IOError:
# get self credential
- self_cred = self.registry.get_credential(None, 'ma', self.hrn)
- self_credential = Credential(string = self_cred)
- self_credential.save_to_file(self_cred_filename)
+ self.credential = self.getCredentialFromRegistry()
- # get ma credential
- ma_cred = self.registry.get_credential(self_cred)
- ma_credential = Credential(string = ma_cred)
- ma_credential.save_to_file(ma_cred_filename)
- self.credential = ma_cred
+ def getCredentialFromRegistry(self):
+ """
+ Get our current credential from the registry
+ """
+ # get self credential
+ self_cred_filename = self.server_basedir + os.sep + "agg." + self.hrn + ".cred"
+ self_cred = self.registry.get_credential(None, 'ma', self.hrn)
+ self_cred.save_to_file(self_cred_filename, save_parents = True)
+
+ # get ma credential
+ ma_cred_filename = self.server_basedir + os.sep + "agg." + self.hrn + ".ma.cred"
+ ma_cred = self.registry.get_credential(self_cred, 'ma', self.hrn)
+ ma_cred.save_to_file(ma_cred_filename, save_parents=True)
+ return ma_cred
def hostname_to_hrn(self, login_base, hostname):
"""
# Get the required nodes
if type in ['aggregate']:
nodes = self.shell.GetNodes(self.auth)
+ try: linkspecs = self.shell.GetLinkSpecs() # if call is supported
+ except: linkspecs = []
elif type in ['slice']:
slicename = hrn_to_pl_slicename(hrn)
slices = self.shell.GetSlices(self.auth, [slicename])
duration = end_time - start_time
# create the plc dict
- networks = [{'nodes': nodes, 'name': self.hrn, 'start_time': start_time, 'duration': duration}]
+ networks = [{'nodes': nodes,
+ 'name': self.hrn,
+ 'start_time': start_time,
+ 'duration': duration,
+ 'links': linkspecs}]
resources = {'networks': networks, 'start_time': start_time, 'duration': duration}
# convert the plc dict to an rspec dict
self.slices.write()
# Get slice info
+ # if slice doesnt exist add it
slicename = hrn_to_pl_slicename(slice_hrn)
slices = self.shell.GetSlices(self.auth, [slicename], ['node_ids'])
if not slices:
- raise RecordNotFound(slice_hrn)
- slice = slices[0]
+ parts = slicename.split("_")
+ login_base = parts[0]
+ slice_record = self.registry.resolve(self.cred, slice_hrn)
+ slice_info = slice_record.as_dict()
+ slice = slice_info['pl_info']
+
+ # if site doesnt exist add it
+ sites = self.shell.GetSites(self.auth, [login_base])
+ if not sites:
+ authority = get_authority(slice_hrn)
+ site_record = self.registry.reolve(self.cred, authority)
+ site_info = site_record.as_dict()
+ site = site_info['pl_info']
+
+ # add the site
+ site.pop('site_id')
+ site_id = self.shell.AddSite(self.auth, site)
+
+ # add the slice
+ self.shell.AddSlice(self.auth, slice_info)
+
+ # add the slice users
+
+ else:
+ slice = slices[0]
+
# find out where this slice is currently running
- nodes = self.shell.GetNodes(self.auth, slice['node_ids'], ['hostname'])
- hostnames = [node['hostname'] for node in nodes]
+ nodelist = self.shell.GetNodes(self.auth, slice['node_ids'], ['hostname'])
+ hostnames = [node['hostname'] for node in nodelist]
# get netspec details
nodespecs = spec.getDictsByTagName('NodeSpec')
- nodes = [nodespec['name'] for nodespec in nodespecs]
-
+ nodes = []
+ for nodespec in nodespecs:
+ if isinstance(nodespec['name'], list):
+ nodes.extend(nodespec['name'])
+ elif isinstance(nodespec['name'], StringTypes):
+ nodes.append(nodespec['name'])
+
# save slice state locally
# we can assume that spec object has been validated so its safer to
# save this instead of the unvalidated rspec the user gave us
self.shell.AddSliceToNodes(self.auth, slicename, added_nodes)
self.shell.DeleteSliceFromNodes(self.auth, slicename, deleted_nodes)
- for attribute in attributes:
- type, value, node, nodegroup = attribute['type'], attribute['value'], attribute['node'], attribute['nodegroup']
- self.shell.AddSliceAttribute(self.auth, slicename, type, value, node, nodegroup)
-
# contact registry to get slice users and add them to the slice
#slice_record = self.registry.resolve(self.credential, slice_hrn)
# persons = slice_record['users']
-
- #for person in persons:
+ # for perosn in persons:
# shell.AddPersonToSlice(person['email'], slice_name)
return 1
git://git.onelab.eu / sfa.git / blobdiff