Hello Piotr Kliczewski,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/65288
to review the following change.
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, 34 insertions(+), 22 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/65288/1
diff --git a/lib/api/vdsm-api.yml b/lib/api/vdsm-api.yml index 05d17c2..03bc50e 100644 --- a/lib/api/vdsm-api.yml +++ b/lib/api/vdsm-api.yml @@ -2108,36 +2108,39 @@ 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 - description: Total throughput limit in bytes per - second. + - defaultvalue: 0 + description: Total throughput limit in bytes per second. + Value 0 means unlimited. name: total_bytes_sec type: uint
- - defaultvalue: needs updating + - defaultvalue: 0 + description: Read throughput limit in bytes per second. + Value 0 means unlimited. + name: read_bytes_sec + type: uint + + - defaultvalue: 0 + description: Write throughput limit in bytes per second. + Value 0 means unlimited. + name: write_bytes_sec + type: uint + + - defaultvalue: 0 description: Total I/O operations limit per second. + Value 0 means unlimited. name: total_iops_sec type: uint
- - defaultvalue: needs updating + - defaultvalue: 0 + description: Read I/O operations limit per second. + Value 0 means unlimited. + name: read_iops_sec + type: uint + + - defaultvalue: 0 description: Write I/O operations limit per second. + Value 0 means unlimited. name: write_iops_sec type: uint type: object @@ -2830,6 +2833,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
LoggingLevel: &LoggingLevel diff --git a/lib/vdsm/jsonrpcvdscli.py b/lib/vdsm/jsonrpcvdscli.py index 1854869..c24a58c 100644 --- a/lib/vdsm/jsonrpcvdscli.py +++ b/lib/vdsm/jsonrpcvdscli.py @@ -87,6 +87,7 @@ 'hotplugNic': 'VM.hotplugNic', 'hotunplugDisk': 'VM.hotunplugDisk', 'hotunplugNic': 'VM.hotunplugNic', + 'hotplugMemory': 'VM.hotplugMemory', 'list': 'Host.getVMList', 'migrationCreate': 'VM.migrationCreate', 'ping': 'Host.ping', @@ -95,7 +96,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 192de42..5a10cda 100644 --- a/lib/vdsm/rpc/Bridge.py +++ b/lib/vdsm/rpc/Bridge.py @@ -350,6 +350,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'}, @@ -409,6 +410,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: Fix 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 merged to previous::OK, change not open on any previous branch
Piotr Kliczewski has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 1: Code-Review+1
gerrit-hooks has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 2:
* #1348255::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1348255::OK, public bug * Check Product::#1348255::OK, product: vdsm * Check TM::#1348255::ERROR, wrong target milestone for stable branch, ovirt-4.1.0-alpha should match ^.*4.0.* * Check merged to previous::OK, change not open on any previous branch
Andrej Krejcir has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 2: Verified+1
gerrit-hooks has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 3:
* Update Tracker::#1348255::OK, status: POST * Check Bug-Url::OK * Check Public Bug::#1348255::OK, public bug * Check Product::#1348255::OK, product: vdsm * Check merged to previous::OK, change not open on any previous branch
Francesco Romani has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 3:
the bug is targeted 4.1.0-alpha, do we need this in the stable branch?
Piotr Kliczewski has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 3:
It should be enough to have it on master.
Andrej Krejcir has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 3:
If the engine does not call the missing JSON RPC methods in 4.0, it should be ok to abandon it.
Andrej Krejcir has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 3:
It seems the methods are needed in 4.0 as well.
Francesco Romani has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 3:
fine for me, but for the stable branch we need a 4.0.z bug
Martin Sivák has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 3: Code-Review+1
Bug retargeted and acked.
Francesco Romani has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 3: Code-Review+2
AFAIK no more builds for oVirt 4.0.5 are planned, so backport to the branch ovirt-4.0.5 is *not* needed.
Francesco Romani 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 Reviewed-on: https://gerrit.ovirt.org/65288 Reviewed-by: Martin Sivák msivak@redhat.com Reviewed-by: Francesco Romani fromani@redhat.com --- M lib/api/vdsm-api.yml M lib/vdsm/jsonrpcvdscli.py M lib/vdsm/rpc/Bridge.py 3 files changed, 34 insertions(+), 22 deletions(-)
Approvals: Piotr Kliczewski: Looks good to me, but someone else must approve Martin Sivák: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Francesco Romani: Looks good to me, approved Andrej Krejcir: Verified
gerrit-hooks has posted comments on this change.
Change subject: Fix API schema to align with runtime schema ......................................................................
Patch Set 4:
* update_tracker: OK * Set MODIFIED::bug 1348255::::#1348255::SKIPPED, The branch 'ovirt-4.0.5' for the current target milestone 'ovirt-4.0.5' exists.
vdsm-patches@lists.fedorahosted.org
-
akrejcir＠redhat.com -
automation＠ovirt.org -
fromani＠redhat.com -
Martin Sivak -
Piotr Kliczewski