remove the format param from list_nodes call

[sfa.git] / cmdline / sfi.py

diff --git a/cmdline/sfi.py b/cmdline/sfi.py
index 3b4e4bf..325a71c 100755 (executable)
--- a/cmdline/sfi.py
+++ b/cmdline/sfi.py
@@ -9,7 +9,7 @@ import tempfile
 from optparse import OptionParser
 from geni.util.cert import Keypair, Certificate
 from geni.util.credential import Credential
-from geni.util.geniclient import GeniClient
+from geni.util.geniclient import GeniClient, ServerException
 from geni.util.gid import create_uuid
 from geni.util.record import GeniRecord
 
@@ -392,8 +392,19 @@ def update(opts, args):
    record = load_record_from_file(rec_file)
 
    if record.get_type() == "user":
-       cred = user_cred
-   elif record.get_type() in ["sa", "ma", "slice", "node"]:
+       if record.get_name() == user_cred.get_object_gid().get_hrn():
+          cred = user_cred
+       else:
+          create = get_auth_cred()
+   elif record.get_type() in ["slice"]:
+       try:
+           cred = get_slice_cred(record.get_name())
+       except ServerException, e:
+           if "PermissionError" in e.args[0]:
+               cred = get_auth_cred()
+           else:
+               raise
+   elif record.get_type() in ["sa", "ma", "node"]:
        cred = get_auth_cred()
    else:
        raise "unknown record type" + record.get_type()
@@ -418,7 +429,7 @@ def nodes(opts, args):
    else:
       display_list(results)
    if (opts.file is not None):
-      rspec = slicemgr.list_nodes(user_cred, 'rspec')
+      rspec = slicemgr.list_nodes(user_cred)
       save_rspec_to_file(rspec, opts.file)
    return
 
@@ -434,7 +445,7 @@ def slices(opts, args):
 def resources(opts, args):
    global slicemgr
    slice_cred = get_slice_cred(args[0])
-   result = slicemgr.list_resources(slice_cred, args[0])
+   result = slicemgr.get_resources(slice_cred, args[0])
    display_rspec(result)
    if (opts.file is not None):
       save_rspec_to_file(opts.file, result)