Timothy Asir has uploaded a new change for review.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
gluster: fix vdsmapi gluster json schema error
Updates schema file for task info, task summary and fixes the schema error.
Change-Id: I29a011bd6434e0524f7a4cdefcfa599e8c90c74f Signed-off-by: Timothy Asir tjeyasin@redhat.com --- M vdsm/gluster/vdsmapi-gluster-schema.json 1 file changed, 75 insertions(+), 29 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/21755/1
diff --git a/vdsm/gluster/vdsmapi-gluster-schema.json b/vdsm/gluster/vdsmapi-gluster-schema.json index 604b40f..5016ccf 100644 --- a/vdsm/gluster/vdsmapi-gluster-schema.json +++ b/vdsm/gluster/vdsmapi-gluster-schema.json @@ -389,28 +389,15 @@ # # Task Summary. # -# @id: The @UUID of the task +# @hosts: Information about hosts. # -# @verb: Volume name is passed -# -# @filesScanned: Number of files scanned -# -# @filesMoved: Number of files moved -# -# @filesFailed: Number of files failed to move -# -# @filesSkipped: Number of files skipped -# -# @totalSizeMoved: Total size of the files moved -# -# @status: Rebalance/Remove brick status +# @summary: Summary of the operation. # # Since: 4.10.3 ## {'type': 'TaskSummary', - 'data': { - 'filesScanned': 'int', 'filesMoved': 'int', 'filesFailed': 'int', 'filesSkipped': 'int', - 'totalSizeMoved': 'int', 'status': 'str'}} + 'data': {'hosts': 'HostInfo', 'summary': 'Summary'}} + ## # @TaskInfo: # @@ -418,23 +405,21 @@ # # @id: The @UUID of the task # -# @verb: Volume name is passed +# @volume: Volume name # -# @state: Status of the task +# @status: Status of the task # -# @code: Type of task +# @type: Type of task # -# @message: Status message of the task +# @data: Task summary # -# @result: Not used. Empty string is passed -# -# @tag: String constant 'gluster' is passed +# @bricks: Volume Bricks # # Since: 4.10.3 ## {'type': 'TaskInfo', - 'data': {'volume': 'str', 'status': 'TaskStatus', 'type': 'TaskType', 'data': 'TaskSummary', 'bricks': ['str']}} - + 'data': {'id': 'UUID', 'volume': 'str', 'status': 'TaskStatus', + 'type': 'TaskType', 'data': 'TaskSummary', 'bricks': ['str']}} ## # @GlusterTask.list: # @@ -552,13 +537,21 @@ # # @volumeName: Gluster volume name # +# @bricklist: List of bricks +# +# @replicaCount: #optional Volume replica count +# +# @stripeCount: #optional Volume stripe count +# +# @transportList: #optional transport list +# # Returns: # uuid of the volume # # Since: 4.10.3 ## {'command': {'class': 'GlusterVolume', 'name': 'create'}, - 'data': {'volumeName': 'str', 'bricklist': ['str'], 'replicaCount': 'int', 'stripeCount': 'int', 'transportList': ['transType']}, + 'data': {'volumeName': 'str', 'bricklist': ['str'], '*replicaCount': 'int', '*stripeCount': 'int', '*transportList': ['transType']}, 'returns': 'UUID'}
## @@ -567,6 +560,8 @@ # Start Gluster volume # # @volumeName: Gluster volume name +# +# @force: Start volume forcefully # # Returns: # Success or failure @@ -583,6 +578,8 @@ # Stop Gluster volume # # @volumeName: Gluster volume name +# +# @force: Stop volume forcefully # # Returns: # Success or failure @@ -616,6 +613,10 @@ # # @volumeName: Gluster volume name # +# @option: Volume set option name +# +# @value: Value of the volume option +# # Returns: # Success or failure # @@ -631,6 +632,10 @@ # Reset Gluster volume options # # @volumeName: Gluster volume name +# +# @option: Volume option +# +# @force: Reset volume options forcefully # # Returns: # Success or failure @@ -648,13 +653,19 @@ # # @volumeName: Gluster volume name # +# @brickList: Bricks list +# +# @replicaCount: #optional Volume replica count +# +# @stripeCount: #optional Volume stripe count +# # Returns: # Success or failure # # Since: 4.10.3 ## {'command': {'class': 'GlusterVolume', 'name': 'addBrick'}, - 'data': {'volumeName': 'str', 'brickList': ['str'], 'replicaCount': 'int', 'stripeCount': 'int'}, + 'data': {'volumeName': 'str', 'brickList': ['str'], '*replicaCount': 'int', '*stripeCount': 'int'}, 'returns': 'bool'}
## @@ -663,6 +674,10 @@ # Start Gluster volume brick remove # # @volumeName: Gluster volume name +# +# @brickList: List of bricks +# +# @replicaCount: Volume replica count # # Returns: # Task id of the operation @@ -703,6 +718,10 @@ # Stop Gluster volume brick remove # # @volumeName: Gluster volume name +# +# @brickList: List of bricks +# +# @replicaCount: Volume replica count # # Returns: # Status information of remove brick operation @@ -784,6 +803,10 @@ # # @volumeName: Gluster volume name # +# @brickList: List of bricks +# +# @replicaCount: Volume replica count +# # Returns: # Status information of remove brick operation # @@ -800,6 +823,10 @@ # # @volumeName: Gluster volume name # +# @brickList: List of bricks +# +# @replicaCount: Volume replica count +# # Returns: # Success or failure # @@ -815,6 +842,10 @@ # Force remove Gluster volume brick # # @volumeName: Gluster volume name +# +# @brickList: List of bricks +# +# @replicaCount: Volume replica count # # Returns: # Success or failure @@ -864,6 +895,10 @@ # # @volumeName: Gluster volume name # +# @rebalanceType: Rebalance type +# +# @force: Start rebalance forcefully +# # Returns: # Task id of the operation # @@ -879,6 +914,8 @@ # Stop Gluster volume rebalance # # @volumeName: Gluster volume name +# +# @force: Stop rebalance forcefully # # Returns: # Gluster volume rebalance status @@ -910,6 +947,8 @@ # # Add Gluster Host # +# @hostName: Host name +# # Returns: # Success or Failure # @@ -924,6 +963,10 @@ # # Remove Gluster Host # +# @hostName: host name +# +# @force: forcefull removal +# # Returns: # Success or failure # @@ -933,12 +976,15 @@ 'data': {'hostName': 'str', 'force': 'bool'}, 'returns': 'bool'}
- ## # @GlusterHost.removeByUuid: # # Remove Gluster Host by uuid # +# @hostUuid: host uuid +# +# @force: remove host forcefully +# # Returns: # Success or failure #
Timothy Asir has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 1: Verified+1
oVirt Jenkins CI Server has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 1: Verified-1
Build Failed
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4906/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5706/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5795/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 1: -Verified
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4911/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5711/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5800/ : SUCCESS
Bala.FA has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 1: Code-Review+1
Dan Kenigsberg has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 1: Code-Review+2
Escalating Bala's score.
Dan Kenigsberg has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 1: Code-Review-1
requires rebase
oVirt Jenkins CI Server has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 2: Verified-1
Build Failed
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6037/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/6825/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/6931/ : SUCCESS
Timothy Asir has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 2: Verified+1
Rebased and verified.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 2: -Verified
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6042/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/6829/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/6935/ : SUCCESS
Dan Kenigsberg has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 2: Code-Review+2
Dan Kenigsberg has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 2: Code-Review-1
I'm so sorry, but it has happened again... rebase required.
Timothy Asir has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 2:
No prob, i will rebase again.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 3:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6072/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/6859/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/6965/ : SUCCESS
Timothy Asir has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 3: Verified+1
Dan Kenigsberg has posted comments on this change.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
Patch Set 3: Code-Review+2
Dan Kenigsberg has submitted this change and it was merged.
Change subject: gluster: fix vdsmapi gluster json schema error ......................................................................
gluster: fix vdsmapi gluster json schema error
Updates schema file for task info, task summary and fixes the schema error.
Change-Id: I29a011bd6434e0524f7a4cdefcfa599e8c90c74f Signed-off-by: Timothy Asir tjeyasin@redhat.com Reviewed-on: http://gerrit.ovirt.org/21755 Reviewed-by: Dan Kenigsberg danken@redhat.com --- M vdsm/gluster/vdsmapi-gluster-schema.json 1 file changed, 77 insertions(+), 27 deletions(-)
Approvals: Timothy Asir: Verified Dan Kenigsberg: Looks good to me, approved
vdsm-patches@lists.fedorahosted.org