Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
oVirt Jenkins CI Server has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc21-x86_64_merged/550/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/927/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/964/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc20-x86_64_merged/546/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/962/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-el7-x86_64_merged/559/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc22-x86_64_merged/104/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc22-x86_64_merged/104/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/36/ : 0 -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
oVirt Jenkins CI Server has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 2: Build Started (9/9) 0 -> http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/36/ -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
oVirt Jenkins CI Server has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 2: Build Started (8/9) -> http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc22-x86_64_merged/104/ -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
oVirt Jenkins CI Server has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 2: Build Started (7/9) -> http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc22-x86_64_merged/104/ -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
oVirt Jenkins CI Server has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 2: Build Started (6/9) -> http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-el7-x86_64_merged/559/ -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
oVirt Jenkins CI Server has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 2: Build Started (5/9) -> http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/962/ -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
oVirt Jenkins CI Server has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 2: Build Started (4/9) -> http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc20-x86_64_merged/546/ -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
oVirt Jenkins CI Server has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 2: Build Started (3/9) -> http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/964/ -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
oVirt Jenkins CI Server has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 2: Build Started (2/9) -> http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/927/ -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
oVirt Jenkins CI Server has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 2: Build Started (1/9) -> http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc21-x86_64_merged/550/ -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
Dan Kenigsberg has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 1: Code-Review+2 I don't think that the name is any better, but if you do - fine. -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
Dan Kenigsberg has submitted this change and it was merged. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. vmdevices: rename buildConfDevices to devSpecMapFromConf To keep a consistent naming across devices subsystem, this patch changes name of this method to conform naming defined in http://www.ovirt.org/Feature/VmDevices_rework#Current_state_of_devices Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Signed-off-by: Martin Polednik Reviewed-on: https://gerrit.ovirt.org/40167 Reviewed-by: Francesco Romani Reviewed-by: Dan Kenigsberg --- M tests/deviceTests.py M tests/vmTests.py M vdsm/clientIF.py M vdsm/virt/vm.py 4 files changed, 13 insertions(+), 13 deletions(-) Approvals: Dan Kenigsberg: Looks good to me, approved Francesco Romani: Looks good to me, but someone else must approve Martin Polednik: Verified -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
automat...@ovirt.org has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
Francesco Romani has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 1: Code-Review+1 I never liked the name 'buildConfDevices' -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
oVirt Jenkins CI Server has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/18036/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/1265/ : 0 -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
Martin Polednik has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 1: Verified+1 Verified via unit tests and functional tests (with even closer look at the devices) -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
oVirt Jenkins CI Server has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 1: Build Started (2/2) 0 -> http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/1265/ -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
Martin Polednik has uploaded a new change for review.
Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf
..
vmdevices: rename buildConfDevices to devSpecMapFromConf
To keep a consistent naming across devices subsystem, this patch
changes name of this method to conform naming defined in
http://www.ovirt.org/Feature/VmDevices_rework#Current_state_of_devices
Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b
Signed-off-by: Martin Polednik
---
M tests/deviceTests.py
M tests/vmTests.py
M vdsm/clientIF.py
M vdsm/virt/vm.py
4 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/40167/1
diff --git a/tests/deviceTests.py b/tests/deviceTests.py
index 1235cca..4a9e025 100644
--- a/tests/deviceTests.py
+++ b/tests/deviceTests.py
@@ -118,13 +118,13 @@
for conf in self.confDisplay:
conf.update(self.conf)
with fake.VM(conf) as testvm:
-devs = testvm.buildConfDevices()
+devs = testvm.devSpecMapFromConf()
self.assertTrue(devs['graphics'])
def testGraphicsDevice(self):
for dev in self.confDeviceGraphics:
with fake.VM(self.conf, dev) as testvm:
-devs = testvm.buildConfDevices()
+devs = testvm.devSpecMapFromConf()
self.assertTrue(devs['graphics'])
def testGraphicsDeviceMixed(self):
@@ -136,7 +136,7 @@
conf.update(self.conf)
for dev in self.confDeviceGraphics:
with fake.VM(self.conf, dev) as testvm:
-devs = testvm.buildConfDevices()
+devs = testvm.devSpecMapFromConf()
self.assertEqual(len(devs['graphics']), 1)
self.assertEqual(devs['graphics'][0]['device'],
dev[0]['device'])
@@ -182,7 +182,7 @@
devices = [{'type': 'graphics', 'device': primary},
{'type': 'graphics', 'device': secondary}]
with fake.VM(self.conf, devices) as testvm:
-devs = testvm.buildConfDevices()
+devs = testvm.devSpecMapFromConf()
self.assertTrue(len(devs['graphics']) == 2)
@permutations([['vnc'], ['spice']])
@@ -190,7 +190,7 @@
devices = [{'type': 'graphics', 'device': devType},
{'type': 'graphics', 'device': devType}]
with fake.VM(self.conf, devices) as testvm:
-self.assertRaises(ValueError, testvm.buildConfDevices)
+self.assertRaises(ValueError, testvm.devSpecMapFromConf)
def testSmartcardXML(self):
smartcardXML = ''
diff --git a/tests/vmTests.py b/tests/vmTests.py
index a997482..6d0c968 100644
--- a/tests/vmTests.py
+++ b/tests/vmTests.py
@@ -1213,7 +1213,7 @@
{'type': 'graphics', 'device': 'vnc', 'port': '-1'}]
with fake.VM(_VM_PARAMS, devices) as testvm:
-testvm._updateDevices(testvm.buildConfDevices())
+testvm._updateDevices(testvm.devSpecMapFromConf())
res = testvm.getStats()
self.assertIn('displayPort', res)
self.assertEqual(res['displayType'],
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index 2719101..53a93f9 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -466,7 +466,7 @@
# Do not prepare volumes when system goes down
if self._enabled:
vmObj.preparePaths(
-vmObj.buildConfDevices()[hwclass.DISK])
+vmObj.devSpecMapFromConf()[hwclass.DISK])
except:
self.log.error("Vm %s recovery failed",
vmId, exc_info=True)
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 1c7c999..c909ca9 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -848,7 +848,7 @@
return dev_map
-def buildConfDevices(self):
+def devSpecMapFromConf(self):
"""
Return the "devices" section of this Vm's conf.
If missing, create it according to old API.
@@ -2137,7 +2137,7 @@
def _run(self):
self.log.info("VM wrapper has started")
-devices = self.buildConfDevices()
+dev_spec_map = self.devSpecMapFromConf()
# recovery flow note:
# we do not start disk stats collection here since
@@ -2145,9 +2145,9 @@
# Disk stats collection is started from clientIF at the end
# of the recovery process.
if not self.recovering:
-self.preparePaths(devices[hwclass.DISK])
-self._prepareTransientDisks(devices[hwclass.DISK])
-self._updateDevices(devices)
+self.preparePaths(dev_spec_map[hwclass.DISK])
+self._prepareTransientDisks(dev_spec_map[hwclass.DISK])
+self._updateDevices(dev_spec
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
oVirt Jenkins CI Server has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 1: Build Started (1/2) -> http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/18036/ -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vmdevices: rename buildConfDevices to devSpecMapFromConf
automat...@ovirt.org has posted comments on this change. Change subject: vmdevices: rename buildConfDevices to devSpecMapFromConf .. Patch Set 1: * 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']) -- To view, visit https://gerrit.ovirt.org/40167 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab5674cc44ea5faf8c29234ca7a9c59478d4ce2b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
