11:53 a.m.
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
V3 -> V4:
work around if virDomain.metadata and virDomain.setMetadata do not work
in all livirt versions used in the supported distros.
V2 -> V3:
move the virDomain.metadata and virDomain.setMetadata to model/utils.py
add testcase
V1 -> V2:
libvirt also support virDomain.metadata and virDomain.setMetadata two api.
use virDomain.metadata to get the user and group.
use virDomain.setMetadata to set the user and group.
ShaoHe Feng (5):
Add two function to set and get domain xml metadata
bug fix: get user and group when vm is living.
update test case to set/get user and group when VM is running
write the template OS info to vm metadata
manually manage the metadata element
src/kimchi/i18n.py | 1 +
src/kimchi/model/utils.py | 73 ++++++++++++++++++++++++++++++++++++++++
src/kimchi/model/vms.py | 86 +++++++++++++++++++++++++++--------------------
tests/test_model.py | 13 +++++++
4 files changed, 137 insertions(+), 36 deletions(-)
--
1.9.0
11:53 a.m.
New subject: [PATCH V4 1/5] Add two function to set and get domain xml metadata
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Libvirt support two API to set and get domain xml metadata.
These two function wrap them.
Put them in model/utils.py, so vm_storage and vm_iface can make use of
them.
For set domain xml metadata, we set live and config xml by default.
For get domain xml metadata, we get the current xml by default.
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
---
src/kimchi/i18n.py | 1 +
src/kimchi/model/utils.py | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py
index 89bcd02..16da8a5 100644
--- a/src/kimchi/i18n.py
+++ b/src/kimchi/i18n.py
@@ -86,6 +86,7 @@ messages = {
"KCHVM0026E": _("Group name must be a string"),
"KCHVM0027E": _("User(s) '%(users)s' do not exist"),
"KCHVM0028E": _("Group(s) '%(groups)s' do not exist"),
+ "KCHVM0029E": _("Unable to get access metadata of virtual machine
%(name)s. Details: %(err)s"),
"KCHVMIF0001E": _("Interface %(iface)s does not exist in virtual
machine %(name)s"),
"KCHVMIF0002E": _("Network %(network)s specified for virtual machine
%(name)s does not exist"),
diff --git a/src/kimchi/model/utils.py b/src/kimchi/model/utils.py
index 80e1801..51acb68 100644
--- a/src/kimchi/model/utils.py
+++ b/src/kimchi/model/utils.py
@@ -18,6 +18,11 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
from kimchi.exception import OperationFailed
+import libvirt
+from lxml import etree
+
+
+KIMCHI_META_URL = "https://github.com/kimchi-project/kimchi/metadata/"
def get_vm_name(vm_name, t_name, name_list):
@@ -28,3 +33,39 @@ def get_vm_name(vm_name, t_name, name_list):
if vm_name not in name_list:
return vm_name
raise OperationFailed("KCHUTILS0003E")
+
+
+def get_vm_config_flag(dom, mode="persistent"):
+ # libvirt.VIR_DOMAIN_AFFECT_CURRENT is 0
+ # VIR_DOMAIN_AFFECT_LIVE is 1, VIR_DOMAIN_AFFECT_CONFIG is 2
+ flag = {"live": libvirt.VIR_DOMAIN_AFFECT_LIVE,
+ "persistent": libvirt.VIR_DOMAIN_AFFECT_CONFIG,
+ "current": libvirt.VIR_DOMAIN_AFFECT_CURRENT,
+ "all": libvirt.VIR_DOMAIN_AFFECT_CONFIG +
+ libvirt.VIR_DOMAIN_AFFECT_LIVE if dom.isActive() and
+ dom.isPersistent() else libvirt.VIR_DOMAIN_AFFECT_CURRENT}
+
+ return flag[mode]
+
+
+def set_vm_metadata_element(dom, meta_xml, mode="all"):
+ element = etree.fromstring(meta_xml)
+ # From libvirt doc, Passing None for @metadata says to remove that element
+ # from the domain XML (passing the empty string leaves the element present)
+ # Do not support remove the old metadata
+ dom.setMetadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, meta_xml,
+ "kimchi", KIMCHI_META_URL + element.tag,
+ flags=get_vm_config_flag(dom, mode))
+
+
+def get_vm_metadata_element(dom, element, mode="current"):
+ try:
+ return dom.metadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT,
+ KIMCHI_META_URL + element,
+ flags=get_vm_config_flag(dom, mode))
+ except libvirt.libvirtError as e:
+ if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN_METADATA:
+ return ""
+ else:
+ raise OperationFailed("KCHVM0029E", {'name': dom.name(),
+ 'err': e.message})
--
1.9.0
11:53 a.m.
New subject: [PATCH V4 2/5] bug fix: get user and group when vm is living.
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
define a domain just edit the persistent xml.
So we should get user and group from persistent xml instead of live xml
when domain is living.
Refacor the code by libvirt metadata API and fix the bug.
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
---
src/kimchi/model/vms.py | 68 +++++++++++++++++++++++--------------------------
1 file changed, 32 insertions(+), 36 deletions(-)
diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py
index ede54a3..d0b456c 100644
--- a/src/kimchi/model/vms.py
+++ b/src/kimchi/model/vms.py
@@ -35,6 +35,8 @@ from kimchi.exception import NotFoundError, OperationFailed
from kimchi.model.config import CapabilitiesModel
from kimchi.model.templates import TemplateModel
from kimchi.model.utils import get_vm_name
+from kimchi.model.utils import get_vm_metadata_element
+from kimchi.model.utils import set_vm_metadata_element
from kimchi.screenshot import VMScreenshot
from kimchi.utils import import_class, kimchi_log, run_setfacl_set_attr
from kimchi.utils import template_name_from_uri
@@ -252,35 +254,38 @@ class VMModel(object):
for group in groups:
access.append(E.group(group))
- return E.metadata(E.kimchi(access))
+ return access
+
+ def _vm_updata_access_metadata(self, dom, params):
+ access_xml = (get_vm_metadata_element(dom, "access") or
+ """<access></access>""")
+ old_users = xpath_get_text(access_xml, "/access/user")
+ old_groups = xpath_get_text(access_xml, "/access/group")
+ users = params.get("users")
+ groups = params.get("groups")
+ if users is None and groups is None:
+ return
+ users = old_users if users is None else users
+ groups = old_groups if groups is None else groups
+ for user in users:
+ if not User(user).exists():
+ raise OperationFailed("KCHVM0027E", {'user': user})
+ for group in groups:
+ if not Group(group).exists():
+ raise OperationFailed("KCHVM0028E", {'group': group})
+
+ xml = self._get_metadata_node(users, groups)
+ set_vm_metadata_element(dom, ET.tostring(xml), "all")
def _static_vm_update(self, dom, params):
state = DOM_STATE_MAP[dom.info()[0]]
old_xml = new_xml = dom.XMLDesc(0)
- metadata_xpath = "/domain/metadata/kimchi/access/%s"
- users = xpath_get_text(old_xml, metadata_xpath % "user")
- groups = xpath_get_text(old_xml, metadata_xpath % "group")
-
for key, val in params.items():
- if key == 'users':
- invalid_users = set(val) - set(self.users.get_list())
- if len(invalid_users) != 0:
- raise InvalidParameter("KCHVM0027E",
- {'users': ",
".join(invalid_users)})
- users = val
- elif key == 'groups':
- invalid_groups = set(val) - set(self.groups.get_list())
- if len(invalid_groups) != 0:
- raise InvalidParameter("KCHVM0028E",
- {'groups':
- ", ".join(invalid_groups)})
- groups = val
- else:
- if key in VM_STATIC_UPDATE_PARAMS:
- xpath = VM_STATIC_UPDATE_PARAMS[key]
- new_xml = xmlutils.xml_item_update(new_xml, xpath, val)
+ if key in VM_STATIC_UPDATE_PARAMS:
+ xpath = VM_STATIC_UPDATE_PARAMS[key]
+ new_xml = xmlutils.xml_item_update(new_xml, xpath, val)
conn = self.conn.get()
try:
@@ -294,16 +299,6 @@ class VMModel(object):
conn = self.conn.get()
dom = conn.defineXML(new_xml)
- # Update metadata element
- root = ET.fromstring(new_xml)
- current_metadata = root.find('metadata')
- new_metadata = self._get_metadata_node(users, groups)
- if current_metadata is not None:
- root.replace(current_metadata, new_metadata)
- else:
- root.append(new_metadata)
- dom = conn.defineXML(ET.tostring(root))
-
except libvirt.libvirtError as e:
dom = conn.defineXML(old_xml)
raise OperationFailed("KCHVM0008E", {'name': dom.name(),
@@ -311,7 +306,7 @@ class VMModel(object):
return dom
def _live_vm_update(self, dom, params):
- pass
+ self._vm_updata_access_metadata(dom, params)
def _has_video(self, dom):
dom = ElementTree.fromstring(dom.XMLDesc(0))
@@ -350,9 +345,10 @@ class VMModel(object):
res['io_throughput'] = vm_stats.get('disk_io', 0)
res['io_throughput_peak'] = vm_stats.get('max_disk_io', 100)
- xml = dom.XMLDesc(0)
- users = xpath_get_text(xml, "/domain/metadata/kimchi/access/user")
- groups = xpath_get_text(xml, "/domain/metadata/kimchi/access/group")
+ access_xml = (get_vm_metadata_element(dom, "access") or
+ """<access></access>""")
+ users = xpath_get_text(access_xml, "/access/user")
+ groups = xpath_get_text(access_xml, "/access/group")
return {'state': state,
'stats': res,
--
1.9.0
11:53 a.m.
New subject: [PATCH V4 3/5] update test case to set/get user and group when VM is running
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
When vm is live, we should also get user and group correctly.
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
---
tests/test_model.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/tests/test_model.py b/tests/test_model.py
index 2fb4446..6853ec1 100644
--- a/tests/test_model.py
+++ b/tests/test_model.py
@@ -601,6 +601,19 @@ class ModelTests(unittest.TestCase):
self.assertRaises(InvalidParameter, inst.vm_update,
'kimchi-vm1', params)
+ # change VM users and groups, when wm is running.
+ inst.vm_update(u'kimchi-vm1',
+ {'users': ['root'], 'groups':
['root']})
+ vm_info = inst.vm_lookup(u'kimchi-vm1')
+ self.assertEquals(['root'], vm_info['users'])
+ self.assertEquals(['root'], vm_info['groups'])
+ # change VM users and groups by removing all elements,
+ # when wm is running.
+ inst.vm_update(u'kimchi-vm1', {'users': [], 'groups':
[]})
+ vm_info = inst.vm_lookup(u'kimchi-vm1')
+ self.assertEquals([], vm_info['users'])
+ self.assertEquals([], vm_info['groups'])
+
inst.vm_poweroff('kimchi-vm1')
params = {'name': u'пeω-∨м'}
self.assertRaises(OperationFailed, inst.vm_update,
--
1.9.0
11:53 a.m.
New subject: [PATCH V4 4/5] write the template OS info to vm metadata
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Then kimchi can choose the divice mode depend on these info.
Note, the info is the initial OS when install OS on a blank guest.
OS may change after the install.
So other device should still keep their model info in the vm metadata.
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
---
src/kimchi/model/vms.py | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py
index d0b456c..d079823 100644
--- a/src/kimchi/model/vms.py
+++ b/src/kimchi/model/vms.py
@@ -220,6 +220,8 @@ class VMsModel(object):
raise OperationFailed("KCHVM0007E", {'name': name,
'err': e.get_error_message()})
+ VMModel.vm_updata_os_metadata(VMModel.get_vm(name, self.conn), t.info)
+
return name
def get_list(self):
@@ -277,6 +279,22 @@ class VMModel(object):
xml = self._get_metadata_node(users, groups)
set_vm_metadata_element(dom, ET.tostring(xml), "all")
+ @staticmethod
+ def vm_get_os_metadata(dom):
+ os_xml = (get_vm_metadata_element(dom, "OS") or
+ """<OS></OS>""")
+ OS = ET.fromstring(os_xml)
+ return (OS.attrib.get("version"), OS.attrib.get("distro"))
+
+ @staticmethod
+ def vm_updata_os_metadata(dom, params):
+ distro = params.get("os_distro")
+ version = params.get("os_version")
+ if distro is None:
+ return
+ OS = E.os({"distro": distro, "version": version})
+ set_vm_metadata_element(dom, ET.tostring(OS))
+
def _static_vm_update(self, dom, params):
state = DOM_STATE_MAP[dom.info()[0]]
--
1.9.0
11:53 a.m.
New subject: [PATCH V4 5/5] manually manage the metadata element
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
virDomain.metadata and virDomain.setMetadata does not work in all livirt
versions used in the supported distros.
So if libvirt do not support these two API.
let kimchi manually manage the metadata element
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
---
src/kimchi/model/utils.py | 38 +++++++++++++++++++++++++++++++++++---
1 file changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/kimchi/model/utils.py b/src/kimchi/model/utils.py
index 51acb68..2fefa6a 100644
--- a/src/kimchi/model/utils.py
+++ b/src/kimchi/model/utils.py
@@ -20,6 +20,7 @@
from kimchi.exception import OperationFailed
import libvirt
from lxml import etree
+from lxml.builder import E
KIMCHI_META_URL = "https://github.com/kimchi-project/kimchi/metadata/"
@@ -53,9 +54,30 @@ def set_vm_metadata_element(dom, meta_xml, mode="all"):
# From libvirt doc, Passing None for @metadata says to remove that element
# from the domain XML (passing the empty string leaves the element present)
# Do not support remove the old metadata
- dom.setMetadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, meta_xml,
- "kimchi", KIMCHI_META_URL + element.tag,
- flags=get_vm_config_flag(dom, mode))
+ try:
+ dom.setMetadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, meta_xml,
+ "kimchi", KIMCHI_META_URL + element.tag,
+ flags=get_vm_config_flag(dom, mode))
+ except libvirt.libvirtError as e:
+ # FIXME remove this code when all distro libvirt supports setMetadata
+ if e.get_error_code() == libvirt.VIR_ERR_ARGUMENT_UNSUPPORTED:
+ # some other tools will not let libvirt create a persistent
+ # configuration, raise exeption.
+ if not dom.isPersistent:
+ msg = 'The VM has not a persistent configuration'
+ raise OperationFailed("KCHVM0029E",
+ {'name': dom.name(), "err":
msg})
+ xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE)
+ root = etree.fromstring(xml)
+ metadata = root.find("metadata")
+ if metadata is None:
+ metadata = E.metadata()
+ root.append(metadata)
+ old_elem = metadata.find(element.tag)
+ (metadata.replace(old_elem, element) if old_elem is not None
+ else metadata.append(element))
+
+ dom.connect().defineXML(etree.tostring(root))
def get_vm_metadata_element(dom, element, mode="current"):
@@ -64,6 +86,16 @@ def get_vm_metadata_element(dom, element, mode="current"):
KIMCHI_META_URL + element,
flags=get_vm_config_flag(dom, mode))
except libvirt.libvirtError as e:
+ # FIXME remove this code when all distro libvirt supports metadata
+ if e.get_error_code() == libvirt.VIR_ERR_ARGUMENT_UNSUPPORTED:
+ # some other tools will not let libvirt create a persistent
+ # configuration, just return empty
+ if not dom.isPersistent:
+ return ""
+ xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE)
+ root = etree.fromstring(xml)
+ elements = root.xpath("metadata/%s" % element)
+ return etree.tostring(elements[0]) if elements else ""
if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN_METADATA:
return ""
else:
--
1.9.0
3661
days inactive
3661
days old
5 comments
1 participants
participants (1)
-
shaohef＠linux.vnet.ibm.com