implemented save_rspec_to_file. added display_list method. modified display_record...

diff --git a/cmdline/configSfi.sh b/cmdline/configSfi.sh
index fab70cf..7cff983 100644 (file)
--- a/cmdline/configSfi.sh
+++ b/cmdline/configSfi.sh
@@ -3,7 +3,7 @@
 
 #export TEST_USER_2=$SFI_AUTH.Hartman_John
 
-export SFI_AUTH=planetlab.us.pl
+export SFI_AUTH=planetlab.us.princeton
 export SFI_USER=$SFI_AUTH.Mack_Tony
 
 #export SFI_REGISTRY=http://198.0.0.132:12345/

diff --git a/cmdline/sfi.py b/cmdline/sfi.py
index fc5024c..0979249 100755 (executable)
--- a/cmdline/sfi.py
+++ b/cmdline/sfi.py
@@ -406,14 +406,18 @@ def update(opts, args):
 def nodes(opts, args):
    global slicemgr
    user_cred = get_user_cred() 
-   if (len(args) == 0):
+   if not opts.format:
       context = None
    else:
-      context = args[0]
-   result = slicemgr.list_nodes(user_cred, context)
-   display_rspec(opts.format, result)
+      context = opts.format
+   results = slicemgr.list_nodes(user_cred, context)
+   if opts.format in ['rspec']:     
+      display_rspec(results)
+   else:
+      display_list(results)
    if (opts.file is not None):
-      save_rspec_to_file(opts.file, result)
+      rspec = slicemgr.list_nodes(user_cred, 'rspec')
+      save_rspec_to_file(rspec, opts.file)
    return
 
 # list instantiated slices
@@ -475,13 +479,23 @@ def reset(opts, args):
 #
 #
 
-def display_rspec(format, rspec):
-   print "display rspec"
+def display_rspec(rspec):
    print rspec
    return
 
-def save_rspec_to_file(file, rspec):
-   print "save rspec"
+def display_list(results):
+    for result in results:
+        print result
+
+def save_rspec_to_file(rspec, filename):
+   if not filename.startswith(os.sep):
+       filename = sfi_dir + filename
+   if not filename.endswith(".rspec"):
+       filename = filename + ".rspec"
+
+   f = open(filename, 'w')
+   f.write(rspec)
+   f.close()
    return
 
 def display_records(recordList):
@@ -489,7 +503,9 @@ def display_records(recordList):
       display_record(record)
 
 def display_record(record):
-   record.dump(False)
+   #record.dump(False)
+   info = record.getdict()
+   print "%s (%s)" % (info['hrn'], info['type'])
    return
 
 def filter_records(type, records):

diff --git a/cmdline/testAggregate.py b/cmdline/testAggregate.py
index e65eb09..2bdc81c 100644 (file)
--- a/cmdline/testAggregate.py
+++ b/cmdline/testAggregate.py
@@ -20,12 +20,12 @@ print "resources being used by %(slicehrn)s" % locals()
 tmack_components = a.list_resources(cred, slicehrn)
 pprint(tmack_components)
 
-print "removing %(slicehrn)s from all nodes" % locals()
-a.delete_slice(cred, slicehrn)
+#print "removing %(slicehrn)s from all nodes" % locals()
+#a.delete_slice(cred, slicehrn)
 
-print "adding %(slicehrn)s back to its original nodes"
+print "adding %(slicehrn)s back to its original nodes" % locals()
 a.list_resources(cred, slicehrn)
-a.create_slice(cred, slicehrn, tmack_components)
+a.create_slice(cred, slicehrn, components)
 a.list_resources(cred, slicehrn)