Vinzenz Feenstra has uploaded a new change for review.
Change subject: Moving conf init things together ......................................................................
Moving conf init things together
Change-Id: I41ac420cd0da5a3118ce5b3c4c3643b292ec2e86 Signed-off-by: Vinzenz Feenstra vfeenstr@redhat.com --- M vdsm/rpc/Bridge.py M vdsm/virt/vm.py 2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/29320/1
diff --git a/vdsm/rpc/Bridge.py b/vdsm/rpc/Bridge.py index 539c70c..12ed98e 100644 --- a/vdsm/rpc/Bridge.py +++ b/vdsm/rpc/Bridge.py @@ -286,6 +286,7 @@ """ return [v['vmId'] for v in ret['vmList']]
+ def Host_queryVms_Ret(ret): """ The result contains two data structures which must be merged diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 2c5c910..098a3d5 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -1814,8 +1814,7 @@ """ self._dom = None self.recovering = recover - self.conf = {'pid': '0'} - self.conf['_blockJobs'] = {} + self.conf = {'pid': '0', '_blockJobs': {}, 'clientIp': ''} self.conf.update(params) self._initLegacyConf() # restore placeholders for BC sake self.cif = cif @@ -1825,7 +1824,6 @@ str(self.conf['vmId']) + '.recovery' self.user_destroy = False self._monitorResponse = 0 - self.conf['clientIp'] = '' self.memCommitted = 0 self._confLock = threading.Lock() self._jobsLock = threading.Lock()
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Moving conf init things together ......................................................................
Patch Set 1:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/9707/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/10492/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/1041/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/10649/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Moving conf init things together ......................................................................
Patch Set 2:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/9708/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/10493/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/1042/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/10650/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Moving conf init things together ......................................................................
Patch Set 3:
Build Successful
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/10019/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/10804/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/1172/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/10961/ : SUCCESS
automation@ovirt.org has posted comments on this change.
Change subject: Moving conf init things together ......................................................................
Patch Set 4:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: Moving conf init things together ......................................................................
Patch Set 6:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
Francesco Romani has posted comments on this change.
Change subject: Moving conf init things together ......................................................................
Patch Set 6: Code-Review+1
a bit tidier
Vinzenz Feenstra has posted comments on this change.
Change subject: Moving conf init things together ......................................................................
Patch Set 6: Verified+1
Dan Kenigsberg has posted comments on this change.
Change subject: Moving conf init things together ......................................................................
Patch Set 6: Code-Review+2
I don't really mind that.
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Moving conf init things together ......................................................................
Moving conf init things together
Change-Id: I41ac420cd0da5a3118ce5b3c4c3643b292ec2e86 Signed-off-by: Vinzenz Feenstra vfeenstr@redhat.com Reviewed-on: https://gerrit.ovirt.org/29320 Continuous-Integration: Jenkins CI Reviewed-by: Francesco Romani fromani@redhat.com Reviewed-by: Dan Kenigsberg danken@redhat.com --- M vdsm/virt/vm.py 1 file changed, 1 insertion(+), 3 deletions(-)
Approvals: Jenkins CI: Passed CI tests Vinzenz Feenstra: Verified Dan Kenigsberg: Looks good to me, approved Francesco Romani: Looks good to me, but someone else must approve
automation@ovirt.org has posted comments on this change.
Change subject: Moving conf init things together ......................................................................
Patch Set 7:
* Update tracker::IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found.
vdsm-patches@lists.fedorahosted.org
-
automation＠ovirt.org -
Dan Kenigsberg -
fromani＠redhat.com -
Jenkins CI RO -
Vinzenz Feenstra