ShaoHe Feng has uploaded a new change for review.
Change subject: fix the optional parameters error of api schema file ......................................................................
fix the optional parameters error of api schema file
some discrptions of optional parameters miss #optional some definitions of optional parameters miss *
Change-Id: Ia596c38bcb46aa0798ac2147376e9132be292750 Signed-off-by: ShaoHe Feng shaohef@linux.vnet.ibm.com --- M vdsm_api/vdsmapi-schema.json 1 file changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/10447/1
diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 8837409..cfde542 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -294,9 +294,9 @@ # # @action: The type of fencing operation to perform (from @FenceNodeAction) # -# @secure: Enable SSL communication +# @secure: #optional Enable SSL communication # -# @options: Additional agent-specific parameters in space-separated +# @options: #optional Additional agent-specific parameters in space-separated # <var>=<val> pairs # # Returns: @@ -2429,7 +2429,7 @@ # 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 # @@ -2480,7 +2480,7 @@ ## {'type': 'VmDefinition', 'data': {'acpiEnable': 'bool', 'clientIp': 'str', 'cpuType': 'str', - 'custom': 'StringMap', 'devices': ['VmDevice'], + '*custom': 'StringMap', 'devices': ['VmDevice'], 'display': 'VmDisplayType', 'displayIp': 'str', 'displayPort': 'uint', 'displaySecurePort': 'uint', 'emulatedMachine': 'str', 'keyboardLayout': 'str', @@ -2498,7 +2498,7 @@ # # @acpiEnable: Indicates if ACPI is enabled inside the VM # -# @custom: #opional A dictionary of custom, free-form properties +# @custom: #optional A dictionary of custom, free-form properties # # @devices: #optional An array of VM devices requested # @@ -2982,9 +2982,9 @@ # # @volumeList: A list of Volume UUIDs # -# @postZero: If True, overwrite Volume data with zeroes after deletion +# @postZero: #optional If True, overwrite Volume data with zeroes after deletion # -# @force: Force the operation and do not perform any validation +# @force: #optional Force the operation and do not perform any validation # # Returns: # A task UUID @@ -4261,9 +4261,9 @@ # # @enableScsiFencing: This parameter is not used # -# @maxHostID: The maximum number of hosts that could be in the cluster +# @maxHostID: #optional The maximum number of hosts that could be in the cluster # -# @domVersion: The expected Storage Domain version of the master domain +# @domVersion: #optional The expected Storage Domain version of the master domain # # Returns: # A task UUID @@ -5313,10 +5313,10 @@ # # @dstparams: Used only by the hibernate API. Ignored for @remote migration # -# @mode: The migration mode. Callers of this API should use @remote. For +# @mode: #optional The migration mode. Callers of this API should use @remote. For # @file migration use @VM.hibernate. # -# @method: +# @method: #optional # # Since: 4.10.0 ## @@ -5499,7 +5499,7 @@ # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'shutdown'}, - 'data': {'vmID': 'UUID', 'delay': 'int', 'message': 'str'}} + 'data': {'vmID': 'UUID', '*delay': 'int', '*message': 'str'}}
## # @SnapshotVolumeDriveInfo:
-- To view, visit http://gerrit.ovirt.org/10447 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: Ia596c38bcb46aa0798ac2147376e9132be292750 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com
oVirt Jenkins CI Server has posted comments on this change.
Change subject: fix the optional parameters error of api schema file ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/494/ (2/2)
-- To view, visit http://gerrit.ovirt.org/10447 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia596c38bcb46aa0798ac2147376e9132be292750 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: fix the optional parameters error of api schema file ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/529/ (1/2)
-- To view, visit http://gerrit.ovirt.org/10447 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia596c38bcb46aa0798ac2147376e9132be292750 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: fix the optional parameters error of api schema file ......................................................................
Patch Set 1:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/494/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/529/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/10447 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia596c38bcb46aa0798ac2147376e9132be292750 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: fix the optional parameters error of api schema file ......................................................................
Patch Set 2:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/531/ (2/2)
-- To view, visit http://gerrit.ovirt.org/10447 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia596c38bcb46aa0798ac2147376e9132be292750 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: fix the optional parameters error of api schema file ......................................................................
Patch Set 2:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/496/ (1/2)
-- To view, visit http://gerrit.ovirt.org/10447 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia596c38bcb46aa0798ac2147376e9132be292750 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: fix the optional parameters error of api schema file ......................................................................
Patch Set 2:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/496/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/531/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/10447 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia596c38bcb46aa0798ac2147376e9132be292750 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
ShaoHe Feng has posted comments on this change.
Change subject: fix the optional parameters error of api schema file ......................................................................
Patch Set 2: (2 inline comments)
Adam, can you check the comments in the patch?
.................................................... File vdsm_api/vdsmapi-schema.json Line 2427: # @cpuType: The type of CPU being emulated Line 2428: # special values 'hostPassthrough' and 'hostModel' Line 2429: # are reserved for host-passthrough and host-mode cpu Line 2430: # mode Line 2431: # here, custom is not an optional parameter.
I'm not sure whether it should be optional. VS 2501 line. custom of VmParameters is optional.
Adam can you check it? Line 2432: # @custom: A dictionary of custom, free-form properties Line 2433: # Line 2434: # @devices: An array of VM devices present Line 2435: #
Line 2497: # Parameters for creating a new virtual machine Line 2498: # Line 2499: # @acpiEnable: Indicates if ACPI is enabled inside the VM Line 2500: # Line 2501: # @custom: #optional A dictionary of custom, free-form properties here, custom is an optional parameter. Line 2502: # Line 2503: # @devices: #optional An array of VM devices requested Line 2504: # Line 2505: # @display: The type of display
-- To view, visit http://gerrit.ovirt.org/10447 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia596c38bcb46aa0798ac2147376e9132be292750 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Adam Litke agl@us.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Zhou Zheng Sheng zhshzhou@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has posted comments on this change.
Change subject: fix the optional parameters error of api schema file ......................................................................
Patch Set 2: Looks good to me, approved
(1 inline comment)
the bigger question is why do we need the duplicate information - both #optional and *name?
.................................................... File vdsm_api/vdsmapi-schema.json Line 2427: # @cpuType: The type of CPU being emulated Line 2428: # special values 'hostPassthrough' and 'hostModel' Line 2429: # are reserved for host-passthrough and host-mode cpu Line 2430: # mode Line 2431: # custom properties dictionary is optional. (no dict is equvalent to the empty dict) Line 2432: # @custom: A dictionary of custom, free-form properties Line 2433: # Line 2434: # @devices: An array of VM devices present Line 2435: #
-- To view, visit http://gerrit.ovirt.org/10447 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia596c38bcb46aa0798ac2147376e9132be292750 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Adam Litke agl@us.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Zhou Zheng Sheng zhshzhou@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
ShaoHe Feng has posted comments on this change.
Change subject: fix the optional parameters error of api schema file ......................................................................
Patch Set 2: Verified
-- To view, visit http://gerrit.ovirt.org/10447 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia596c38bcb46aa0798ac2147376e9132be292750 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Adam Litke agl@us.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Zhou Zheng Sheng zhshzhou@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has submitted this change and it was merged.
Change subject: fix the optional parameters error of api schema file ......................................................................
fix the optional parameters error of api schema file
some discrptions of optional parameters miss #optional some definitions of optional parameters miss *
Change-Id: Ia596c38bcb46aa0798ac2147376e9132be292750 Signed-off-by: ShaoHe Feng shaohef@linux.vnet.ibm.com --- M vdsm_api/vdsmapi-schema.json 1 file changed, 10 insertions(+), 10 deletions(-)
Approvals: ShaoHe Feng: Verified Dan Kenigsberg: Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/10447 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged Gerrit-Change-Id: Ia596c38bcb46aa0798ac2147376e9132be292750 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Adam Litke agl@us.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Zhou Zheng Sheng zhshzhou@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
vdsm-patches@lists.fedorahosted.org