Change in vdsm[master]: vdsm: move vdsm_cli to the new location in the repository

fsimonce at redhat.com fsimonce at redhat.com
Tue Mar 26 17:52:25 UTC 2013


Federico Simoncelli has uploaded a new change for review.

Change subject: vdsm: move vdsm_cli to the new location in the repository
......................................................................

vdsm: move vdsm_cli to the new location in the repository

Additionally the file lists (e.g. gitignore, Makefile.am, etc.) that
contained the vdsm_cli path have been reordered alphabetically.

Change-Id: Ica67e1ac211bb886f56972a99791debb7ab1ce5f
Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
---
M .gitignore
M Makefile.am
R client/Makefile.am
R client/vdsClient.1
R client/vdsClient.completion
R client/vdsClient.in
R client/vdsClient.py
R client/vdsClientGluster.py
M configure.ac
M doc/create_sl.sh
M tests/run_tests_local.sh.in
M tests/superVdsmTests.py
12 files changed, 57 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/13348/1

diff --git a/.gitignore b/.gitignore
index c39612c..7569a8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,59 +1,59 @@
+*~
 *.o
 *.pyc
 *.swp
 *.tmp
-*~
-.deps/
+.deps
 .project
 .pydevproject
-INSTALL
-Makefile
-Makefile.in
 aclocal.m4
-autom4te.cache/
+autom4te.cache
 build-aux/depcomp
 build-aux/install-sh
 build-aux/missing
 build-aux/py-compile
+client/vdsClient
 config.log
 config.status
 configure
-doc/build/
+doc/build
+INSTALL
 lib/vdsm/config.py
 lib/vdsm/constants.py
 lib/vdsm/tool/load_needed_modules.py
 lib/vdsm/tool/validate_ovirt_certs.py
 lib/vdsm/vdscli.py
 lib/vdsm/vdsm.conf.sample
+Makefile
+Makefile.in
 results.log
-tests/run_tests.sh
 tests/run_tests_local.sh
+tests/run_tests.sh
 vds_bootstrap/deployUtil.py*
-vdsm-*.tar.gz
-vdsm.spec
+vdsm_api/vdsm-api.html
 vdsm/dsaversion.py
 vdsm/dumpStorageTable.py
+vdsm_hooks/persist-vdsm-hooks
 vdsm/logger.conf
-vdsm/svdsm.logger.conf
 vdsm/mk_sysprep_floppy
 vdsm/mom.conf
-vdsm/sos/vdsm.py
-vdsm/storage/protect/safelease
-vdsm/sudoers.vdsm
-vdsm/vdscli.py
-vdsm/vdsm-gencerts.sh
-vdsm/vdsm-logrotate.conf
-vdsm/vdsm-restore-net-config.init
-vdsm/vdsm-sosplugin.py
-vdsm/vdsm-store-net-config
-vdsm/vdsm.rwtab
-vdsm/vdsmd.8
-vdsm/vdsmd.init
-vdsm_api/vdsm-api.html
-vdsm_cli/vdsClient
-vdsm_hooks/persist-vdsm-hooks
 vdsm_reg/config.py
 vdsm_reg/deployUtil.py
 vdsm_reg/engine.py
-vdsm_reg/vdsm-reg-setup
 vdsm_reg/vdsm-reg.conf
+vdsm_reg/vdsm-reg-setup
+vdsm/sos/vdsm.py
+vdsm.spec
+vdsm/storage/protect/safelease
+vdsm/sudoers.vdsm
+vdsm/svdsm.logger.conf
+vdsm-*.tar.gz
+vdsm/vdscli.py
+vdsm/vdsmd.8
+vdsm/vdsmd.init
+vdsm/vdsm-gencerts.sh
+vdsm/vdsm-logrotate.conf
+vdsm/vdsm-restore-net-config.init
+vdsm/vdsm.rwtab
+vdsm/vdsm-sosplugin.py
+vdsm/vdsm-store-net-config
diff --git a/Makefile.am b/Makefile.am
index e463076..bbd2936 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,14 +19,14 @@
 #
 
 SUBDIRS = vdsm \
-	  vdsm_cli \
-	  vds_bootstrap \
-	  vdsm_reg \
-	  vdsm_hooks \
+	  client \
 	  lib \
 	  tests \
-	  vdsm-tool \
+	  vds_bootstrap \
 	  vdsm_api \
+	  vdsm_hooks \
+	  vdsm_reg \
+	  vdsm-tool \
 	  $(NULL)
 
 include $(top_srcdir)/build-aux/Makefile.subs
@@ -48,21 +48,21 @@
 # When fixing a file to conform with pep8 add it to the WL here so it will be
 # checkd from now on
 PEP8_WHITELIST = \
-	tests \
-	vds_bootstrap \
-	vdsm-tool \
-	vdsm/*.py \
-	vdsm/*.py.in \
-	vdsm/sos/vdsm.py.in \
-	vdsm/storage \
-	vdsm/vdsm \
+	client \
 	lib/betterPopen/*.py \
 	lib/vdsm/*.py \
 	lib/vdsm/*.py.in \
+	tests \
+	vds_bootstrap \
 	vdsm_api \
-	vdsm_cli \
 	vdsm_hooks \
+	vdsm/*.py \
+	vdsm/*.py.in \
 	vdsm_reg \
+	vdsm/sos/vdsm.py.in \
+	vdsm/storage \
+	vdsm-tool \
+	vdsm/vdsm \
 	$(NULL)
 
 PEP8_BLACKLIST = config.py,constants.py
diff --git a/vdsm_cli/Makefile.am b/client/Makefile.am
similarity index 100%
rename from vdsm_cli/Makefile.am
rename to client/Makefile.am
diff --git a/vdsm_cli/vdsClient.1 b/client/vdsClient.1
similarity index 100%
rename from vdsm_cli/vdsClient.1
rename to client/vdsClient.1
diff --git a/vdsm_cli/vdsClient.completion b/client/vdsClient.completion
similarity index 100%
rename from vdsm_cli/vdsClient.completion
rename to client/vdsClient.completion
diff --git a/vdsm_cli/vdsClient.in b/client/vdsClient.in
similarity index 100%
rename from vdsm_cli/vdsClient.in
rename to client/vdsClient.in
diff --git a/vdsm_cli/vdsClient.py b/client/vdsClient.py
similarity index 100%
rename from vdsm_cli/vdsClient.py
rename to client/vdsClient.py
diff --git a/vdsm_cli/vdsClientGluster.py b/client/vdsClientGluster.py
similarity index 100%
rename from vdsm_cli/vdsClientGluster.py
rename to client/vdsClientGluster.py
diff --git a/configure.ac b/configure.ac
index fe43e73..6ce1faf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,27 +195,20 @@
 
 # Keep sorted
 AC_OUTPUT([
-	Makefile
-	lib/Makefile
+	client/Makefile
 	lib/betterPopen/Makefile
+	lib/Makefile
 	lib/vdsm/Makefile
 	lib/vdsm/tool/Makefile
 	lib/yajsonrpc/Makefile
-	tests/Makefile
+	Makefile
 	tests/functional/Makefile
+	tests/Makefile
 	vds_bootstrap/Makefile
-	vdsm-tool/Makefile
-	vdsm/Makefile
-	vdsm/gluster/Makefile
-	vdsm/sos/Makefile
-	vdsm/storage/Makefile
-	vdsm/storage/imageRepository/Makefile
-	vdsm/storage/protect/Makefile
 	vdsm_api/Makefile
-	vdsm_cli/Makefile
-	vdsm_hooks/Makefile
-	vdsm_hooks/directlun/Makefile
+	vdsm/gluster/Makefile
 	vdsm_hooks/checkimages/Makefile
+	vdsm_hooks/directlun/Makefile
 	vdsm_hooks/faqemu/Makefile
 	vdsm_hooks/fileinject/Makefile
 	vdsm_hooks/floppy/Makefile
@@ -223,6 +216,7 @@
 	vdsm_hooks/hugepages/Makefile
 	vdsm_hooks/isolatedprivatevlan/Makefile
 	vdsm_hooks/macspoof/Makefile
+	vdsm_hooks/Makefile
 	vdsm_hooks/nestedvt/Makefile
 	vdsm_hooks/numa/Makefile
 	vdsm_hooks/pincpu/Makefile
@@ -235,7 +229,13 @@
 	vdsm_hooks/vhostmd/Makefile
 	vdsm_hooks/vmdisk/Makefile
 	vdsm_hooks/vmfex/Makefile
+	vdsm/Makefile
 	vdsm_reg/Makefile
+	vdsm/sos/Makefile
+	vdsm/storage/imageRepository/Makefile
+	vdsm/storage/Makefile
+	vdsm/storage/protect/Makefile
+	vdsm-tool/Makefile
 ])
 
 AC_OUTPUT([
diff --git a/doc/create_sl.sh b/doc/create_sl.sh
index e7dd234..bd03c7c 100644
--- a/doc/create_sl.sh
+++ b/doc/create_sl.sh
@@ -3,5 +3,5 @@
 # Adds a symoblic link for vdscli in vdsm if not present.
 VDSCLI=$(readlink -f "../vdsm/vdscli.py")
 if [ ! -e "$VDSCLI" ] ; then
-   ln -s ../vdsm_cli/vdscli.py "$VDSCLI"
+   ln -s ../client/vdscli.py "$VDSCLI"
 fi
diff --git a/tests/run_tests_local.sh.in b/tests/run_tests_local.sh.in
index 62a5447..faf4412 100644
--- a/tests/run_tests_local.sh.in
+++ b/tests/run_tests_local.sh.in
@@ -3,4 +3,4 @@
     PYTHON_EXE="@PYTHON@"
 fi
 
-PYTHONDONTWRITEBYTECODE=1 LC_ALL=C PYTHONPATH="@top_srcdir@/lib:@top_srcdir@/vdsm:@top_srcdir@/vdsm_cli:@top_srcdir@/vdsm_api:$PYTHONPATH" "$PYTHON_EXE" @top_srcdir@/tests/testrunner.py --local-modules $@
+PYTHONDONTWRITEBYTECODE=1 LC_ALL=C PYTHONPATH="@top_srcdir@/lib:@top_srcdir@/vdsm:@top_srcdir@/client:@top_srcdir@/vdsm_api:$PYTHONPATH" "$PYTHON_EXE" @top_srcdir@/tests/testrunner.py --local-modules $@
diff --git a/tests/superVdsmTests.py b/tests/superVdsmTests.py
index 2069186..f03a2b7 100644
--- a/tests/superVdsmTests.py
+++ b/tests/superVdsmTests.py
@@ -17,7 +17,7 @@
     base = os.path.dirname(testDir)
     vdsmModPath = os.path.join(base, 'lib')
     vdsmPath = os.path.join(base, 'vdsm')
-    cliPath = os.path.join(base, 'vdsm_cli')
+    cliPath = os.path.join(base, 'client')
     pyPath = "PYTHONPATH=" + ':'.join([base, vdsmPath, cliPath, vdsmModPath])
     return pyPath
 


--
To view, visit http://gerrit.ovirt.org/13348
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica67e1ac211bb886f56972a99791debb7ab1ce5f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce at redhat.com>


More information about the vdsm-patches mailing list