Andrej Krejcir has uploaded a new change for review.
Change subject: Correct API schema to align with runtime schema ......................................................................
Correct API schema to align with runtime schema
Change-Id: Ia1b5e90831fd0e4d9e897baaae4afb68f22e3877 Bug-Url: https://bugzilla.redhat.com/1348255 Signed-off-by: Andrej Krejcir akrejcir@redhat.com --- M lib/api/vdsm-api.yml M lib/vdsm/jsonrpcvdscli.py M lib/vdsm/rpc/Bridge.py 3 files changed, 33 insertions(+), 37 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/64477/1
diff --git a/lib/api/vdsm-api.yml b/lib/api/vdsm-api.yml index c7ab7f5..1f1d569 100644 --- a/lib/api/vdsm-api.yml +++ b/lib/api/vdsm-api.yml @@ -2120,35 +2120,35 @@ description: I/O tune parameters for the VM disk device. name: VmDiskDeviceIoTuneParams properties: - - defaultvalue: needs updating - description: Write throughput limit in bytes per - second. - name: write_bytes_sec - type: uint - - - defaultvalue: needs updating - description: Read I/O operations limit per second. - name: read_iops_sec - type: uint - - - defaultvalue: needs updating - description: Read throughput limit in bytes per - second. - name: read_bytes_sec - type: uint - - - defaultvalue: needs updating + - defaultvalue: 0 - means unlimited description: Total throughput limit in bytes per second. name: total_bytes_sec type: uint
- - defaultvalue: needs updating + - defaultvalue: 0 - means unlimited + description: Read throughput limit in bytes per + second. + name: read_bytes_sec + type: uint + + - defaultvalue: 0 - means unlimited + description: Write throughput limit in bytes per + second. + name: write_bytes_sec + type: uint + + - defaultvalue: 0 - means unlimited description: Total I/O operations limit per second. name: total_iops_sec type: uint
- - defaultvalue: needs updating + - defaultvalue: 0 - means unlimited + description: Read I/O operations limit per second. + name: read_iops_sec + type: uint + + - defaultvalue: 0 - means unlimited description: Write I/O operations limit per second. name: write_iops_sec type: uint @@ -2577,20 +2577,6 @@ type: *VmDeviceAddress type: object
- HotplugMemoryParams: &HotplugMemoryParams - added: '3.6' - description: Parameters for VM.hotplugMemory. - name: HotplugMemoryParams - properties: - - description: The UUID of the VM to modify - name: vmId - type: *UUID - - - description: The memory device specification - name: memory - type: *VmMemoryDevice - type: object - VmInterfaceDeviceSpecParams: &VmInterfaceDeviceSpecParams added: '3.1' description: Additional VM interface device parameters. @@ -2841,6 +2827,10 @@
- description: The amount of pages to scan during one cycle. name: pages_to_scan + type: int + + - description: + name: merge_across_nodes type: int type: object
@@ -9771,9 +9761,10 @@ name: vmID type: *UUID
- - description: The VM UUID and memory device information - name: params - type: *HotplugMemoryParams + - description: The memory device specification + name: memory + type: *VmMemoryDevice + return: description: The VM definition, as updated type: *VmDefinition diff --git a/lib/vdsm/jsonrpcvdscli.py b/lib/vdsm/jsonrpcvdscli.py index e276f86..c228e77 100644 --- a/lib/vdsm/jsonrpcvdscli.py +++ b/lib/vdsm/jsonrpcvdscli.py @@ -89,6 +89,7 @@ 'hotplugNic': 'VM.hotplugNic', 'hotunplugDisk': 'VM.hotunplugDisk', 'hotunplugNic': 'VM.hotunplugNic', + 'hotplugMemory': 'VM.hotplugMemory', 'list': 'Host.getVMList', 'migrate': 'VM.migrate', 'migrateStatus': 'VM.getMigrationStatus', @@ -99,7 +100,9 @@ 'setBalloonTarget': 'VM.setBalloonTarget', 'setCpuTunePeriod': 'VM.setCpuTunePeriod', 'setCpuTuneQuota': 'VM.setCpuTuneQuota', + 'setNumberOfCpus': 'VM.setNumberOfCpus', 'setKsmTune': 'Host.setKsmTune', + 'setHaMaintenanceMode': 'Host.setHaMaintenanceMode', 'setMOMPolicy': 'Host.setMOMPolicy', 'setSafeNetworkConfig': 'Host.setSafeNetworkConfig', 'setupNetworks': 'Host.setupNetworks', diff --git a/lib/vdsm/rpc/Bridge.py b/lib/vdsm/rpc/Bridge.py index 5dedcc0..ceed1f9 100644 --- a/lib/vdsm/rpc/Bridge.py +++ b/lib/vdsm/rpc/Bridge.py @@ -356,6 +356,7 @@ 'Host_getAllVmStats': {'ret': 'statsList'}, 'Host_setupNetworks': {'ret': 'status'}, 'Host_setKsmTune': {'ret': 'status'}, + 'Host_setHaMaintenanceMode': {'ret': 'status'}, 'Image_cloneStructure': {'ret': 'uuid'}, 'Image_delete': {'ret': 'uuid'}, 'Image_deleteVolumes': {'ret': 'uuid'}, @@ -415,6 +416,7 @@ 'VM_setIoTune': {'ret': 'status'}, 'VM_setBalloonTarget': {'ret': 'status'}, 'VM_updateDevice': {'ret': 'vmList'}, + 'VM_updateVmPolicy': {'ret': 'status'}, 'Volume_copy': {'ret': 'uuid'}, 'Volume_create': {'ret': 'uuid'}, 'Volume_delete': {'ret': 'uuid'},
gerrit-hooks has posted comments on this change.
Change subject: Correct API schema to align with runtime schema ......................................................................
Patch Set 1:
* update_tracker: OK * Check Bug-Url::OK * Check Public Bug::#1348255::OK, public bug * Check Product::#1348255::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])
gerrit-hooks has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 2:
* update_tracker: OK * Check Bug-Url::OK * Check Public Bug::#1348255::OK, public bug * Check Product::#1348255::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])
gerrit-hooks has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 3:
* update_tracker: OK * Check Bug-Url::OK * Check Public Bug::#1348255::OK, public bug * Check Product::#1348255::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])
gerrit-hooks has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 4:
* #1348255::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1348255::OK, public bug * Check Product::#1348255::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])
gerrit-hooks has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 5:
* #1348255::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1348255::OK, public bug * Check Product::#1348255::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])
gerrit-hooks has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 6:
* #1348255::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1348255::OK, public bug * Check Product::#1348255::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])
Piotr Kliczewski has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 6: Code-Review+2
Andrej Krejcir has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 6: Verified+1
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Fix API schema to align with runtime schema ......................................................................
Fix API schema to align with runtime schema
Change-Id: Ia1b5e90831fd0e4d9e897baaae4afb68f22e3877 Bug-Url: https://bugzilla.redhat.com/1348255 Signed-off-by: Andrej Krejcir akrejcir@redhat.com Reviewed-on: https://gerrit.ovirt.org/64477 Continuous-Integration: Jenkins CI Reviewed-by: Piotr Kliczewski piotr.kliczewski@gmail.com --- M lib/api/vdsm-api.yml M lib/vdsm/jsonrpcvdscli.py M lib/vdsm/rpc/Bridge.py 3 files changed, 29 insertions(+), 20 deletions(-)
Approvals: Piotr Kliczewski: Looks good to me, approved Jenkins CI: Passed CI tests Andrej Krejcir: Verified
gerrit-hooks has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 7:
* update_tracker: OK * Set MODIFIED::bug 1348255::::#1348255::IGNORE, skipping for branch 'master'
vdsm-patches@lists.fedorahosted.org
-
akrejcir＠redhat.com -
automation＠ovirt.org -
Dan Kenigsberg -
Piotr Kliczewski