Change in vdsm[master]: Probe cpu count from new libvirt capabilities.
by apahim@redhat.com
Amador Pahim has posted comments on this change.
Change subject: Probe cpu count from new libvirt capabilities.
......................................................................
Patch Set 1: (6 inline comments)
....................................................
Commit Message
Line 62: - cpuSockets: Count the number of distinct "socket_id".
Line 63:
Line 64: [1] - http://libvirt.org/git/?p=libvirt.git;a=commit;h=79a003f9b0042ef4d2cf
Line 65: [2] - https://www.redhat.com/archives/libvir-list/2013-January/msg01140.html
Line 66:
There isn't a public one.
Line 67: Change-Id: I0e4a08cfcde6fb2e1ce4cf10478af72217c20ba5
....................................................
File tests/caps_libvirt.out
Line 84: <cpu id='28' socket_id='1' core_id='4' siblings='28-29'/>
Line 85: <cpu id='29' socket_id='1' core_id='5' siblings='28-29'/>
Line 86: <cpu id='30' socket_id='1' core_id='6' siblings='30-31'/>
Line 87: <cpu id='31' socket_id='1' core_id='7' siblings='30-31'/>
Line 88: </cpus>
Ok. I agree.
Line 89: </cell>
Line 90: </cells>
Line 91: </topology>
Line 92: <secmodel>
....................................................
File tests/capsTests.py
Line 56: pfthreshold""".split()))
Line 57:
Line 58: self.assertEqual(c.mhz(), '1400.000')
Line 59: self.assertEqual(c.model(),
Line 60: 'AMD Opteron(TM) Processor 6274')
To match cpuinfo with capabilities. When I introduced testCpuTopology(), reviewers asked for capabilities from the same cpuinfo server. But no problem to keep old cpuinfo. Done.
Line 61:
Line 62: def testCpuTopology(self):
Line 63: testPath = os.path.realpath(__file__)
Line 64: dirName = os.path.split(testPath)[0]
....................................................
File vdsm/caps.py
Line 115: siblingsList = []
Line 116: for line in cells.getElementsByTagName('cpu'):
Line 117: socket_id = line.getAttribute('socket_id')
Line 118: siblings = line.getAttribute('siblings')
Line 119: socketList.extend(socket_id)
Done
Line 120: siblingsList.extend([siblings])
Line 121:
Line 122: topology = {'sockets': len(set(socketList)),
Line 123: 'cores': len(set(siblingsList)),
Line 116: for line in cells.getElementsByTagName('cpu'):
Line 117: socket_id = line.getAttribute('socket_id')
Line 118: siblings = line.getAttribute('siblings')
Line 119: socketList.extend(socket_id)
Line 120: siblingsList.extend([siblings])
Done
Line 121:
Line 122: topology = {'sockets': len(set(socketList)),
Line 123: 'cores': len(set(siblingsList)),
Line 124: 'threads': cpus}
....................................................
File vdsm.spec.in
Line 120: Requires: qemu-kvm >= 2:0.15.0-4
Line 121: Requires: qemu-img >= 2:0.15.0-4
Line 122: # libvirt with detailed capabilities cpu data (rhbz 888503)
Line 123: # needed by vdsm to probe sockets/cores/threads information.
Line 124: Requires: libvirt >= 1.0.2-1
Indeed. Available in virt-preview only for F18.
Line 125: Requires: iscsi-initiator-utils >= 6.2.0.872-14
Line 126: Requires: device-mapper-multipath >= 0.4.9-18
Line 127: Requires: e2fsprogs >= 1.41.14
Line 128: Requires: kernel >= 3.6
--
To view, visit http://gerrit.ovirt.org/11709
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0e4a08cfcde6fb2e1ce4cf10478af72217c20ba5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Amador Pahim <apahim(a)redhat.com>
Gerrit-Reviewer: Amador Pahim <apahim(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 4 months
Change in vdsm[master]: Requires policycoreutils-2.1.13-55 to avoid another break on...
by wudxw@linux.vnet.ibm.com
Mark Wu has uploaded a new change for review.
Change subject: Requires policycoreutils-2.1.13-55 to avoid another break on selinux disabled.
......................................................................
Requires policycoreutils-2.1.13-55 to avoid another break on selinux disabled.
When selinux is disabled on f18, it fails to import module sepolicy
with an exception. It causes the the vdsm-tool unavailable, and therefore
the bonding module can't be loaded when vdsm starts up. For details,
please see https://bugzilla.redhat.com/show_bug.cgi?id=889698
Change-Id: I09387167ceeffdc104910103b8381954296cdbe9
Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com>
---
M vdsm.spec.in
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/30/11730/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 7cccfd4..73332f3 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -133,9 +133,9 @@
%if 0%{?fedora} >= 18
Requires: selinux-policy-targeted >= 3.11.1-71
-# In order to avoid a policycoreutils bug (rhbz 883355) when selinux is
-# disabled we now require the version 2.1.13-44 (or newer) of Fedora.
-Requires: policycoreutils >= 2.1.13-44
+# In order to avoid a policycoreutils bug (rhbz 889698) when selinux is
+# disabled we now require the version 2.1.13-55 (or newer) of Fedora.
+Requires: policycoreutils >= 2.1.13-55
Requires: systemd >= 197-1.fc18.2
%endif
--
To view, visit http://gerrit.ovirt.org/11730
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I09387167ceeffdc104910103b8381954296cdbe9
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
11 years, 4 months
Change in vdsm[master]: split restore-net-conf away of vdsmd.init service
by Dan Kenigsberg
Dan Kenigsberg has uploaded a new change for review.
Change subject: split restore-net-conf away of vdsmd.init service
......................................................................
split restore-net-conf away of vdsmd.init service
There is no need to revert network configuration when vdsmd is
restarted, only when the host is rebooted after being fenced.
This becomes painfully visisble if vdsm is restarted due to spm
failover, and while at it - rolls back an unrelated network
configuration.
Change-Id: Iabe00320d090b9055c3d619260ed57ee953702f1
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M .gitignore
M vdsm.spec.in
M vdsm/Makefile.am
A vdsm/vdsm-restore-net-config.init.in
A vdsm/vdsm-restore-net-config.service
M vdsm/vdsmd.init.in
6 files changed, 86 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/34/10334/1
diff --git a/.gitignore b/.gitignore
index d36ed82..08b17c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@
vdsm/vdsm.rwtab
vdsm/vdsmd.8
vdsm/vdsmd.init
+vdsm/vdsm-restore-net-config.init
vdsm_api/vdsm-api.html
vdsm-tool/load_needed_modules.py
vdsm-tool/validate_ovirt_certs.py
diff --git a/vdsm.spec.in b/vdsm.spec.in
index b942b7a..cd11b90 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -446,6 +446,8 @@
# Install the SysV init scripts
install -Dm 0755 vdsm/vdsmd.init %{buildroot}%{_initrddir}/vdsmd
install -Dm 0755 vdsm_reg/vdsm-reg.init %{buildroot}%{_initrddir}/vdsm-reg
+install -Dm 0755 vdsm/vdsm-restore-net-config.init \
+ %{buildroot}%{_initrddir}/vdsm-restore-net-config
# This is not commonplace, but we want /var/log/core to be a world-writable
# dropbox for core dumps
@@ -458,6 +460,8 @@
# Install the systemd scripts
install -Dm 0755 vdsm/vdsmd.init %{buildroot}/lib/systemd/systemd-vdsmd
install -Dm 0644 vdsm/vdsmd.service %{buildroot}%{_unitdir}/vdsmd.service
+install -Dm 0644 vdsm/vdsm-restore-net-config.service \
+ %{buildroot}%{_unitdir}/vdsm-restore-net-config.service
install -Dm 0755 vdsm_reg/vdsm-reg.init \
%{buildroot}/lib/systemd/systemd-vdsm-reg
install -Dm 0644 vdsm_reg/vdsm-reg.service \
@@ -507,10 +511,12 @@
%if 0%{?rhel}
if [ "$1" -eq 1 ] ; then
/sbin/chkconfig --add vdsmd
+ /sbin/chkconfig --add vdsm-resotre-net-config
fi
%else
if [ "$1" -eq 1 ] ; then
/bin/systemctl enable vdsmd.service >/dev/null 2>&1 || :
+ /bin/systemctl enable vdsm-restore-net-config.service >/dev/null 2>&1 || :
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
exit 0
@@ -522,6 +528,7 @@
then
/sbin/service vdsmd stop > /dev/null 2>&1 || :
/sbin/chkconfig --del vdsmd
+ /sbin/chkconfig --del vdsm-resotre-net-config
/bin/sed -i '/# by vdsm$/d' \
/etc/libvirt/libvirtd.conf \
@@ -547,6 +554,7 @@
%else
if [ "$1" -eq 0 ]; then
/bin/systemctl --no-reload disable vdsmd.service > /dev/null 2>&1 || :
+ /bin/systemctl --no-reload disable vdsm-restore-net-config.service > /dev/null 2>&1 || :
/bin/systemctl stop vdsmd.service > /dev/null 2>&1 || :
fi
exit 0
@@ -610,9 +618,11 @@
%doc COPYING README vdsm/vdsm.conf.sample vdsm_api/vdsm-api.html
%if 0%{?rhel}
%{_initrddir}/vdsmd
+%{_initrddir}/vdsm-restore-net-config
%else
/lib/systemd/systemd-vdsmd
%{_unitdir}/vdsmd.service
+%{_unitdir}/vdsm-restore-net-config.service
%endif
%dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@
%ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@/hsm-tasks
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index dc0590e..7ac5dc1 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -88,9 +88,11 @@
mom.conf \
sudoers.vdsm \
vdsm-logrotate.conf \
+ vdsm-restore-net-config.init \
vdsm.conf.sample \
vdsm.rwtab \
- vdsmd.init
+ vdsmd.init \
+ $(NULL)
dist_vdsm_SCRIPTS = \
addNetwork \
@@ -136,6 +138,8 @@
vdsm-libvirt-logrotate \
vdsm-logrotate \
vdsm-logrotate.conf.in \
+ vdsm-restore-net-config.init.in \
+ vdsm-restore-net-config.service \
vdsm.rwtab.in \
vdsm-store-net-config.in \
vdsm-sysctl.conf
diff --git a/vdsm/vdsm-restore-net-config.init.in b/vdsm/vdsm-restore-net-config.init.in
new file mode 100644
index 0000000..83a437a
--- /dev/null
+++ b/vdsm/vdsm-restore-net-config.init.in
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# vdsm-restore-net-config: restore network interface configuration
+#
+# chkconfig: 2345 98 01
+# description: roll back the host network configuration to the last \
+# known-good one.
+
+### BEGIN INIT INFO
+# Provides: vdsm-restore-net-config
+# Required-Start: $network
+# Short-Description: restore network configuration files
+# Description: roll back the host network configuration to the last \
+# known-good one.
+#
+### END INIT INFO
+
+sysconfdir="/etc"
+
+# Source function library.
+test ! -r "$sysconfdir"/rc.d/init.d/functions ||
+ . "$sysconfdir"/rc.d/init.d/functions
+
+# usage [val]
+# Display usage string, then exit with VAL (defaults to 2).
+usage() {
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ exit ${1-2}
+}
+
+retval=0
+case "$1" in
+ # commands required in all Fedora initscripts
+ start|restart|reload|force-reload|condrestart|try-restart)
+ echo -n $"Running $prog $1: "
+ @VDSMDIR@/vdsm-restore-net-config
+ retval=$?
+ echo
+ ;;
+ stop|status)
+ snapshotdir=`python -c 'from vdsm.netinfo import NET_LOGICALNET_CONF_BACK_DIR as d;print d'`
+ if test -d "$snapshotdir"
+ then
+ echo $"There are uncommitted network configuration changes"
+ else
+ echo $"No pending network configuration changes"
+ fi
+ ;;
+
+ --help)
+ usage 0
+ ;;
+ *)
+ usage
+ ;;
+esac
+
+exit $retval
diff --git a/vdsm/vdsm-restore-net-config.service b/vdsm/vdsm-restore-net-config.service
new file mode 100644
index 0000000..a43da99
--- /dev/null
+++ b/vdsm/vdsm-restore-net-config.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Restore failed Vdsm network configuration on boot
+Requires=libvirtd.service
+Before=vdsmd.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/share/vdsm/vdsm-restore-net-config
+
+[Install]
+WantedBy=multi-user.target
diff --git a/vdsm/vdsmd.init.in b/vdsm/vdsmd.init.in
index c8223d3..873b585 100755
--- a/vdsm/vdsmd.init.in
+++ b/vdsm/vdsmd.init.in
@@ -475,7 +475,6 @@
return $ret_val
fi
- @VDSMDIR@/vdsm-restore-net-config
/usr/bin/vdsm-tool load-needed-modules
mk_data_center
mk_core_path
--
To view, visit http://gerrit.ovirt.org/10334
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabe00320d090b9055c3d619260ed57ee953702f1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
11 years, 4 months
Change in vdsm[master]: Probe cpu count from new libvirt capabilities.
by wudxw@linux.vnet.ibm.com
Mark Wu has posted comments on this change.
Change subject: Probe cpu count from new libvirt capabilities.
......................................................................
Patch Set 1: I would prefer that you didn't submit this
(6 inline comments)
....................................................
Commit Message
Line 62: - cpuSockets: Count the number of distinct "socket_id".
Line 63:
Line 64: [1] - http://libvirt.org/git/?p=libvirt.git;a=commit;h=79a003f9b0042ef4d2cf
Line 65: [2] - https://www.redhat.com/archives/libvir-list/2013-January/msg01140.html
Line 66:
missed the bug link?
Line 67: Change-Id: I0e4a08cfcde6fb2e1ce4cf10478af72217c20ba5
....................................................
File tests/caps_libvirt.out
Line 84: <cpu id='28' socket_id='1' core_id='4' siblings='28-29'/>
Line 85: <cpu id='29' socket_id='1' core_id='5' siblings='28-29'/>
Line 86: <cpu id='30' socket_id='1' core_id='6' siblings='30-31'/>
Line 87: <cpu id='31' socket_id='1' core_id='7' siblings='30-31'/>
Line 88: </cpus>
I suggest you include different cases as what the XML in commit message covers:
normal HT, this special AMD cpu and the mulitcore without HT. It doesn't make senses for real world, but good for test. Actually, I even think you needn't update the other sections in this test data. I know this cpu topology never happens on intel cpu, but it's ok for test.
Line 89: </cell>
Line 90: </cells>
Line 91: </topology>
Line 92: <secmodel>
....................................................
File tests/capsTests.py
Line 56: pfthreshold""".split()))
Line 57:
Line 58: self.assertEqual(c.mhz(), '1400.000')
Line 59: self.assertEqual(c.model(),
Line 60: 'AMD Opteron(TM) Processor 6274')
I don't understand why you also change the cpuinfo test.
Line 61:
Line 62: def testCpuTopology(self):
Line 63: testPath = os.path.realpath(__file__)
Line 64: dirName = os.path.split(testPath)[0]
....................................................
File vdsm/caps.py
Line 115: siblingsList = []
Line 116: for line in cells.getElementsByTagName('cpu'):
Line 117: socket_id = line.getAttribute('socket_id')
Line 118: siblings = line.getAttribute('siblings')
Line 119: socketList.extend(socket_id)
it will cause problem when socket_id grows into two bits. Why not just using
socketList.append(socket_id)
Line 120: siblingsList.extend([siblings])
Line 121:
Line 122: topology = {'sockets': len(set(socketList)),
Line 123: 'cores': len(set(siblingsList)),
Line 116: for line in cells.getElementsByTagName('cpu'):
Line 117: socket_id = line.getAttribute('socket_id')
Line 118: siblings = line.getAttribute('siblings')
Line 119: socketList.extend(socket_id)
Line 120: siblingsList.extend([siblings])
change to apend too?
Line 121:
Line 122: topology = {'sockets': len(set(socketList)),
Line 123: 'cores': len(set(siblingsList)),
Line 124: 'threads': cpus}
....................................................
File vdsm.spec.in
Line 120: Requires: qemu-kvm >= 2:0.15.0-4
Line 121: Requires: qemu-img >= 2:0.15.0-4
Line 122: # libvirt with detailed capabilities cpu data (rhbz 888503)
Line 123: # needed by vdsm to probe sockets/cores/threads information.
Line 124: Requires: libvirt >= 1.0.2-1
it seems not available in virt-preview. so we need wait util it's available.
Line 125: Requires: iscsi-initiator-utils >= 6.2.0.872-14
Line 126: Requires: device-mapper-multipath >= 0.4.9-18
Line 127: Requires: e2fsprogs >= 1.41.14
Line 128: Requires: kernel >= 3.6
--
To view, visit http://gerrit.ovirt.org/11709
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0e4a08cfcde6fb2e1ce4cf10478af72217c20ba5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Amador Pahim <apahim(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 4 months
Change in vdsm[master]: schema: Update VmDefinition to match current behavior
by agl@us.ibm.com
Adam Litke has uploaded a new change for review.
Change subject: schema: Update VmDefinition to match current behavior
......................................................................
schema: Update VmDefinition to match current behavior
The schema for VmDefinition was incorrect in that it had some fields marked as
mandatory even though they may be omitted. Also, exitCode and exitMessage were
not included in the original definition.
Signed-off-by: Adam Litke <agl(a)us.ibm.com>
Change-Id: I82e3b4e2073245fa837eb0333dfe1c90c7e4cfe8
---
M vdsm_api/vdsmapi-schema.json
1 file changed, 18 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/12/11712/1
diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
index b4eb825..83e8476 100644
--- a/vdsm_api/vdsmapi-schema.json
+++ b/vdsm_api/vdsmapi-schema.json
@@ -2481,14 +2481,14 @@
#
# @clientIp: The IP address of the client connected to the display
#
-# @cpuType: The type of CPU being emulated
+# @cpuType: #optional The type of CPU being emulated
# special values 'hostPassthrough' and 'hostModel'
# are reserved for host-passthrough and host-mode cpu
# mode
#
-# @custom: A dictionary of custom, free-form properties
+# @custom: #optional A dictionary of custom, free-form properties
#
-# @devices: An array of VM devices present
+# @devices: #optional An array of VM devices present
#
# @display: The type of display
#
@@ -2498,9 +2498,9 @@
#
# @displaySecurePort: The port in use for encrypted display data
#
-# @emulatedMachine: The specific machine specification being emulated
+# @emulatedMachine: #optional The machine specification being emulated
#
-# @keyboardLayout: The keyboard layout string (eg. 'en-us')
+# @keyboardLayout: #optional The keyboard layout string (eg. 'en-us')
#
# @kvmEnable: Indicates if KVM hardware acceleration is enabled
#
@@ -2510,7 +2510,7 @@
#
# @nice: The host scheduling priority
#
-# @pauseCode: Indicates the reason a VM has been paused
+# @pauseCode: #optional Indicates the reason a VM has been paused
#
# @pid: The process ID of the underlying qemu process
#
@@ -2533,20 +2533,26 @@
#
# @vmType: The type of VM
#
+# @exitCode: #optional The exit code f the VM process has ended
+#
+# @exitMessage: #optional Explains the reason that the VM process has
+# exited
+#
# Since: 4.10.0
##
{'type': 'VmDefinition',
- 'data': {'acpiEnable': 'bool', 'clientIp': 'str', 'cpuType': 'str',
- 'custom': 'StringMap', 'devices': ['VmDevice'],
+ 'data': {'acpiEnable': 'bool', 'clientIp': 'str', '*cpuType': 'str',
+ '*custom': 'StringMap', '*devices': ['VmDevice'],
'display': 'VmDisplayType', 'displayIp': 'str',
- 'displayPort': 'uint', 'displaySecurePort': 'uint',
- 'emulatedMachine': 'str', 'keyboardLayout': 'str',
+ 'displayPort': 'int', 'displaySecurePort': 'int',
+ '*emulatedMachine': 'str', '*keyboardLayout': 'str',
'kvmEnable': 'bool', 'memSize': 'uint',
- 'nicModel': 'str', 'nice': 'int', 'pauseCode': 'str',
+ 'nicModel': 'str', 'nice': 'int', '*pauseCode': 'str',
'pid': 'uint', 'smp': 'uint', '*smpCoresPerSocket': 'uint',
'*smpThreadsPerCore': 'uint', 'status': 'VmStatus',
'timeOffset': 'uint', 'transparentHugePages': 'bool',
- 'vmId': 'UUID', 'vmName': 'str', 'vmType': 'VmType'}}
+ 'vmId': 'UUID', 'vmName': 'str', 'vmType': 'VmType',
+ '*exitCode': 'int', '*exitMessage': 'str'}}
##
# @VmParameters:
--
To view, visit http://gerrit.ovirt.org/11712
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82e3b4e2073245fa837eb0333dfe1c90c7e4cfe8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>
11 years, 4 months
Change in vdsm[master]: schema: Eliminate 'class' from StorageDomainInfo
by agl@us.ibm.com
Adam Litke has uploaded a new change for review.
Change subject: schema: Eliminate 'class' from StorageDomainInfo
......................................................................
schema: Eliminate 'class' from StorageDomainInfo
'class' is usually a reserved word and makes a bad name for a type field.
Change it to domainClass and add the required type fixup to the Bridge.
Change-Id: I7d13d4c6141e42c996b50a86d4b812c8c42f831f
Signed-off-by: Adam Litke <agl(a)us.ibm.com>
---
M vdsm_api/Bridge.py
M vdsm_api/vdsmapi-schema.json
2 files changed, 12 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/11/11711/1
diff --git a/vdsm_api/Bridge.py b/vdsm_api/Bridge.py
index 49b1558..8fade0f 100644
--- a/vdsm_api/Bridge.py
+++ b/vdsm_api/Bridge.py
@@ -371,4 +371,5 @@
'IscsiCredentials': partial(fieldClone, 'type', 'authType'),
'ConnectionRefArgs': partial(fieldClone, 'type', 'connType'),
'VolumeInfo': partial(fieldClone, 'type', 'allocType'),
+ 'StorageDomainInfo': partial(fieldClone, 'class', 'domainClass'),
}
diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
index b4eb825..a83a799 100644
--- a/vdsm_api/vdsmapi-schema.json
+++ b/vdsm_api/vdsmapi-schema.json
@@ -3543,31 +3543,31 @@
#
# Information about a Storage Domain.
#
-# @uuid: The Storage Domain UUID
+# @uuid: The Storage Domain UUID
#
-# @domainType: The type of backing storage used by this domain
+# @domainType: The type of backing storage used by this domain
#
-# @class: The Storage Domain class
+# @domainClass: The Storage Domain class
#
-# @name: The human-readable name for this Storage Domain
+# @name: The human-readable name for this Storage Domain
#
-# @role: The Storage Domain role
+# @role: The Storage Domain role
#
-# @pool: The Storage Pool associated with this Storage Domain
+# @pool: The Storage Pool associated with this Storage Domain
#
-# @version: The version of this Storage Domain
+# @version: The version of this Storage Domain
#
-# @lver: The lock version of the associated Storage Pool
+# @lver: The lock version of the associated Storage Pool
#
-# @spm_id: Contains the Host ID of the Storage Pool Manager
+# @spm_id: Contains the Host ID of the Storage Pool Manager
#
-# @master_ver: The version of the master Storage Domain
+# @master_ver: The version of the master Storage Domain
#
# Since: 4.10.0
##
{'type': 'StorageDomainInfo',
'data': {'uuid': 'UUID', 'domainType': 'StorageDomainType',
- 'class': 'StorageDomainImageClass', 'name': 'str',
+ 'domainClass': 'StorageDomainImageClass', 'name': 'str',
'role': 'StorageDomainRole', 'pool': ['UUID'], 'version': 'int',
'lver': 'int', 'spm_id': 'int', 'master_ver': 'int'}}
--
To view, visit http://gerrit.ovirt.org/11711
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d13d4c6141e42c996b50a86d4b812c8c42f831f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>
11 years, 4 months