better customization of SA test script

diff --git a/cmdline/testSA.sh b/cmdline/testSA.sh
index 8cdb7cd..fc9bba4 100755 (executable)
--- a/cmdline/testSA.sh
+++ b/cmdline/testSA.sh
@@ -1,3 +1,22 @@
+# The following lines use the root account of the MyPLC. This assumes that the
+# Administrator_Default has a private key that is located in the file
+# root.pkey in the current directory.
+USERNAME=root
+PARENT_HRN=planetlab.us.pl
+USER_HRN=$PARENT_HRN.Administrator_Default
+
+# The following lines use Tony Mack's planetlab account on a live PLC
+# database (tony: copy your private key to tmack.pkey in the current directory)
+#USERNAME=tmack
+#PARENT_HRN=planetlab.us.princeton
+#USER_HRN=$PARENT_HRN.Mack_Tony
+
+TEST_USER_HRN=$PARENT_HRN.testuser
+TEST_SLICE_HRN=$PARENT_HRN.testslice1
+TEST_NODE_HRN=$PARENT_HRN.testnode1
+
+TEST_NODE_IP=198.0.0.133
+
 rm -f root.cred
 rm -f root.cert
 rm -f rootsa.cred
@@ -6,19 +25,19 @@ rm -f testkey.gid
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Getting Self Credential
-python ./genicli.py --username root --credfile None --outfile root.cred getCredential user planetlab.us.pl.Administrator_Default
+python ./genicli.py --username $USERNAME --credfile None --outfile root.cred getCredential user $USER_HRN
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Resolving Self
-python ./genicli.py --username root resolve planetlab.us.pl.account_test
+python ./genicli.py --username $USERNAME resolve $USER_HRN
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Getting SA Credential
-python ./genicli.py --username root --outfile rootsa.cred getCredential sa planetlab.us.pl
+python ./genicli.py --username $USERNAME --outfile rootsa.cred getCredential sa $PARENT_HRN
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX List records in an authority
-python ./genicli.py --username root --credfile rootsa.cred list
+python ./genicli.py --username $USERNAME --credfile rootsa.cred list
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Create a private key
@@ -26,48 +45,48 @@ python ./genicli.py --username testkey createKey
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Create a GID for a user
-python ./genicli.py --username root --credfile rootsa.cred --outfile testuser.gid createGid planetlab.us.pl.testuser None testkey.pkey
+python ./genicli.py --username $USERNAME --credfile rootsa.cred --outfile testuser.gid createGid $TEST_USER_HRN None testkey.pkey
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Create a GID for a slice
-python ./genicli.py --username root --credfile rootsa.cred --outfile testslice.gid createGid planetlab.us.pl.testslice1 None testkey.pkey
+python ./genicli.py --username $USERNAME --credfile rootsa.cred --outfile testslice.gid createGid $TEST_SLICE_HRN None testkey.pkey
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Create a GID for a node
-python ./genicli.py --username root --credfile rootsa.cred --outfile testnode.gid createGid planetlab.us.pl.testnode1 None testkey.pkey
+python ./genicli.py --username $USERNAME --credfile rootsa.cred --outfile testnode.gid createGid $TEST_NODE_HRN None testkey.pkey
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Register a user
-python ./genicli.py --username root --credfile rootsa.cred --email test1234@test.com register user planetlab.us.pl.testuser testuser.gid
+python ./genicli.py --username $USERNAME --credfile rootsa.cred --email test1234@test.com register user $TEST_USER_HRN testuser.gid
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Resolve the test user
-python ./genicli.py --username root --credfile rootsa.cred resolve planetlab.us.pl.testuser
+python ./genicli.py --username $USERNAME --credfile rootsa.cred resolve $TEST_USER_HRN
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Register a slice
-python ./genicli.py --username root --credfile rootsa.cred register slice planetlab.us.pl.testslice1 testslice.gid
+python ./genicli.py --username $USERNAME --credfile rootsa.cred register slice $TEST_SLICE_HRN testslice.gid
 
 echo XXXXX -------------------------------------------------------------------
-echo XXXXX Resolve the test node
-python ./genicli.py --username root --credfile rootsa.cred resolve planetlab.us.pl.testslice1
+echo XXXXX Resolve the test slice
+python ./genicli.py --username $USERNAME --credfile rootsa.cred resolve $TEST_SLICE_HRN
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Register a node
-python ./genicli.py --username root --credfile rootsa.cred --ip 198.0.0.133 --dns testnode1.lan register node planetlab.us.pl.testnode1 testnode.gid
+python ./genicli.py --username $USERNAME --credfile rootsa.cred --ip $TEST_NODE_IP --dns testnode1.lan register node $TEST_NODE_HRN testnode.gid
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Resolve the test node
-python ./genicli.py --username root --credfile rootsa.cred resolve planetlab.us.pl.testnode1
+python ./genicli.py --username $USERNAME --credfile rootsa.cred resolve $TEST_NODE_HRN
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Remove the test node
-python ./genicli.py --username root --credfile rootsa.cred remove node planetlab.us.pl.testnode1
+python ./genicli.py --username $USERNAME --credfile rootsa.cred remove node $TEST_NODE_HRN
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Remove the test slice
-python ./genicli.py --username root --credfile rootsa.cred remove slice planetlab.us.pl.testslice1
+python ./genicli.py --username $USERNAME --credfile rootsa.cred remove slice $TEST_SLICE_HRN
 
 echo XXXXX -------------------------------------------------------------------
 echo XXXXX Remove a user
-python ./genicli.py --username root --credfile rootsa.cred remove user planetlab.us.pl.testuser
+python ./genicli.py --username $USERNAME --credfile rootsa.cred remove user $TEST_USER_HRN