client_helper: fix pg_users_args

[sfa.git] / sfa / client / sfaadmin.py

diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py
index 662592a..de247bd 100755 (executable)
--- a/sfa/client/sfaadmin.py
+++ b/sfa/client/sfaadmin.py
@@ -49,7 +49,7 @@ class RegistryCommands(Commands):
         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)
@@ -354,12 +354,11 @@ class AggregateCommands(Commands):
         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>', 
@@ -367,73 +366,39 @@ class AggregateCommands(Commands):
     def resources(self, rspec_version='GENI'):
         """Display the available resources at an aggregate"""  
         options = {'geni_rspec_version': rspec_version}
-        if xrn:
-            options['geni_slice_urn'] = Xrn(xrn, 'slice').get_urn()
-        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], [], {})
+