From 0f178e473ffd395989d99897be102eb9e858a09a Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 3 Jul 2009 10:35:16 +0000 Subject: [PATCH] moved cmdline as geni/client --- INSTALL.txt | 7 ++++--- cmdline/__init__.py | 0 component/component_slice_config.sh | 1 + {cmdline => geni/client}/genidump.py | 0 {cmdline => geni/client}/getNodes.py | 0 {cmdline => geni/client}/getRecord.py | 0 {cmdline => geni/client}/setRecord.py | 0 {cmdline => geni/client}/sfi.py | 0 setup.py | 10 +++++----- 9 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 cmdline/__init__.py rename {cmdline => geni/client}/genidump.py (100%) rename {cmdline => geni/client}/getNodes.py (100%) rename {cmdline => geni/client}/getRecord.py (100%) rename {cmdline => geni/client}/setRecord.py (100%) rename {cmdline => geni/client}/sfi.py (100%) diff --git a/INSTALL.txt b/INSTALL.txt index e5e0eeaa..80ee5921 100644 --- 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 index e69de29b..00000000 diff --git a/component/component_slice_config.sh b/component/component_slice_config.sh index ee263d83..a878a71a 100644 --- 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 6af937b5..917955e4 100755 --- 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', -- 2.47.0