use consistent name sfi_config, like plc_config and geni_config (oops, unsaved changes)

diff --git a/cmdline/demoAggregate.sh b/cmdline/demoAggregate.sh
index 14e50c2..d29c8f7 100644 (file)
--- a/cmdline/demoAggregate.sh
+++ b/cmdline/demoAggregate.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export PATH=$PATH:/etc/geni
-source config_sfi
+source sfi_config
 CWD=$(pwd)
 
 DEMO_AUTH='planetlab.us'

diff --git a/cmdline/sfi.py b/cmdline/sfi.py
index a8dfeb5..f60b0e9 100755 (executable)
--- a/cmdline/sfi.py
+++ b/cmdline/sfi.py
@@ -15,7 +15,7 @@ from geni.util.record import *
 from geni.util.rspec import Rspec
 from types import StringTypes, ListType
 
-# xxx todo xxx auto-load ~/.sfi/config_sfi
+# xxx todo xxx auto-load ~/.sfi/sfi_config
 
 sfi_dir = os.path.expanduser("~/.sfi/")
 slicemgr = None

diff --git a/cmdline/testSfi.sh b/cmdline/testSfi.sh
index a82524c..bef30a4 100644 (file)
--- a/cmdline/testSfi.sh
+++ b/cmdline/testSfi.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export PATH=$PATH:/etc/geni
-source config_sfi
+source sfi_config
 CWD=$(pwd)
 
 rm -f saved_record.*

diff --git a/cmdline/testSfiDelegate.sh b/cmdline/testSfiDelegate.sh
index 4eb72e9..243d541 100644 (file)
--- a/cmdline/testSfiDelegate.sh
+++ b/cmdline/testSfiDelegate.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export PATH=$PATH:/etc/geni
-source config_sfi
+source sfi_config
 CWD=$(pwd)
 
 rm -f saved_record.*

diff --git a/cmdline/testSfiSliceRegister.sh b/cmdline/testSfiSliceRegister.sh
index 2447036..026c8b2 100644 (file)
--- a/cmdline/testSfiSliceRegister.sh
+++ b/cmdline/testSfiSliceRegister.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export PATH=$PATH:/etc/geni
-source config_sfi
+source sfi_config
 CWD=$(pwd)
 
 # private key to use when creating GID for new slice