from sfa.client.candidates import Candidates
-from sfa.client.common import optparse_listvalue_callback, terminal_render, filter_records
+from sfa.client.common import optparse_listvalue_callback, optparse_dictvalue_callback, terminal_render, filter_records
pprinter = PrettyPrinter(indent=4)
pprinter.pprint(version)
@args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='authority to list (hrn/urn - mandatory)')
- @args('-t', '--type', dest='type', metavar='<type>', help='object type', default=None)
+ @args('-t', '--type', dest='type', metavar='<type>', help='object type', default='all')
@args('-r', '--recursive', dest='recursive', metavar='<recursive>', help='list all child records',
action='store_true', default=False)
@args('-v', '--verbose', dest='verbose', action='store_true', default=False)
def _record_dict(self, xrn=None, type=None,
url=None, description=None, email='',
key=None,
- slices=[], researchers=[], pis=[]):
+ slices=[], researchers=[], pis=[], extras={}):
record_dict = {}
if xrn:
if type:
record_dict['email'] = email
if pis:
record_dict['pi'] = pis
+ if extras:
+ record_dict.update(extras)
return record_dict
"""Check the correspondance between the GID and the PubKey"""
# db records
- from sfa.storage.alchemy import dbsession
from sfa.storage.model import RegRecord
- db_query = dbsession.query(RegRecord).filter_by(type=type)
+ db_query = self.api.dbsession().query(RegRecord).filter_by(type=type)
if xrn and not all:
hrn = Xrn(xrn).get_hrn()
db_query = db_query.filter_by(hrn=hrn)
@args('-p', '--pis', dest='pis', metavar='<PIs>',
help='Set/replace Principal Investigators/Project Managers',
default='', type="str", action='callback', callback=optparse_listvalue_callback)
+ @args('-X','--extra',dest='extras',default={},type='str',metavar="<EXTRA_ASSIGNS>", action="callback", callback=optparse_dictvalue_callback, nargs=1, help="set extra/testbed-dependent flags, e.g. --extra enabled=true")
def register(self, xrn, type=None, url=None, description=None, key=None, slices='',
- pis='', researchers='',email=''):
+ pis='', researchers='',email='', extras={}):
"""Create a new Registry record"""
record_dict = self._record_dict(xrn=xrn, type=type, url=url, key=key,
- slices=slices, researchers=researchers, email=email, pis=pis)
+ slices=slices, researchers=researchers, email=email, pis=pis, extras=extras)
self.api.manager.Register(self.api, record_dict)
@args('-p', '--pis', dest='pis', metavar='<PIs>',
help='Set/replace Principal Investigators/Project Managers',
default='', type="str", action='callback', callback=optparse_listvalue_callback)
+ @args('-X','--extra',dest='extras',default={},type='str',metavar="<EXTRA_ASSIGNS>", action="callback", callback=optparse_dictvalue_callback, nargs=1, help="set extra/testbed-dependent flags, e.g. --extra enabled=true")
def update(self, xrn, type=None, url=None, description=None, key=None, slices='',
- pis='', researchers=''):
+ pis='', researchers='', extras={}):
"""Update an existing Registry record"""
print 'incoming PIS',pis
record_dict = self._record_dict(xrn=xrn, type=type, url=url, description=description,
- key=key, slices=slices, researchers=researchers, pis=pis)
+ key=key, slices=slices, researchers=researchers, pis=pis, extras=extras)
self.api.manager.Update(self.api, record_dict)
@args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)')
"""Initialize or upgrade the db"""
from sfa.storage.dbschema import DBSchema
dbschema=DBSchema()
- dbschema.init_or_upgrade
+ dbschema.init_or_upgrade()
@args('-a', '--all', dest='all', metavar='<all>', action='store_true', default=False,
help='Remove all registry records and all files in %s area' % help_basedir)
@args('-o', '--outfile', dest='outfile', metavar='<outfile>', help='output file', default=None)
def export(self, xrn, type=None, outfile=None):
"""Fetch an object's GID from the Registry"""
- from sfa.storage.alchemy import dbsession
from sfa.storage.model import RegRecord
hrn = Xrn(xrn).get_hrn()
- request=dbsession.query(RegRecord).filter_by(hrn=hrn)
+ request=self.api.dbsession().query(RegRecord).filter_by(hrn=hrn)
if type: request = request.filter_by(type=type)
record=request.first()
if record:
version = self.api.manager.GetVersion(self.api, {})
pprinter.pprint(version)
-
@args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)')
def status(self, xrn):
- """Display the status of a slice or slivers"""
- urn = Xrn(xrn, 'slice').get_urn()
- status = self.api.manager.SliverStatus(self.api, [urn], {}, {})
+ """Retrieve the status of the slivers belonging to the named slice (Status)"""
+ urns = [Xrn(xrn, 'slice').get_urn()]
+ status = self.api.manager.Status(self.api, urns, [], {})
pprinter.pprint(status)
@args('-r', '--rspec-version', dest='rspec_version', metavar='<rspec_version>',
def resources(self, rspec_version='GENI'):
"""Display the available resources at an aggregate"""
options = {'geni_rspec_version': rspec_version}
- resources = self.api.manager.ListResources(self.api, {}, options)
+ print options
+ resources = self.api.manager.ListResources(self.api, [], options)
print resources
-
- @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn', default=None)
- @args('-r', '--rspec-version', dest='rspec_version', metavar='<rspec_version>',
- default='GENI', help='version/format of the resulting rspec response')
- def describe(self, xrn, rspec_version='GENI'):
- """Display the resources allocated by a slice or slivers"""
- urn = Xrn(xrn, 'slice').get_urn()
- options = {'geni_rspec_version': rspec_version}
- status = self.api.manager.Describe(self.api, {}, [urn], options)
- print status
-
+
+
@args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
- @args('-r', '--rspec', dest='rspec', metavar='<rspec>', help='rspec file (mandatory)')
- @args('-u', '--user', dest='user', metavar='<user>', help='hrn/urn of slice user (mandatory)')
- @args('-k', '--key', dest='key', metavar='<key>', help="path to user's public key file (mandatory)")
- def allocate(self, xrn, rspec, user, key):
+ @args('-r', '--rspec', dest='rspec', metavar='<rspec>', help='rspec file (mandatory)')
+ def allocate(self, xrn, rspec):
"""Allocate slivers"""
xrn = Xrn(xrn, 'slice')
- urn=xrn.get_urn()
+ slice_urn=xrn.get_urn()
rspec_string = open(rspec).read()
- user_xrn = Xrn(user, 'user')
- user_urn = user_xrn.get_urn()
- user_key_string = open(key).read()
- users = [{'urn': user_urn, 'keys': [user_key_string]}]
- options={'geni_users': users}
- status = self.api.manager.Allocate(self.api, urn, {}, rspec_string, options)
- print status
+ options={}
+ manifest = self.api.manager.Allocate(self.api, slice_urn, [], rspec_string, options)
+ print manifest
- @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
- def provision(self, xrns):
- status = self.api.manager.Provision(self.api, [xrns], {}, {})
- print status
@args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
- def delete(self, xrn):
- """Delete slivers"""
- result = self.api.manager.DeleteSliver(self.api, [xrn], {}, {})
- print result
+ def provision(self, xrn):
+ """Provision slivers"""
+ xrn = Xrn(xrn, 'slice')
+ slice_urn=xrn.get_urn()
+ options={}
+ manifest = self.api.manager.provision(self.api, [slice_urn], [], options)
+ print manifest
- @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
- @args('-e', '--expiration', dest='expiration', metavar='<expiration>', help='Expiration date (mandatory)')
- def renew(self, xrn, expiration):
- """Start slivers"""
- result = self.api.manager.start_slice(self.api, xrn, {}, expiration, {})
- print result
- @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
- def shutdown(self, xrn):
- """Stop slivers"""
- result = self.api.manager.Shutdown(self.api, xrn, {}, {})
- print result
@args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
- @args('-a', '--action', dest='action', metavar='<action>', help='Action name (mandatory)')
- def operation(self, xrn, action):
- """Reset sliver"""
- result = self.api.manager.PerformOperationalAction(self.api, [xrn], {}, action, {})
- print result
-
-# @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn', default=None)
-# @args('-r', '--rspec', dest='rspec', metavar='<rspec>', help='request rspec', default=None)
-# def ticket(self, xrn, rspec):
-# pass
+ def delete(self, xrn):
+ """Delete slivers"""
+ self.api.manager.Delete(self.api, [xrn], [], {})
+