Change in vdsm[master]: config: Make it easy to create default config

[Nir Soffer]

Nir Soffer has uploaded a new change for review.

Change subject: config: Make it easy to create default config
......................................................................

config: Make it easy to create default config

Previously a default config object was created by invoking a private
function, modifying the global config, before reading the configuration
from the config file. This design make it impossible to create a default
config object for testing, or to reload the configuration while vdsm is
running.

This patch replace the private function with public function accepting
a config object. Now you can create a default config object by creating
a new config parser and setting the defaults:

    fake_config = ConfigParser.ConfigParser()
    config.set_defaults(fake_config)
    fake_config.set('irs', 'repository', '/my/fake/repository')

Change-Id: I80ec628d1da5c0466af28cb73564c6e63fd5ca65
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
M lib/vdsm/config.py.in
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/25504/1

diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in
index fb597a8..f01743c 100644
--- a/lib/vdsm/config.py.in
+++ b/lib/vdsm/config.py.in
@@ -318,9 +318,7 @@
 ]
 
 
-def __prepare_config():
-    global config
-
+def set_defaults(config):
     for section, keylist in parameters:
         config.add_section(section)
         for key, value, comment in keylist:
@@ -343,7 +341,7 @@
             print
 
 config = ConfigParser.ConfigParser()
-__prepare_config()
+set_defaults(config)
 config.read([os.path.join('@CONFDIR@', 'vdsm.conf')])
 
 if __name__ == '__main__':


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80ec628d1da5c0466af28cb73564c6e63fd5ca65
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: config: Make it easy to create default config
......................................................................


Patch Set 1:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7432/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6639/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7541/ : SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I80ec628d1da5c0466af28cb73564c6e63fd5ca65
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Yaniv Bronhaim has posted comments on this change.

Change subject: config: Make it easy to create default config
......................................................................


Patch Set 1: Code-Review+1

now we need some tests :)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I80ec628d1da5c0466af28cb73564c6e63fd5ca65
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Nir Soffer]

Nir Soffer has posted comments on this change.

Change subject: config: Make it easy to create default config
......................................................................


Patch Set 2: Verified+1

Verified by running the tests and running vdsm.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I80ec628d1da5c0466af28cb73564c6e63fd5ca65
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: config: Make it easy to create default config
......................................................................


Patch Set 2:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8513/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7723/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8640/ : FAILURE

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I80ec628d1da5c0466af28cb73564c6e63fd5ca65
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: config: Make it easy to create default config
......................................................................


Patch Set 2: Code-Review+2

globals are ugly!

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I80ec628d1da5c0466af28cb73564c6e63fd5ca65
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: config: Make it easy to create default config
......................................................................


config: Make it easy to create default config

Previously a default config object was created by invoking a private
function, modifying the global config, before reading the configuration
from the config file. This design make it impossible to create a default
config object for testing, or to reload the configuration while vdsm is
running.

This patch replace the private function with public function accepting
a config object. Now you can create a default config object by creating
a new config parser and setting the defaults:

    fake_config = ConfigParser.ConfigParser()
    config.set_defaults(fake_config)
    fake_config.set('irs', 'repository', '/my/fake/repository')

Change-Id: I80ec628d1da5c0466af28cb73564c6e63fd5ca65
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/25504
Reviewed-by: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M lib/vdsm/config.py.in
1 file changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Nir Soffer: Verified
  Yaniv Bronhaim: Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I80ec628d1da5c0466af28cb73564c6e63fd5ca65
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server