11:56 a.m.
Adam Litke has uploaded a new change for review.
Change subject: libvirtvm: Cast text to string when creating text node
......................................................................
libvirtvm: Cast text to string when creating text node
When creating a text node for a libvirt domain xml file, the content of the node
is expected to be a string. To avoid errors in the xml file, cast the parameter
to a string representation when creating the child node.
Change-Id: Id22db83062eaf85645c2d61c83f3f20943918413
Signed-off-by: Adam Litke <agl(a)us.ibm.com>
---
M vdsm/libvirtvm.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/32/7832/1
diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index 3306cc2..eaf899d 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -542,7 +542,7 @@
def appendChildWithText(self, childName, text):
childNode = self.doc.createElement(childName)
- textNode = self.doc.createTextNode(text)
+ textNode = self.doc.createTextNode(str(text))
childNode.appendChild(textNode)
self.dom.appendChild(childNode)
--
To view, visit http://gerrit.ovirt.org/7832
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id22db83062eaf85645c2d61c83f3f20943918413
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>
2:22 p.m.
Saggi Mizrahi has posted comments on this change.
Change subject: libvirtvm: Cast text to string when creating text node
......................................................................
Patch Set 3: I would prefer that you didn't submit this
(1 inline comment)
....................................................
File vdsm/utils.py
Line 595: return '%d' % (val)
Line 596: else:
Line 597: return val
Line 598:
Line 599: def convertToUnicode (val):
comparing types should be done with
isinstance()
But in any case, isn't that just what unicode() does?
In [1]: unicode(2)
Out[1]: u'2'
In [2]: unicode(2.0)
Out[2]: u'2.0'
In [3]: unicode("11")
Out[3]: u'11'
In [4]: unicode(u"11")
Out[4]: u'11'
Line 600: varType = type(val)
Line 601: if varType in (float, long, int):
Line 602: return unicode(str(val))
Line 603: elif varType is str:
--
To view, visit http://gerrit.ovirt.org/7832
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id22db83062eaf85645c2d61c83f3f20943918413
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Daniel P. Berrange <berrange(a)redhat.com>
Gerrit-Reviewer: Ryan Harper <ryanh(a)us.ibm.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Shu Ming <shuming(a)linux.vnet.ibm.com>
9:26 p.m.
Shu Ming has posted comments on this change.
Change subject: libvirtvm: Cast text to string when creating text node
......................................................................
Patch Set 3: I would prefer that you didn't submit this
(2 inline comments)
....................................................
File tests/utilsTests.py
Line 1: #
Line 2: # Copyright 2012 Red Hat, Inc.
I think we can add IBM copyright here along with Red Hat's.
Line 3: #
Line 4: # This program is free software; you can redistribute it and/or modify
Line 5: # it under the terms of the GNU General Public License as published by
Line 6: # the Free Software Foundation; either version 2 of the License, or
....................................................
File vdsm/utils.py
Line 606: return val
Line 607: else:
Line 608: raise ValueError("Refusing to convert type '%s' to
unicode" % \
Line 609: varType)
Line 610:
In the utils test case, "UnicodeDecodeError" exception is expected. It seems
that convertToUnicode() doesn't raise up the exception from unicode().
Line 611: def execCmd(*args, **kwargs):
Line 612: # import only after config as been initialized
Line 613: from storage.misc import execCmd
Line 614: return execCmd(*args, **kwargs)
--
To view, visit http://gerrit.ovirt.org/7832
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id22db83062eaf85645c2d61c83f3f20943918413
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Daniel P. Berrange <berrange(a)redhat.com>
Gerrit-Reviewer: Ryan Harper <ryanh(a)us.ibm.com>
Gerrit-Reviewer: Shu Ming <shuming(a)linux.vnet.ibm.com>
10:38 a.m.
Adam Litke has posted comments on this change.
Change subject: libvirtvm: Cast text to string when creating text node
......................................................................
Patch Set 3: Verified
(1 inline comment)
....................................................
File tests/utilsTests.py
Line 1: #
Line 2: # Copyright 2012 Red Hat, Inc.
No, because I copied one of the other test files and edited it to suit my needs. From my
understanding, the original copyright notice should be retained in that case.
Line 3: #
Line 4: # This program is free software; you can redistribute it and/or modify
Line 5: # it under the terms of the GNU General Public License as published by
Line 6: # the Free Software Foundation; either version 2 of the License, or
--
To view, visit http://gerrit.ovirt.org/7832
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id22db83062eaf85645c2d61c83f3f20943918413
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Daniel P. Berrange <berrange(a)redhat.com>
Gerrit-Reviewer: Ryan Harper <ryanh(a)us.ibm.com>
2:19 p.m.
Ryan Harper has posted comments on this change.
Change subject: libvirtvm: Cast text to string when creating text node
......................................................................
Patch Set 3: (1 inline comment)
....................................................
File tests/utilsTests.py
Line 1: #
Line 2: # Copyright 2012 Red Hat, Inc.
Shouldn't this be IBM Corp?
Line 3: #
Line 4: # This program is free software; you can redistribute it and/or modify
Line 5: # it under the terms of the GNU General Public License as published by
Line 6: # the Free Software Foundation; either version 2 of the License, or
--
To view, visit http://gerrit.ovirt.org/7832
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id22db83062eaf85645c2d61c83f3f20943918413
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Daniel P. Berrange <berrange(a)redhat.com>
Gerrit-Reviewer: Ryan Harper <ryanh(a)us.ibm.com>
1:48 p.m.
Ryan Harper has posted comments on this change.
Change subject: libvirtvm: Cast text to string when creating text node
......................................................................
Patch Set 2: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/7832
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id22db83062eaf85645c2d61c83f3f20943918413
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Daniel P. Berrange <berrange(a)redhat.com>
Gerrit-Reviewer: Ryan Harper <ryanh(a)us.ibm.com>
2:01 p.m.
Dan Kenigsberg has posted comments on this change.
Change subject: libvirtvm: Cast text to string when creating text node
......................................................................
Patch Set 1: (1 inline comment)
....................................................
File vdsm/libvirtvm.py
Line 541: self.dom.appendChild(self._devices)
Line 542:
Line 543: def appendChildWithText(self, childName, text):
Line 544: childNode = self.doc.createElement(childName)
Line 545: textNode = self.doc.createTextNode(str(text))
let's be nice to our Chinese and Hebrew contributors. Cast to unicode.
Line 546: childNode.appendChild(textNode)
Line 547: self.dom.appendChild(childNode)
Line 548:
Line 549: def appendConsole(self):
--
To view, visit http://gerrit.ovirt.org/7832
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id22db83062eaf85645c2d61c83f3f20943918413
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Daniel P. Berrange <berrange(a)redhat.com>
7:48 a.m.
Adam Litke has abandoned this change.
Change subject: libvirtvm: Cast text to string when creating text node
......................................................................
Patch Set 3: Abandoned
--
To view, visit http://gerrit.ovirt.org/7832
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: abandon
Gerrit-Change-Id: Id22db83062eaf85645c2d61c83f3f20943918413
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Daniel P. Berrange <berrange(a)redhat.com>
Gerrit-Reviewer: Ryan Harper <ryanh(a)us.ibm.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Shu Ming <shuming(a)linux.vnet.ibm.com>
4161
days inactive
4288
days old
vdsm-patches@lists.fedorahosted.org
7 comments
5 participants
participants (5)
-
agl＠us.ibm.com -
Dan Kenigsberg -
Ryan Harper -
shuming＠linux.vnet.ibm.com -
smizrahi＠redhat.com