Minor tweaks to make the Tutorial easier to write/understand.

protogeni/test/anynode.rspec

+<rspec xmlns="http://protogeni.net/resources/rspec/0.1">
+ <node virtual_id="mypc" 
+       virtualization_type="emulab-vnode" 
+       exclusive="1"> 
+ </node>
+</rspec>

protogeni/test/discover.py

@@ -24,6 +24,16 @@ import re
 
 execfile( "test-common.py" )
 
+if len(REQARGS) > 1:
+    Usage()
+    sys.exit( 1 )
+elif len(REQARGS) == 1:
+    CMURI = REQARGS[0]
+    if CMURI[-2:] == "cm":
+        CMURI = CMURI[:-3]
+        pass
+pass
+
 #
 # Get a credential for myself, that allows me to do things at the SA.
 #

protogeni/test/listcomponents.py

 #! /usr/bin/env python
 #
 # GENIPUBLIC-COPYRIGHT
-# Copyright (c) 2008-2009 University of Utah and the Flux Group.
+# Copyright (c) 2008-2010 University of Utah and the Flux Group.
 # All rights reserved.
 # 
 # Permission to use, copy, modify and distribute this software is hereby
@@ -47,7 +47,7 @@ if debug: print str(response["value"])
 # Ask each manager for its list.
 #
 for manager in response["value"]:
-    print manager["hrn"] + "[" + manager[ "urn" ] + "]: " + manager["url"]
+    print manager[ "urn" ] + ": " + manager["url"]
 
     # Skip the discover resources. Too much.
     continue

protogeni/test/redeemticket.py

@@ -90,7 +90,7 @@ if not "ticket_urn" in myslice:
 #
 # Get the ticket with another call to resolve.
 #
-print "Asking for the ticket"
+print "Asking for a copy of the ticket"
 params = {}
 params["credentials"] = (slicecred,)
 params["urn"]         = myslice["ticket_urn"]