10:07 a.m.
Petr Šebek has uploaded a new change for review.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
bugfix: UpdateVmDevice QoS
QoS was not handled in method Vm._updateInterfaceDevice.
Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Bug-Url: https://bugzilla.redhat.com/1002300
Signed-off-by: Petr Sebek <psebek(a)redhat.com>
---
M vdsm/vm.py
1 file changed, 17 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/19545/1
diff --git a/vdsm/vm.py b/vdsm/vm.py
index f356c08..0bccd46 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -3095,12 +3095,13 @@
network = DUMMY_BRIDGE
linkValue = 'down'
custom = params.get('custom')
+ specParams = params.get('specParams')
netsToMirror = params.get('portMirroring',
netConf.get('portMirroring', []))
with self.setLinkAndNetwork(netDev, netConf, linkValue, network,
- custom):
+ custom, specParams):
with self.updatePortMirroring(netConf, netsToMirror):
return {'status': doneCode, 'vmList': self.status()}
except (LookupError,
@@ -3111,7 +3112,19 @@
'message': e.message}}
@contextmanager
- def setLinkAndNetwork(self, dev, conf, linkValue, networkValue, custom):
+ def setLinkAndNetwork(self, dev, conf, linkValue, networkValue, custom,
+ specParams):
+ def updateXMLWithQoS(vnicXML, qos):
+ bandwidth = vnicXML.getElementsByTagName('bandwidth')[0]
+ inbound = bandwidth.getElementsByTagName('inbound')[0]
+ outbound = bandwidth.getElementsByTagName('outbound')[0]
+ if 'inbound' in qos:
+ bandwidth.remove(inbound)
+ bandwidth.appendChildWithArgs('inbound',
**qos['inbound'])
+ if 'outbound' in qos:
+ bandwidth.remove(outbound)
+ bandwidth.appendChildWithArgs('outbound',
**qos['outbound'])
+
vnicXML = dev.getXML()
source = vnicXML.getElementsByTagName('source')[0]
source.setAttribute('bridge', networkValue)
@@ -3121,6 +3134,8 @@
link = xml.dom.minidom.Element('link')
vnicXML.appendChildWithArgs(link)
link.setAttribute('state', linkValue)
+ if specParams:
+ updateXMLWithQoS(vnicXML, specParams)
vnicStrXML = vnicXML.toprettyxml(encoding='utf-8')
try:
try:
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
3:09 a.m.
Dan Kenigsberg has submitted this change and it was merged.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
bugfix: UpdateVmDevice QoS
QoS was not handled in method Vm._updateInterfaceDevice.
Inbound/outbound is kept in current state if related parameter is missing in
specParams. It is deleted if it is in specParams but empty ({'inbound':{}}).
Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Bug-Url: https://bugzilla.redhat.com/1002300
Signed-off-by: Petr Sebek <psebek(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/19545
Reviewed-by: Eyal Edri <eedri(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm.spec.in
M vdsm/vm.py
2 files changed, 35 insertions(+), 12 deletions(-)
Approvals:
Eyal Edri: Looks good to me, but someone else must approve
Petr Šebek: Verified
Dan Kenigsberg: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
3:09 a.m.
Dan Kenigsberg has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 6: Code-Review+2
Dependency is finally available
http://mirror.centos.org/centos-6/6.5/os/x86_64/Packages/libvirt-0.10.2-2...
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
4:14 p.m.
Dan Kenigsberg has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 6:
(1 comment)
....................................................
File vdsm.spec.in
Line 117: Requires: libvirt-daemon-driver-nwfilter
Line 118: Requires: libvirt-daemon-driver-qemu
Line 119: %else
Line 120: %if 0%{?rhel}
Line 121: Requires: libvirt >= 0.10.2-29.el6
Or https://bugzilla.redhat.com/show_bug.cgi?id=1017198 is solved.
Line 122: %else
Line 123: Requires: libvirt >= 1.0.2-1
Line 124: %endif
Line 125: %endif
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
5:05 a.m.
Petr Šebek has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 6: Verified+1
Verified with ovirt-engine webadmin. Before update nic's bandwidth looks like this:
<bandwidth>
<inbound average='25600' peak='51200' burst='20480'/>
<outbound average='12800' peak='25600' burst='10240'/>
</bandwidth>
After update with values 256,512,50,256,512,50 (in Mbps) nic's bandwidth becomes this
(values in KBps):
<bandwidth>
<inbound average='32768' peak='65536' burst='51200'/>
<outbound average='32768' peak='65536' burst='51200'/>
</bandwidth>
In webadmin everything ends without exception.Also vdsm logs looks right.
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
4:59 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 6:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4895/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4010/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4820/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
5:17 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 5:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3804/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4689/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4613/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
5:17 a.m.
Petr Šebek has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 5: Verified-1
Missing bandwidth content fixed. But there is still exception SetLinkAndNetworkError: this
function is not supported by the connection driver: unable to change config on
'bridge' network type
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
4:41 a.m.
Petr Šebek has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 4: Verified-1
There is unexpected exception when tried to run vmUpdateDevice. It's because
<bandwidth /> isn't populated:
<interface type="bridge">
<address bus="0x00" domain="0x0000" function="0x0"
slot="0x03" type="pci"/>
<mac address="00:1a:4a:31:ab:2b"/>
<model type="virtio"/>
<source bridge="testnetwork"/>
<filterref filter="vdsm-no-mac-spoofing"/>
<link state="up"/>
<bandwidth/>
</interface>
Will fix
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
2:15 a.m.
Petr Šebek has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 3:
(4 comments)
....................................................
File vdsm/vm.py
Line 1309: return iface
Line 1310:
Line 1311: def getXMLBandwidth(self, specParams, old_bandwidth=None):
Line 1312: bandwidth = self.createXmlElem('bandwidth', None)
Line 1313: # Inbound and Outbound traffic can be indipendently shaped.
Done
Line 1314: for attr in ('inbound', 'outbound'):
Line 1315: new_settings = self.specParams.get(attr)
Line 1316: if old_bandwidth is not None:
Line 1317: attrXMLs = old_bandwidth.getElementsByTagName
Line 1311: def getXMLBandwidth(self, specParams, old_bandwidth=None):
Line 1312: bandwidth = self.createXmlElem('bandwidth', None)
Line 1313: # Inbound and Outbound traffic can be indipendently shaped.
Line 1314: for attr in ('inbound', 'outbound'):
Line 1315: new_settings = self.specParams.get(attr)
Done
Line 1316: if old_bandwidth is not None:
Line 1317: attrXMLs = old_bandwidth.getElementsByTagName
Line 1318: attrXML = attrXMLs[0] if len(attrXMLs) else None
Line 1319: else:
Line 1312: bandwidth = self.createXmlElem('bandwidth', None)
Line 1313: # Inbound and Outbound traffic can be indipendently shaped.
Line 1314: for attr in ('inbound', 'outbound'):
Line 1315: new_settings = self.specParams.get(attr)
Line 1316: if old_bandwidth is not None:
Done
Line 1317: attrXMLs = old_bandwidth.getElementsByTagName
Line 1318: attrXML = attrXMLs[0] if len(attrXMLs) else None
Line 1319: else:
Line 1320: attrXML = None
Line 3133: except IndexError:
Line 3134: link = xml.dom.minidom.Element('link')
Line 3135: vnicXML.appendChildWithArgs(link)
Line 3136: link.setAttribute('state', linkValue)
Line 3137: if specParams and \
Done
Line 3138: ('inbound' in specParams or 'outbound' in
specParams):
Line 3139: old_bandwidths = vnicXML.getElementsByTagName('bandwidth')
Line 3140: old_bandwidth = old_bandwidths[0] if len(old_bandwidths) else None
Line 3141: new_bandwidth = dev.getXMLBandwidth(specParams, old_bandwidth)
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
12:28 p.m.
Dan Kenigsberg has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 5: Code-Review-1
I suggest to keep this patch unmerged (and the bug open) until the underlying libvirt
issue is solved and available in el6/Fedora.
https://bugzilla.redhat.com/show_bug.cgi?id=1014200
https://bugzilla.redhat.com/show_bug.cgi?id=1014198
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
8:17 a.m.
Antoni Segura Puimedon has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 3: Code-Review-1
(4 comments)
Some small changes.
....................................................
File vdsm/vm.py
Line 1309: return iface
Line 1310:
Line 1311: def getXMLBandwidth(self, specParams, old_bandwidth=None):
Line 1312: bandwidth = self.createXmlElem('bandwidth', None)
Line 1313: # Inbound and Outbound traffic can be indipendently shaped.
s/indipendently/independently/
Line 1314: for attr in ('inbound', 'outbound'):
Line 1315: new_settings = self.specParams.get(attr)
Line 1316: if old_bandwidth is not None:
Line 1317: attrXMLs = old_bandwidth.getElementsByTagName
Line 1311: def getXMLBandwidth(self, specParams, old_bandwidth=None):
Line 1312: bandwidth = self.createXmlElem('bandwidth', None)
Line 1313: # Inbound and Outbound traffic can be indipendently shaped.
Line 1314: for attr in ('inbound', 'outbound'):
Line 1315: new_settings = self.specParams.get(attr)
vdsm convention is for variables to be camel cased. Since this is inside a loop (only
holds a setting at a time) I'd call it newSetting.
Line 1316: if old_bandwidth is not None:
Line 1317: attrXMLs = old_bandwidth.getElementsByTagName
Line 1318: attrXML = attrXMLs[0] if len(attrXMLs) else None
Line 1319: else:
Line 1312: bandwidth = self.createXmlElem('bandwidth', None)
Line 1313: # Inbound and Outbound traffic can be indipendently shaped.
Line 1314: for attr in ('inbound', 'outbound'):
Line 1315: new_settings = self.specParams.get(attr)
Line 1316: if old_bandwidth is not None:
I think I would first check if there are newSettings and in that case don't fetch
attrXML (which I would leave for the else of "if newSettings".
Line 1317: attrXMLs = old_bandwidth.getElementsByTagName
Line 1318: attrXML = attrXMLs[0] if len(attrXMLs) else None
Line 1319: else:
Line 1320: attrXML = None
Line 3133: except IndexError:
Line 3134: link = xml.dom.minidom.Element('link')
Line 3135: vnicXML.appendChildWithArgs(link)
Line 3136: link.setAttribute('state', linkValue)
Line 3137: if specParams and \
Instead of '\' it is preferred for the whole condition to be encased in
parenthesis.
Line 3138: ('inbound' in specParams or 'outbound' in
specParams):
Line 3139: old_bandwidths = vnicXML.getElementsByTagName('bandwidth')
Line 3140: old_bandwidth = old_bandwidths[0] if len(old_bandwidths) else None
Line 3141: new_bandwidth = dev.getXMLBandwidth(specParams, old_bandwidth)
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
5:10 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 3:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3763/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4572/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4648/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
4:09 p.m.
Dan Kenigsberg has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 1: Code-Review-1
(3 comments)
....................................................
File vdsm/vm.py
Line 1302: if self.sndbufParam:
Line 1303: tune = iface.appendChildWithArgs('tune')
Line 1304: tune.appendChildWithArgs('sndbuf', text=self.sndbufParam)
Line 1305:
Line 1306: if hasattr(self, 'specParams'):
how about taking this code into a helper function, which would be called both from here
and from setLinkAndNetwork ?
Line 1307: if 'inbound' in self.specParams or 'outbound' in
self.specParams:
Line 1308: bandwidth = self.createXmlElem('bandwidth', None)
Line 1309: # Inbound and Outbound traffic can be indipendently shaped.
Line 1310: inbound = self.specParams.get('inbound')
Line 3113:
Line 3114: @contextmanager
Line 3115: def setLinkAndNetwork(self, dev, conf, linkValue, networkValue, custom,
Line 3116: specParams):
Line 3117: def updateXMLWithQoS(vnicXML, qos):
"qos" is a misleading argument name, as this is actually the specParam
dictionary, containing much more than that.
Line 3118: bandwidth = vnicXML.getElementsByTagName('bandwidth')[0]
Line 3119: inbound = bandwidth.getElementsByTagName('inbound')[0]
Line 3120: outbound = bandwidth.getElementsByTagName('outbound')[0]
Line 3121: if 'inbound' in qos:
Line 3114: @contextmanager
Line 3115: def setLinkAndNetwork(self, dev, conf, linkValue, networkValue, custom,
Line 3116: specParams):
Line 3117: def updateXMLWithQoS(vnicXML, qos):
Line 3118: bandwidth = vnicXML.getElementsByTagName('bandwidth')[0]
the QoS elements may be missing (e.g. if VM was migrated from an old vdsm). You should
handle that case, too. As well of having only one of the inbound/outbound elements below
it.
Line 3119: inbound = bandwidth.getElementsByTagName('inbound')[0]
Line 3120: outbound = bandwidth.getElementsByTagName('outbound')[0]
Line 3121: if 'inbound' in qos:
Line 3122: bandwidth.remove(inbound)
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
2:09 p.m.
Dan Kenigsberg has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 2:
(1 comment)
....................................................
File vdsm/vm.py
Line 3126: link = xml.dom.minidom.Element('link')
Line 3127: vnicXML.appendChildWithArgs(link)
Line 3128: link.setAttribute('state', linkValue)
Line 3129: if specParams and \
Line 3130: ('inbound' in specParams or 'outbound' in
specParams):
Oh, and please document your decision in the commit message.
Line 3131: new_bandwidth = dev.getXmlBandwidth(specParams)
Line 3132: try:
Line 3133: old_bandwidth =
vnicXML.getElementsByTagName('bandwidth')[0]
Line 3134: vnicXML.replaceChild(new_bandwidth, old_bandwidth)
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
2:08 p.m.
Dan Kenigsberg has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 2: Code-Review-1
(1 comment)
....................................................
File vdsm/vm.py
Line 3126: link = xml.dom.minidom.Element('link')
Line 3127: vnicXML.appendChildWithArgs(link)
Line 3128: link.setAttribute('state', linkValue)
Line 3129: if specParams and \
Line 3130: ('inbound' in specParams or 'outbound' in
specParams):
Only now have I realized that we need to somehow differentiate a request of "keep
current QoS", from a request to remove inboud/outbound.
With networkValue we use missing value to mean "keep current" and the empty
string to mean "delete".
Line 3131: new_bandwidth = dev.getXmlBandwidth(specParams)
Line 3132: try:
Line 3133: old_bandwidth =
vnicXML.getElementsByTagName('bandwidth')[0]
Line 3134: vnicXML.replaceChild(new_bandwidth, old_bandwidth)
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
8:14 a.m.
Petr Šebek has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 1:
(3 comments)
....................................................
File vdsm/vm.py
Line 1302: if self.sndbufParam:
Line 1303: tune = iface.appendChildWithArgs('tune')
Line 1304: tune.appendChildWithArgs('sndbuf', text=self.sndbufParam)
Line 1305:
Line 1306: if hasattr(self, 'specParams'):
Created new function NetworkInterfaceDevice.getXmlBandwidth.
Line 1307: if 'inbound' in self.specParams or 'outbound' in
self.specParams:
Line 1308: bandwidth = self.createXmlElem('bandwidth', None)
Line 1309: # Inbound and Outbound traffic can be indipendently shaped.
Line 1310: inbound = self.specParams.get('inbound')
Line 3113:
Line 3114: @contextmanager
Line 3115: def setLinkAndNetwork(self, dev, conf, linkValue, networkValue, custom,
Line 3116: specParams):
Line 3117: def updateXMLWithQoS(vnicXML, qos):
Now it's without qos.
Line 3118: bandwidth = vnicXML.getElementsByTagName('bandwidth')[0]
Line 3119: inbound = bandwidth.getElementsByTagName('inbound')[0]
Line 3120: outbound = bandwidth.getElementsByTagName('outbound')[0]
Line 3121: if 'inbound' in qos:
Line 3114: @contextmanager
Line 3115: def setLinkAndNetwork(self, dev, conf, linkValue, networkValue, custom,
Line 3116: specParams):
Line 3117: def updateXMLWithQoS(vnicXML, qos):
Line 3118: bandwidth = vnicXML.getElementsByTagName('bandwidth')[0]
The code now handles these cases.
Line 3119: inbound = bandwidth.getElementsByTagName('inbound')[0]
Line 3120: outbound = bandwidth.getElementsByTagName('outbound')[0]
Line 3121: if 'inbound' in qos:
Line 3122: bandwidth.remove(inbound)
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
8 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 2:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3758/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4567/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4643/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
10:08 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 1:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4626/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4548/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3741/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
2:16 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 4:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3798/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4683/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4607/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
7:46 a.m.
Dan Kenigsberg has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 6: Code-Review+1
(1 comment)
....................................................
File vdsm.spec.in
Line 117: Requires: libvirt-daemon-driver-nwfilter
Line 118: Requires: libvirt-daemon-driver-qemu
Line 119: %else
Line 120: %if 0%{?rhel}
Line 121: Requires: libvirt >= 0.10.2-29.el6
this should not get into the repo before 0.10.2-29.el6 is out in the wild.
Line 122: %else
Line 123: Requires: libvirt >= 1.0.2-1
Line 124: %endif
Line 125: %endif
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
1:17 p.m.
Eyal Edri has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 6: Code-Review+1
(1 comment)
but keep in mind, this will fail on centos 6.4 of course.
....................................................
File vdsm.spec.in
Line 117: Requires: libvirt-daemon-driver-nwfilter
Line 118: Requires: libvirt-daemon-driver-qemu
Line 119: %else
Line 120: %if 0%{?rhel}
Line 121: Requires: libvirt >= 0.10.2-29.el6
latest rhel repo has this:
[root@cinteg33 ~]# yum info libvirt
Loaded plugins: product-id, security, subscription-manager
This system is not registered to Red Hat Subscription Management. You can use
subscription-manager to register.
Installed Packages
Name : libvirt
Arch : x86_64
Version : 0.10.2
Release : 29.el6
Size : 5.6 M
Repo : installed
From repo : rhel
Summary : Library providing a simple
virtualization API
URL : http://libvirt.org/
License : LGPLv2+
Description : Libvirt is a C toolkit to interact with the virtualization capabilities
: of recent versions of Linux (and other OSes). The main package includes
: the libvirtd server exporting the virtualization support.
Line 122: %else
Line 123: Requires: libvirt >= 1.0.2-1
Line 124: %endif
Line 125: %endif
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
3:53 a.m.
Antoni Segura Puimedon has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 4: Code-Review+1
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
3:11 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: bugfix: UpdateVmDevice QoS
......................................................................
Patch Set 7:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/70/ : FAILURE
--
To view, visit http://gerrit.ovirt.org/19545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I43a383b2a9cf96366927beebf63f1344027169fb
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com>
Gerrit-Reviewer: Petr Šebek <psebek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
3798
days inactive
3867
days old
vdsm-patches@lists.fedorahosted.org
23 comments
5 participants
participants (5)
-
asegurap＠redhat.com -
Dan Kenigsberg -
eedri＠redhat.com -
Jenkins CI RO -
psebek＠redhat.com