Change in vdsm[master]: move vdsm.config to common

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has uploaded a new change for review.

Change subject: move vdsm.config to common
......................................................................

move vdsm.config to common

vdsm.config is used by all subsystems. It should thus sit in common.
This patch keeps a proxy in place, so that existing users of vdsm.config
can be updated in separate patches.

Change-Id: Ie84514aed56034c79044a94f7ce391b368cb99c4
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M .gitignore
M lib/vdsm/Makefile.am
M lib/vdsm/common/Makefile.am
R lib/vdsm/common/config.py.in
4 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/79980/1

diff --git a/.gitignore b/.gitignore
index b96b310..7e8c362 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,7 @@
 init/vdsmd_init_common.sh
 lib/vdsm/api/vdsm-api.html
 lib/vdsm/common/constants.py
-lib/vdsm/config.py
+lib/vdsm/common/config.py
 lib/vdsm/dsaversion.py
 lib/sos/vdsm.py
 lib/vdsm/storage/lvm.env
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index cdc0247..8f9d4d2 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -31,6 +31,7 @@
 	cmdutils.py \
 	commands.py \
 	constants.py \
+	config.py \
 	containersconnection.py \
 	cpuarch.py \
 	cpuinfo.py \
@@ -68,7 +69,6 @@
 	$(NULL)
 
 nodist_vdsmpylib_PYTHON = \
-	config.py \
 	dsaversion.py \
 	$(NULL)
 
@@ -83,13 +83,12 @@
 
 
 EXTRA_DIST = \
-	config.py.in \
 	dsaversion.py.in \
 	vdsm.conf.sample \
 	$(NULL)
 
-vdsm.conf.sample: Makefile config.py
-	@echo "  CONFIG $@"; $(PYTHON) $(builddir)/config.py > $@
+vdsm.conf.sample: Makefile common/config.py
+	@echo "  CONFIG $@"; $(PYTHON) -m common.config > $@
 
 install-data-local: \
 	install-data-sample-vdsm-conf
diff --git a/lib/vdsm/common/Makefile.am b/lib/vdsm/common/Makefile.am
index 0e8de2b..255b231 100644
--- a/lib/vdsm/common/Makefile.am
+++ b/lib/vdsm/common/Makefile.am
@@ -29,6 +29,7 @@
 dist_vdsmcommon_PYTHON = *.py
 
 EXTRA_DIST = \
+	config.py.in \
 	constants.py.in \
 	$(NULL)
 
diff --git a/lib/vdsm/config.py.in b/lib/vdsm/common/config.py.in
similarity index 100%
rename from lib/vdsm/config.py.in
rename to lib/vdsm/common/config.py.in


-- 
To view, visit https://gerrit.ovirt.org/79980
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie84514aed56034c79044a94f7ce391b368cb99c4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has posted comments on this change.

Change subject: move vdsm.config to common
......................................................................


Patch Set 7: Verified+1

-- 
To view, visit https://gerrit.ovirt.org/79980
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie84514aed56034c79044a94f7ce391b368cb99c4
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has posted comments on this change.

Change subject: move vdsm.config to common
......................................................................


Patch Set 7:

(1 comment)

https://gerrit.ovirt.org/#/c/79980/7/tests/config_test.py
File tests/config_test.py:

PS7, Line 47: common_config
>  Why patch vdsm.common.config if we still use the vdsm.config?
`from X import *` does not pull _privates


-- 
To view, visit https://gerrit.ovirt.org/79980
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie84514aed56034c79044a94f7ce391b368cb99c4
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: Yes

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has posted comments on this change.

Change subject: move vdsm.config to common
......................................................................


Patch Set 8:

passes ost http://jenkins.ovirt.org/job/ovirt-system-tests_manual/996/

-- 
To view, visit https://gerrit.ovirt.org/79980
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie84514aed56034c79044a94f7ce391b368cb99c4
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has posted comments on this change.

Change subject: move vdsm.config to common
......................................................................


Patch Set 8: Verified+1

-- 
To view, visit https://gerrit.ovirt.org/79980
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie84514aed56034c79044a94f7ce391b368cb99c4
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has submitted this change and it was merged. (
https://gerrit.ovirt.org/79980 )

Change subject: move vdsm.config to common
......................................................................


move vdsm.config to common

vdsm.config is used by all subsystems. It should thus sit in common.
This patch keeps a proxy in place, so that existing users of vdsm.config
can be updated in separate patches.

Change-Id: Ie84514aed56034c79044a94f7ce391b368cb99c4
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M .gitignore
M lib/vdsm/Makefile.am
M lib/vdsm/common/Makefile.am
R lib/vdsm/common/config.py.in
A lib/vdsm/config.py
M tests/config_test.py
6 files changed, 41 insertions(+), 9 deletions(-)

Approvals:
  Piotr Kliczewski: Looks good to me, approved
  Nir Soffer: Looks good to me, but someone else must approve
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Verified
  Edward Haas: Looks good to me, but someone else must approve



-- 
To view, visit https://gerrit.ovirt.org/79980
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie84514aed56034c79044a94f7ce391b368cb99c4
Gerrit-PatchSet: 9
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;