From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 2 Jul 2009 08:55:00 +0000 (+0000)
Subject: use consistent name sfi_config, like plc_config and geni_config (oops, unsaved changes)
X-Git-Tag: sfa-0.9-0@14641~221
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=041d737737f7758c2b8c5f95d3abb449065716b8;p=sfa.git

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 14e50c2e..d29c8f7d 100644
--- 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 a8dfeb5b..f60b0e98 100755
--- 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 a82524ca..bef30a48 100644
--- 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 4eb72e91..243d5418 100644
--- 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 24470369..026c8b2f 100644
--- 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