[vdsm/f18] uniform the included patches
Federico Simoncelli
fsimonce at fedoraproject.org
Wed Jan 30 16:39:51 UTC 2013
commit dd5d632a3df5ef20ddb4872e7e843a8c83e7c75b
Author: Federico Simoncelli <fsimonce at redhat.com>
Date: Mon Jan 28 17:18:58 2013 +0100
uniform the included patches
...m.spec-python-ordereddict-only-for-rhel-7.patch | 42 +++
...hon-ordereddict-only-for-rhel-more-then-7.patch | 21 --
...dont-require-python-ordereddict-on-fedora.patch | 21 --
...on-t-require-python-ordereddict-on-fedora.patch | 42 +++
...vdsm.spec-BuildRequires-python-pthreading.patch | 26 ++-
...or-both-py-and-pyc-file-to-start-super-vd.patch | 28 ++-
...> 0011-adding-getHardwareInfo-API-to-vdsm.patch | 277 ++++++++++++--------
vdsm.spec | 9 +-
8 files changed, 300 insertions(+), 166 deletions(-)
---
diff --git a/0007-vdsm.spec-python-ordereddict-only-for-rhel-7.patch b/0007-vdsm.spec-python-ordereddict-only-for-rhel-7.patch
new file mode 100644
index 0000000..d20a3c9
--- /dev/null
+++ b/0007-vdsm.spec-python-ordereddict-only-for-rhel-7.patch
@@ -0,0 +1,42 @@
+From 03389bcfa0808927ad7e8115073f89f05ce7fe5b Mon Sep 17 00:00:00 2001
+From: Douglas Schilling Landgraf <dougsland at redhat.com>
+Date: Tue, 15 Jan 2013 13:12:08 -0500
+Subject: [PATCH 07/22] vdsm.spec: python-ordereddict only for rhel < 7
+
+rhel7 contains python 2.7 which already includes ordereddict module,
+no need extra python package.
+
+Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=891542
+Change-Id: I784d82a7fb5a1c6a13f015747f077020b91c19cb
+Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/11056
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+---
+ vdsm.spec.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vdsm.spec.in b/vdsm.spec.in
+index f9e238b..c01d29f 100644
+--- a/vdsm.spec.in
++++ b/vdsm.spec.in
+@@ -44,7 +44,7 @@ BuildRequires: libvirt-python
+ BuildRequires: genisoimage
+ BuildRequires: openssl
+ BuildRequires: m2crypto
+-%if 0%{?rhel}
++%if 0%{?rhel} < 7
+ BuildRequires: python-ordereddict
+ %endif
+
+@@ -174,7 +174,7 @@ Summary: VDSM API Server
+ BuildArch: noarch
+
+ Requires: %{name}-python = %{version}-%{release}
+-%if 0%{?rhel}
++%if 0%{?rhel} < 7
+ Requires: python-ordereddict
+ %endif
+
+--
+1.8.1
+
diff --git a/0008-vdsm.spec-Don-t-require-python-ordereddict-on-fedora.patch b/0008-vdsm.spec-Don-t-require-python-ordereddict-on-fedora.patch
new file mode 100644
index 0000000..20dcf5b
--- /dev/null
+++ b/0008-vdsm.spec-Don-t-require-python-ordereddict-on-fedora.patch
@@ -0,0 +1,42 @@
+From 95765433ada7074f49fb33bb2f2ea59799022e98 Mon Sep 17 00:00:00 2001
+From: Douglas Schilling Landgraf <dougsland at redhat.com>
+Date: Tue, 15 Jan 2013 13:16:06 -0500
+Subject: [PATCH 08/22] vdsm.spec: Don't require python-ordereddict on fedora
+
+It is a regression introduced by commit bb0620f. The condition "0%{?rhel} < 7"
+also holds true on fedora, so it causes to require python-ordereddict on fedora
+
+Change-Id: I87e167f207669f4dda5bb71d7809fe301ea7e905
+Signed-off-by: Mark Wu <wudxw at linux.vnet.ibm.com>
+Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/11057
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+---
+ vdsm.spec.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vdsm.spec.in b/vdsm.spec.in
+index c01d29f..b518045 100644
+--- a/vdsm.spec.in
++++ b/vdsm.spec.in
+@@ -44,7 +44,7 @@ BuildRequires: libvirt-python
+ BuildRequires: genisoimage
+ BuildRequires: openssl
+ BuildRequires: m2crypto
+-%if 0%{?rhel} < 7
++%if 0%{?rhel} == 6
+ BuildRequires: python-ordereddict
+ %endif
+
+@@ -174,7 +174,7 @@ Summary: VDSM API Server
+ BuildArch: noarch
+
+ Requires: %{name}-python = %{version}-%{release}
+-%if 0%{?rhel} < 7
++%if 0%{?rhel} == 6
+ Requires: python-ordereddict
+ %endif
+
+--
+1.8.1
+
diff --git a/0009-vdsm.spec-BuildRequires-python-pthreading.patch b/0009-vdsm.spec-BuildRequires-python-pthreading.patch
index b22d392..1aff2c9 100644
--- a/0009-vdsm.spec-BuildRequires-python-pthreading.patch
+++ b/0009-vdsm.spec-BuildRequires-python-pthreading.patch
@@ -1,6 +1,23 @@
-diff -up vdsm-4.10.3/vdsm.spec.in.rpmpackage vdsm-4.10.3/vdsm.spec.in
---- vdsm-4.10.3/vdsm.spec.in.rpmpackage 2013-01-15 19:05:40.384775863 -0500
-+++ vdsm-4.10.3/vdsm.spec.in 2013-01-15 19:05:46.645836786 -0500
+From bed07103fc279eefd3f879f7f47e7d3b3c2cd8a9 Mon Sep 17 00:00:00 2001
+From: Douglas Schilling Landgraf <dougsland at redhat.com>
+Date: Tue, 15 Jan 2013 14:16:01 -0500
+Subject: [PATCH 09/22] vdsm.spec: BuildRequires: python-pthreading
+
+Moving python-pthreading to be a generic BuildRequirement
+
+Change-Id: If996c366cac42e149193651d2d8a6dbde6d8c81e
+Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=891542
+Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/11058
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+---
+ vdsm.spec.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/vdsm.spec.in b/vdsm.spec.in
+index b518045..14381e5 100644
+--- a/vdsm.spec.in
++++ b/vdsm.spec.in
@@ -39,6 +39,7 @@ BuildRequires: python-nose
# BuildRequires needed by the tests during the build
@@ -9,3 +26,6 @@ diff -up vdsm-4.10.3/vdsm.spec.in.rpmpackage vdsm-4.10.3/vdsm.spec.in
BuildRequires: libselinux-python
BuildRequires: libvirt-python
BuildRequires: genisoimage
+--
+1.8.1
+
diff --git a/0010-Searching_for_both_py_and_pyc_file_to_start_super_vdsm.patch b/0010-Searching-for-both-py-and-pyc-file-to-start-super-vd.patch
similarity index 56%
rename from 0010-Searching_for_both_py_and_pyc_file_to_start_super_vdsm.patch
rename to 0010-Searching-for-both-py-and-pyc-file-to-start-super-vd.patch
index 9308e27..658729a 100644
--- a/0010-Searching_for_both_py_and_pyc_file_to_start_super_vdsm.patch
+++ b/0010-Searching-for-both-py-and-pyc-file-to-start-super-vd.patch
@@ -1,6 +1,25 @@
-diff -up vdsm-4.10.3/vdsm/supervdsm.py.rpmpackage vdsm-4.10.3/vdsm/supervdsm.py
---- vdsm-4.10.3/vdsm/supervdsm.py.rpmpackage 2013-01-18 15:08:11.812775887 -0500
-+++ vdsm-4.10.3/vdsm/supervdsm.py 2013-01-18 15:08:23.343774380 -0500
+From 72ff12082013c1682604e2ffb9e8a06b2714d64e Mon Sep 17 00:00:00 2001
+From: Yaniv Bronhaim <ybronhei at redhat.com>
+Date: Thu, 17 Jan 2013 09:38:43 +0200
+Subject: [PATCH 10/22] Searching for both py and pyc file to start super vdsm
+
+In oVirt Node we don't keep py files.
+
+Change-Id: I36771ce46f5d00ad8befe33569252bdb8cffeaa1
+Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/10854
+Reviewed-by: Douglas Schilling Landgraf <dougsland at redhat.com>
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/11133
+Reviewed-by: Vinzenz Feenstra <vfeenstr at redhat.com>
+---
+ vdsm/supervdsm.py | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/vdsm/supervdsm.py b/vdsm/supervdsm.py
+index 532d5ac..740a93e 100644
+--- a/vdsm/supervdsm.py
++++ b/vdsm/supervdsm.py
@@ -35,19 +35,23 @@ _g_singletonSupervdsmInstance = None
_g_singletonSupervdsmInstance_lock = threading.Lock()
@@ -30,3 +49,6 @@ diff -up vdsm-4.10.3/vdsm/supervdsm.py.rpmpackage vdsm-4.10.3/vdsm/supervdsm.py
extraPythonPathList = []
+--
+1.8.1
+
diff --git a/0011-adding_getHardwareInfo_API_to_vdsm.patch b/0011-adding-getHardwareInfo-API-to-vdsm.patch
similarity index 74%
rename from 0011-adding_getHardwareInfo_API_to_vdsm.patch
rename to 0011-adding-getHardwareInfo-API-to-vdsm.patch
index 7751378..85a1509 100644
--- a/0011-adding_getHardwareInfo_API_to_vdsm.patch
+++ b/0011-adding-getHardwareInfo-API-to-vdsm.patch
@@ -1,6 +1,73 @@
-diff -up vdsm-4.10.3/vdsm/API.py.rpmpackage vdsm-4.10.3/vdsm/API.py
---- vdsm-4.10.3/vdsm/API.py.rpmpackage 2013-01-18 15:45:18.705836385 -0500
-+++ vdsm-4.10.3/vdsm/API.py 2013-01-18 15:49:25.596775414 -0500
+From 6d25123c36637eb82966d52e33330bdbfa733413 Mon Sep 17 00:00:00 2001
+From: Yaniv Bronhaim <ybronhei at redhat.com>
+Date: Fri, 18 Jan 2013 15:01:37 +0200
+Subject: [PATCH 11/22] adding getHardwareInfo API to vdsm
+
+Super vdsm retrieves system info about host hardware
+parameters. This info will be shown as part of getHardwareInfo
+API call in a structure called HardwareInformation.
+
+This feature currently available only for x86 cpu platfroms, for other
+platfroms the api call returns empty dictionary.
+
+Feature-Description:
+http://wiki.ovirt.org/wiki/Features/Design/HostHardwareInfo
+
+Change-Id: Ic429ef101fcf9047c4b552405314dc7ba9ba07a0
+Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/9258
+Reviewed-by: Barak Azulay <bazulay at redhat.com>
+Reviewed-by: Shu Ming <shuming at linux.vnet.ibm.com>
+Reviewed-by: Saggi Mizrahi <smizrahi at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/11168
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+---
+ vdsm.spec.in | 5 +++
+ vdsm/API.py | 11 +++++
+ vdsm/BindingXMLRPC.py | 5 +++
+ vdsm/Makefile.am | 1 +
+ vdsm/define.py | 3 ++
+ vdsm/dmidecodeUtil.py | 99 ++++++++++++++++++++++++++++++++++++++++++++
+ vdsm/supervdsmServer.py | 10 +++++
+ vdsm_api/vdsmapi-schema.json | 25 +++++++++++
+ vdsm_cli/vdsClient.py | 7 ++++
+ 9 files changed, 166 insertions(+)
+ create mode 100644 vdsm/dmidecodeUtil.py
+
+diff --git a/vdsm.spec.in b/vdsm.spec.in
+index 14381e5..5b13419 100644
+--- a/vdsm.spec.in
++++ b/vdsm.spec.in
+@@ -45,6 +45,9 @@ BuildRequires: libvirt-python
+ BuildRequires: genisoimage
+ BuildRequires: openssl
+ BuildRequires: m2crypto
++%ifarch x86_64
++BuildRequires: python-dmidecode
++%endif
+ %if 0%{?rhel} == 6
+ BuildRequires: python-ordereddict
+ %endif
+@@ -77,6 +80,7 @@ Requires: m2crypto
+ Requires: %{name}-xmlrpc = %{version}-%{release}
+
+ %ifarch x86_64
++Requires: python-dmidecode
+ Requires: dmidecode
+ %endif
+
+@@ -610,6 +614,7 @@ exit 0
+ %{_datadir}/%{vdsm_name}/blkid.py*
+ %{_datadir}/%{vdsm_name}/caps.py*
+ %{_datadir}/%{vdsm_name}/clientIF.py*
++%{_datadir}/%{vdsm_name}/dmidecodeUtil.py*
+ %{_datadir}/%{vdsm_name}/API.py*
+ %{_datadir}/%{vdsm_name}/hooking.py*
+ %{_datadir}/%{vdsm_name}/hooks.py*
+diff --git a/vdsm/API.py b/vdsm/API.py
+index a1e3f2c..732f8a3 100644
+--- a/vdsm/API.py
++++ b/vdsm/API.py
@@ -1119,6 +1119,17 @@ class Global(APIBase):
return {'status': doneCode, 'info': c}
@@ -19,44 +86,10 @@ diff -up vdsm-4.10.3/vdsm/API.py.rpmpackage vdsm-4.10.3/vdsm/API.py
def getStats(self):
"""
Report host statistics.
-diff -up vdsm-4.10.3/vdsm_api/vdsmapi-schema.json.rpmpackage vdsm-4.10.3/vdsm_api/vdsmapi-schema.json
---- vdsm-4.10.3/vdsm_api/vdsmapi-schema.json.rpmpackage 2013-01-18 15:45:18.716836593 -0500
-+++ vdsm-4.10.3/vdsm_api/vdsmapi-schema.json 2013-01-18 15:49:25.599775703 -0500
-@@ -690,6 +690,31 @@
- 'data': {'release': 'str', 'version': 'str', 'name': 'OSName'}}
-
- ##
-+# @HardwareInformation:
-+#
-+# Host hardware fields.
-+#
-+# @systemManufacturer: Host manufacturer's name
-+#
-+# @systemProductName: Host's hardware module
-+#
-+# @systemSerialNumber: Hardware serial number
-+#
-+# @systemFamily: Processor type
-+#
-+# @systemUUID: Host's hardware UUID
-+#
-+# @systemVersion: Host's hardware version
-+#
-+# Since: 4.10.3
-+##
-+{'type': 'HardwareInformation',
-+ 'data': {'systemManufacturer': 'str',
-+ 'systemProductName': 'str', 'systemVersion': 'str',
-+ 'systemSerialNumber': 'str', 'systemUUID': 'str',
-+ 'systemFamily': 'str'}}
-+
-+##
- # @SoftwarePackage:
- #
- # An enumeration of aliases for important software components.
-diff -up vdsm-4.10.3/vdsm/BindingXMLRPC.py.rpmpackage vdsm-4.10.3/vdsm/BindingXMLRPC.py
---- vdsm-4.10.3/vdsm/BindingXMLRPC.py.rpmpackage 2013-01-18 15:45:18.707836392 -0500
-+++ vdsm-4.10.3/vdsm/BindingXMLRPC.py 2013-01-18 15:49:25.596775414 -0500
+diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py
+index 73185b9..f19a8bb 100644
+--- a/vdsm/BindingXMLRPC.py
++++ b/vdsm/BindingXMLRPC.py
@@ -288,6 +288,10 @@ class BindingXMLRPC(object):
ret['info'].update(self.getServerInfo())
return ret
@@ -76,33 +109,22 @@ diff -up vdsm-4.10.3/vdsm/BindingXMLRPC.py.rpmpackage vdsm-4.10.3/vdsm/BindingXM
(self.getStats, 'getVdsStats'),
(self.vmGetStats, 'getVmStats'),
(self.getAllVmStats, 'getAllVmStats'),
-diff -up vdsm-4.10.3/vdsm_cli/vdsClient.py.rpmpackage vdsm-4.10.3/vdsm_cli/vdsClient.py
---- vdsm-4.10.3/vdsm_cli/vdsClient.py.rpmpackage 2013-01-18 15:45:19.589961958 -0500
-+++ vdsm-4.10.3/vdsm_cli/vdsClient.py 2013-01-18 15:49:25.600774582 -0500
-@@ -411,6 +411,9 @@ class service:
- def do_getCap(self, args):
- return self.ExecAndExit(self.s.getVdsCapabilities())
-
-+ def do_getHardware(self, args):
-+ return self.ExecAndExit(self.s.getVdsHardwareInfo())
-+
- def do_getVdsStats(self, args):
- return self.ExecAndExit(self.s.getVdsStats())
-
-@@ -1900,6 +1903,10 @@ if __name__ == '__main__':
- ('',
- 'Get Capabilities info of the VDS'
- )),
-+ 'getVdsHardwareInfo': (serv.do_getHardware,
-+ ('',
-+ 'Get hardware info of the VDS'
-+ )),
- 'getVdsStats': (serv.do_getVdsStats,
- ('',
- 'Get Statistics info on the VDS'
-diff -up vdsm-4.10.3/vdsm/define.py.rpmpackage vdsm-4.10.3/vdsm/define.py
---- vdsm-4.10.3/vdsm/define.py.rpmpackage 2013-01-18 15:45:18.710836248 -0500
-+++ vdsm-4.10.3/vdsm/define.py 2013-01-18 15:49:25.597774451 -0500
+diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
+index dc0590e..88b3287 100644
+--- a/vdsm/Makefile.am
++++ b/vdsm/Makefile.am
+@@ -32,6 +32,7 @@ dist_vdsm_PYTHON = \
+ configNetwork.py \
+ debugPluginClient.py \
+ dummybr.py \
++ dmidecodeUtil.py \
+ guestIF.py \
+ hooking.py \
+ hooks.py \
+diff --git a/vdsm/define.py b/vdsm/define.py
+index efebea1..01b0c60 100644
+--- a/vdsm/define.py
++++ b/vdsm/define.py
@@ -127,6 +127,9 @@ errCode = {'noVM': {'status':
'updateDevice': {'status':
{'code': 56,
@@ -113,9 +135,11 @@ diff -up vdsm-4.10.3/vdsm/define.py.rpmpackage vdsm-4.10.3/vdsm/define.py
'recovery': {'status':
{'code': 99,
'message':
-diff -up vdsm-4.10.3/vdsm/dmidecodeUtil.py.rpmpackage vdsm-4.10.3/vdsm/dmidecodeUtil.py
---- vdsm-4.10.3/vdsm/dmidecodeUtil.py.rpmpackage 2013-01-18 15:48:55.844775402 -0500
-+++ vdsm-4.10.3/vdsm/dmidecodeUtil.py 2013-01-18 15:49:25.598775541 -0500
+diff --git a/vdsm/dmidecodeUtil.py b/vdsm/dmidecodeUtil.py
+new file mode 100644
+index 0000000..eb8d834
+--- /dev/null
++++ b/vdsm/dmidecodeUtil.py
@@ -0,0 +1,99 @@
+#
+# Copyright 2012 Red Hat, Inc.
@@ -216,49 +240,10 @@ diff -up vdsm-4.10.3/vdsm/dmidecodeUtil.py.rpmpackage vdsm-4.10.3/vdsm/dmidecode
+ chassis=formatData(d['chassis']),
+ memory=formatData(d['memory']))
+ )
-diff -up vdsm-4.10.3/vdsm/Makefile.am.rpmpackage vdsm-4.10.3/vdsm/Makefile.am
---- vdsm-4.10.3/vdsm/Makefile.am.rpmpackage 2013-01-18 15:45:18.709836937 -0500
-+++ vdsm-4.10.3/vdsm/Makefile.am 2013-01-18 15:49:25.597774451 -0500
-@@ -32,6 +32,7 @@ dist_vdsm_PYTHON = \
- configNetwork.py \
- debugPluginClient.py \
- dummybr.py \
-+ dmidecodeUtil.py \
- guestIF.py \
- hooking.py \
- hooks.py \
-diff -up vdsm-4.10.3/vdsm.spec.in.rpmpackage vdsm-4.10.3/vdsm.spec.in
---- vdsm-4.10.3/vdsm.spec.in.rpmpackage 2013-01-18 15:45:18.703836950 -0500
-+++ vdsm-4.10.3/vdsm.spec.in 2013-01-18 15:49:25.595774766 -0500
-@@ -45,6 +45,9 @@ BuildRequires: libvirt-python
- BuildRequires: genisoimage
- BuildRequires: openssl
- BuildRequires: m2crypto
-+%ifarch x86_64
-+BuildRequires: python-dmidecode
-+%endif
- %if 0%{?rhel} == 6
- BuildRequires: python-ordereddict
- %endif
-@@ -77,6 +80,7 @@ Requires: m2crypto
- Requires: %{name}-xmlrpc = %{version}-%{release}
-
- %ifarch x86_64
-+Requires: python-dmidecode
- Requires: dmidecode
- %endif
-
-@@ -610,6 +614,7 @@ exit 0
- %{_datadir}/%{vdsm_name}/blkid.py*
- %{_datadir}/%{vdsm_name}/caps.py*
- %{_datadir}/%{vdsm_name}/clientIF.py*
-+%{_datadir}/%{vdsm_name}/dmidecodeUtil.py*
- %{_datadir}/%{vdsm_name}/API.py*
- %{_datadir}/%{vdsm_name}/hooking.py*
- %{_datadir}/%{vdsm_name}/hooks.py*
-diff -up vdsm-4.10.3/vdsm/supervdsmServer.py.rpmpackage vdsm-4.10.3/vdsm/supervdsmServer.py
---- vdsm-4.10.3/vdsm/supervdsmServer.py.rpmpackage 2013-01-18 15:45:18.713836464 -0500
-+++ vdsm-4.10.3/vdsm/supervdsmServer.py 2013-01-18 15:49:25.598775541 -0500
+diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py
+index 5effd41..dc89218 100755
+--- a/vdsm/supervdsmServer.py
++++ b/vdsm/supervdsmServer.py
@@ -17,6 +17,7 @@
# Refer to the README and COPYING files for full details of the license
#
@@ -283,3 +268,67 @@ diff -up vdsm-4.10.3/vdsm/supervdsmServer.py.rpmpackage vdsm-4.10.3/vdsm/supervd
def getDevicePartedInfo(self, *args, **kwargs):
return _getDevicePartedInfo(*args, **kwargs)
+diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
+index 7c9ef22..b69d33e 100644
+--- a/vdsm_api/vdsmapi-schema.json
++++ b/vdsm_api/vdsmapi-schema.json
+@@ -690,6 +690,31 @@
+ 'data': {'release': 'str', 'version': 'str', 'name': 'OSName'}}
+
+ ##
++# @HardwareInformation:
++#
++# Host hardware fields.
++#
++# @systemManufacturer: Host manufacturer's name
++#
++# @systemProductName: Host's hardware module
++#
++# @systemSerialNumber: Hardware serial number
++#
++# @systemFamily: Processor type
++#
++# @systemUUID: Host's hardware UUID
++#
++# @systemVersion: Host's hardware version
++#
++# Since: 4.10.3
++##
++{'type': 'HardwareInformation',
++ 'data': {'systemManufacturer': 'str',
++ 'systemProductName': 'str', 'systemVersion': 'str',
++ 'systemSerialNumber': 'str', 'systemUUID': 'str',
++ 'systemFamily': 'str'}}
++
++##
+ # @SoftwarePackage:
+ #
+ # An enumeration of aliases for important software components.
+diff --git a/vdsm_cli/vdsClient.py b/vdsm_cli/vdsClient.py
+index c67e3fe..884dc5d 100644
+--- a/vdsm_cli/vdsClient.py
++++ b/vdsm_cli/vdsClient.py
+@@ -411,6 +411,9 @@ class service:
+ def do_getCap(self, args):
+ return self.ExecAndExit(self.s.getVdsCapabilities())
+
++ def do_getHardware(self, args):
++ return self.ExecAndExit(self.s.getVdsHardwareInfo())
++
+ def do_getVdsStats(self, args):
+ return self.ExecAndExit(self.s.getVdsStats())
+
+@@ -1900,6 +1903,10 @@ if __name__ == '__main__':
+ ('',
+ 'Get Capabilities info of the VDS'
+ )),
++ 'getVdsHardwareInfo': (serv.do_getHardware,
++ ('',
++ 'Get hardware info of the VDS'
++ )),
+ 'getVdsStats': (serv.do_getVdsStats,
+ ('',
+ 'Get Statistics info on the VDS'
+--
+1.8.1
+
diff --git a/vdsm.spec b/vdsm.spec
index 6554c94..3a227ba 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -54,11 +54,12 @@ Patch2: 0003-api-Report-CPU-thread-info-in-getVdsCapabilities.patch
Patch3: 0004-caps.py-osversion-validate-OVIRT.patch
Patch4: 0005-restarting-libvirtd-didn-t-work-over-allinone-setup.patch
Patch5: 0006-Integrate-Smartcard-support.patch
-Patch6: 0007-vdsm.spec-python-ordereddict-only-for-rhel-more-then-7.patch
-Patch7: 0008-vdsm-spec-dont-require-python-ordereddict-on-fedora.patch
+Patch6: 0007-vdsm.spec-python-ordereddict-only-for-rhel-7.patch
+Patch7: 0008-vdsm.spec-Don-t-require-python-ordereddict-on-fedora.patch
Patch8: 0009-vdsm.spec-BuildRequires-python-pthreading.patch
-Patch9: 0010-Searching_for_both_py_and_pyc_file_to_start_super_vdsm.patch
-Patch10: 0011-adding_getHardwareInfo_API_to_vdsm.patch
+Patch9: 0010-Searching-for-both-py-and-pyc-file-to-start-super-vd.patch
+Patch10: 0011-adding-getHardwareInfo-API-to-vdsm.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
More information about the scm-commits
mailing list