moved cmdline as geni/client

diff --git a/INSTALL.txt b/INSTALL.txt
index e5e0eea..80ee592 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -77,14 +77,15 @@ Use:
 
 Copy my private PL (RSA) ssh key to ~/.sfi/quetier.pkey
 
-in cmdline
-edit  config_sfi
+Copy /etc/sfa/sfi_config in ~/.sfi
+edit  sfi_config
+
 export SFI_AUTH=ple.upmc
 export SFI_USER=$SFI_AUTH.quetier
 export SFI_REGISTRY=http://138.96.255.199:12345/
 export SFI_SM=http://138.96.255.199:12346/
 
-source config_sfi
+source sfi_config
 
 ./sfi.py list ple
 ./sfi.py show ple.upmc.quetier

diff --git a/cmdline/__init__.py b/cmdline/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/component/component_slice_config.sh b/component/component_slice_config.sh
index ee263d8..a878a71 100644 (file)
--- a/component/component_slice_config.sh
+++ b/component/component_slice_config.sh
@@ -1,4 +1,5 @@
 USER=pl_genicw
+# xxx this location is probably wrong now
 KEY_FILE=../cmdline/test.pkey
 DEST_DIR=/home/pl_genicw
 

diff --git a/cmdline/genidump.py b/geni/client/genidump.py
similarity index 100%
rename from cmdline/genidump.py
rename to geni/client/genidump.py

diff --git a/cmdline/getNodes.py b/geni/client/getNodes.py
similarity index 100%
rename from cmdline/getNodes.py
rename to geni/client/getNodes.py

diff --git a/cmdline/getRecord.py b/geni/client/getRecord.py
similarity index 100%
rename from cmdline/getRecord.py
rename to geni/client/getRecord.py

diff --git a/cmdline/setRecord.py b/geni/client/setRecord.py
similarity index 100%
rename from cmdline/setRecord.py
rename to geni/client/setRecord.py

diff --git a/cmdline/sfi.py b/geni/client/sfi.py
similarity index 100%
rename from cmdline/sfi.py
rename to geni/client/sfi.py

diff --git a/setup.py b/setup.py
index 6af937b..917955e 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -11,11 +11,11 @@ from distutils.core import setup
 scripts = [ 'config/sfa-config-tty',
             'geni/sfa-import-plc.py', 
             'geni/sfa-plc.py', 
-            'cmdline/sfi.py', 
-            'cmdline/getNodes.py',
-            'cmdline/getRecord.py',
-            'cmdline/setRecord.py',
-            'cmdline/genidump.py',
+            'geni/client/sfi.py', 
+            'geni/client/getNodes.py',
+            'geni/client/getRecord.py',
+            'geni/client/setRecord.py',
+            'geni/client/genidump.py',
             ]
 package_dirs = [ 'geni', 
                  'geni/util',