Michal Skrivanek has uploaded a new change for review. Change subject: converting some more RH strings to oVirt ......................................................................
converting some more RH strings to oVirt Change-Id: I2fe916e591e2d998f30c997e0af907db776dad62 Signed-off-by: Michal Skrivanek <[email protected]> --- M vdsm/libvirtvm.py M vdsm_hooks/smbios/README M vdsm_hooks/smbios/before_vm_start.py 3 files changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/7920/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index cdd0e4e..b9def61 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -42,6 +42,8 @@ # service/daemon and in libvirtd (to be used with the quiesce flag). _QEMU_GA_DEVICE_NAME = 'org.qemu.guest_agent.0' +_SMBIOS_MANUFACTURER = 'oVirt' + class MERGESTATUS: NOT_STARTED = "Not Started" @@ -663,7 +665,10 @@ m.appendChild(self.doc.createTextNode(v)) syselem.appendChild(m) - appendEntry('manufacturer', 'oVirt') + if osname == caps.OSName.RHEL + osname = caps.OSName.RHEVH + + appendEntry('manufacturer', _SMBIOS_MANUFACTURER) appendEntry('product', osname) appendEntry('version', osversion) appendEntry('serial', hostUUID) @@ -1219,7 +1224,7 @@ osd = caps.osversion() domxml.appendSysinfo( - osname=caps.getos(), + osname=osd.get('name', ''), osversion=osd.get('version', '') + '-' + osd.get('release', ''), hostUUID=utils.getHostUUID()) diff --git a/vdsm_hooks/smbios/README b/vdsm_hooks/smbios/README index 9f1aac8..caba65d 100644 --- a/vdsm_hooks/smbios/README +++ b/vdsm_hooks/smbios/README @@ -3,5 +3,5 @@ adding/changing entries to smbios domain entry: syntax: -smbios: smbios={'serial': '1234'}^{'vendor': 'redhat'} +smbios: smbios={'serial': '1234'}^{'vendor': 'oVirt'} add/edit 2 attributes to smbios: serial and vendor diff --git a/vdsm_hooks/smbios/before_vm_start.py b/vdsm_hooks/smbios/before_vm_start.py index cbd5949..d89a8f5 100755 --- a/vdsm_hooks/smbios/before_vm_start.py +++ b/vdsm_hooks/smbios/before_vm_start.py @@ -13,7 +13,7 @@ syntax: -smbios={'serial': '1234'}^{'vendor': 'redhat'} +smbios={'serial': '1234'}^{'vendor': 'oVirt'} ''' bios_entries = ["vendor", "version", "date", "release"] -- To view, visit http://gerrit.ovirt.org/7920 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2fe916e591e2d998f30c997e0af907db776dad62 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Michal Skrivanek <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
