Change in vdsm[master]: schema: cleanup

piotr.kliczewski at gmail.com piotr.kliczewski at gmail.com
Fri Feb 12 11:47:33 UTC 2016


Piotr Kliczewski has uploaded a new change for review.

Change subject: schema: cleanup
......................................................................

schema: cleanup

There was number of inconsistencies in schema as well as there were
types which were unused. To ease conversion of the schema to yaml format
we need to make sure that inconsistencies are fix.

I made assumptions that description is correct and fixed type definition.

Change-Id: I95f4f639f3d7de1179f4c77b5267134e88044fd3
Signed-off-by: pkliczewski <piotr.kliczewski at gmail.com>
---
M lib/api/vdsmapi-schema.json
1 file changed, 10 insertions(+), 172 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/60/53460/1

diff --git a/lib/api/vdsmapi-schema.json b/lib/api/vdsmapi-schema.json
index 69a6802..01b6535 100644
--- a/lib/api/vdsmapi-schema.json
+++ b/lib/api/vdsmapi-schema.json
@@ -44,37 +44,6 @@
 {'alias': 'UUID', 'data': 'str'}
 
 ##
-# @NetworkOptions:
-#
-# Detailed network configuration options.
-#
-# @ipaddr:          #optional Assign this static IP address to the interface
-#
-# @netmask:         #optional The netmask of this subnet
-#
-# @gateway:         #optional IP address of the network gateway
-#
-# @bootproto:       #optional Interface autoconfiguration protocol (typically
-#                   'dhcp' or 'none')
-#
-# @blockingdhcp:    #optional whether ifaces that have 'dhcp' as bootproto
-#                   should wait to get an address before returning creation
-#                   success. If not set, the default is False.
-#
-# @bondingOptions:  #optional A string of space-separated <option>=<value>
-#                   pairs
-#
-# @hostQos:         #optional Host networking QoS params.
-#
-# Since: 4.10.0
-##
-{'type': 'NetworkOptions',
- 'data': {'*ipaddr': 'str', '*netmask': 'str', '*gateway': 'str',
-          '*bootproto': 'str', '*bondingOptions', 'str',
-          '*blockingdhcp': 'bool',
-          '*hostQos': 'HostQoSParams'}}
-
-##
 # @SetupNetworkNetAttributes:
 #
 # Configuration attributes for a single host network.
@@ -3056,7 +3025,7 @@
 ##
 {'type': 'VmGraphicsDevice',
  'data': {'deviceType': 'VmDeviceType', 'device': 'VmGraphicsDeviceType',
-          'port': 'uint', 'tlsPort': 'uint',
+          'port': 'uint', '*tlsPort': 'uint',
           'specParams': 'VmGraphicsDeviceSpecParams'}}
 
 ##
@@ -3344,74 +3313,6 @@
           'address': 'VmDeviceAddress', 'alias': 'str', 'deviceId': 'UUID'}}
 
 ##
-# @VmTpmDeviceMode:
-#
-# An enumeration of VM tpm device types.
-#
-# @passthrough:     use hosts TPM
-#
-# Since: 4.15.0
-##
-{'enum': 'VmTpmDeviceMode', 'data': ['passthrough']}
-
-##
-# @VmTpmDeviceModel:
-#
-# An enumeration of VM tpm device modes.
-#
-# @tpm-tis: TPM Interface Standard
-#
-# Since: 4.15.0
-##
-{'enum': 'VmTpmDeviceModel', 'data': ['tpm-tis']}
-
-##
-# @VmTpmDeviceType:
-#
-# An enumeration of VM tpm device types.
-#
-# @tpm: A tpm
-#
-# Since: 4.15.0
-##
-{'enum': 'VmTpmDeviceType', 'data': ['tpm']}
-
-##
-# @VmTpmDeviceSpecParams:
-#
-# Additional VM tpm device parameters.
-#
-# @mode:      Protocol used by tpmdevice
-#
-# @model:     Model of TPM device
-#
-# @path:      Path to hosts device TPM
-#
-# Since: 4.15.0
-##
-{'type': 'VmTpmDeviceSpecParams',
- 'data': {'model': 'VmTpmDeviceModel',
-          'path': 'str',
-          'mode': 'VmTpmDeviceMode'}}
-
-##
-# @VmTpmDevice:
-#
-# Properties of a VM tpm device.
-#
-# @deviceType:  The device type (always @tpm)
-#
-# @device:      The type of tpm device
-#
-# @specParams:  Additional device parameters
-#
-# Since: 4.15.0
-##
-{'type': 'VmTpmDevice',
- 'data': {'deviceType': 'VmDeviceType', 'device': 'VmTpmDeviceType',
-          'specParams': 'VmTpmDeviceSpecParams'}}
-
-##
 # @VmSmartcardDeviceProtocol:
 #
 # An enumeration of VM smartcard device protocols.
@@ -3485,30 +3386,6 @@
           'specParams': 'VmSmartcardDeviceSpecParams'}}
 
 ##
-# @VmRngDeviceType:
-#
-# An enumeration of VM rng device types
-#
-# @virtio:  supported by qemu and virtio-rng kernel module
-#
-# Since: 4.17.0
-##
-{'enum': 'VmRngDeviceType',
- 'data': ['virtio']}
-
-##
-# @VmRngDeviceModel:
-#
-# An enumeration of VM rng device models
-#
-# @virtio:  supported by qemu and virtio-rng kernel module
-#
-# Since: 4.14.0
-##
-{'enum': 'VmRngDeviceModel',
- 'data': ['virtio']}
-
-##
 # @VmRngDeviceSource:
 #
 # An enumeration of VM rng device models
@@ -3521,45 +3398,6 @@
 ##
 {'enum': 'VmRngDeviceSource',
  'data': ['random', 'hwrng']}
-
-##
-# @VmRngDeviceSpecParams:
-#
-# An enumeration of VM rng device models
-#
-# @bytes:           #optional Maximum number of bytes consumed per
-#                   period
-#
-# @period:          #optional Required if @bytes are set
-#                   Limits the rate of entropy consumption
-#                   from source
-#
-# @source:          Entropy source
-#
-# Since: 4.14.0
-##
-{'type': 'VmRngDeviceSpecParams',
- 'data': {'*bytes': 'int', '*period': 'int', 'source': 'VmRngDeviceSource'}}
-
-##
-# @VmRngDevice:
-#
-# Properties of a VM rng device.
-#
-# @deviceType:  The device type (always @rng)
-#
-# @device:      The type of rng device
-#
-# @model:       The model of rng device
-#
-# @specParams:  Additional device parameters
-#
-# Since: 4.14.0
-##
-{'type': 'VmRngDevice',
- 'data': {'deviceType': 'VmDeviceType', 'device': 'VmRngDeviceType',
-          'model': 'VmRngDeviceModel', 'specParams': 'VmRngDeviceSpecParams'}}
-
 
 ##
 # @VmConsoleDeviceType:
@@ -3608,7 +3446,7 @@
 ##
 {'type': 'VmConsoleDevice',
  'data': {'deviceType': 'VmDeviceType', 'deviceId': 'UUID',
-          'specParams': 'VmConsoleDeviceSpecParams'}}
+          '*specParams': 'VmConsoleDeviceSpecParams'}}
 
 
 ##
@@ -3653,8 +3491,8 @@
 ##
 {'type': 'VmHostDevice',
  'data': {'deviceType': 'VmDeviceType', 'deviceId': 'UUID',
-          'device': 'str', 'bootOrder': 'int',
-          'address': 'VmDeviceAddress', 'alias': 'str',
+          'device': 'str', '*bootOrder': 'int',
+          '*address': 'VmDeviceAddress', 'alias': 'str',
           '*specParams': 'VmHostDeviceSpecParams'}}
 
 ##
@@ -3878,7 +3716,7 @@
           '*smpThreadsPerCore': 'uint', 'timeOffset': 'uint',
           'transparentHugePages': 'bool', 'vmId': 'UUID', 'vmName': 'str',
           'vmType': 'VmType', '*launchPaused': 'bool',
-          'numaTune': 'NumaTune', 'guestNumaNodes': ['GuestNumaNode']}}
+          '*numaTune': 'NumaTune', '*guestNumaNodes': ['GuestNumaNode']}}
 
 ##
 # @VmInfo:
@@ -4506,7 +4344,7 @@
 {'type': 'HostDeviceParams',
  'data': {'capability': 'str', 'iommu_group': 'uint',
           'parent': 'str', 'product_id': 'str', 'product': 'str',
-          'vendor_id': 'str', 'vendor': 'str', 'totalvfs': 'uint',
+          'vendor_id': 'str', 'vendor': 'str', '*totalvfs': 'uint',
           '*physfn':'str'}}
 
 ##
@@ -4538,7 +4376,7 @@
 #
 # Refresh and get information about devices available on the host
 #
-# @caps:            @optional List of capabilities. Devices of given
+# @caps:            #optional List of capabilities. Devices of given
 #                   capabilities will be fetched. Omitting or sending
 #                   empty list returns all devices.
 #
@@ -7514,7 +7352,7 @@
 ##
 {'type': 'RunningVmStats',
  'data': {'vmId': 'UUID',
-          '*displayPort': 'uint', '*displaySecurePort': 'uint',
+          'displayPort': 'uint', '*displaySecurePort': 'uint',
           '*displayType': 'VmDisplayType', '*displayIp': 'str', 'pid': 'uint',
           'vmType': 'VmType', 'kvmEnable': 'bool',
           'network': 'NetworkInterfaceStatsMap',
@@ -7858,7 +7696,7 @@
  'data': {'vmId': 'UUID', 'dst': 'str', 'dstparams': 'str',
           '*mode': 'MigrateMode', '*method': 'MigrateMethod',
           '*tunneled': 'bool', '*abortOnError': 'bool',
-          'consoleAddress': 'str', 'dstqemu': 'str',
+          '*consoleAddress': 'str', '*dstqemu': 'str',
           '*compressed': 'bool', '*autoConverge': 'bool',
           '*maxBandwidth': 'int'}}
 
@@ -8616,7 +8454,7 @@
           'format': 'VolumeFormat', 'disktype': 'DiskType',
           'voltype': 'VolumeRole', 'capacity': 'uint', 'parent': 'UUID',
           'description': 'str', 'pool': 'UUID', 'domain': 'UUID',
-          'image': 'UUID', 'ctime': 'int', '*mtime': 'uint',
+          'image': 'UUID', 'ctime': 'int', 'mtime': 'uint',
           'legality': 'VolumeLegality', 'apparentsize': 'uint',
           'truesize': 'uint', 'status': 'VolumeStatus', 'children': ['UUID']}}
 


-- 
To view, visit https://gerrit.ovirt.org/53460
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I95f4f639f3d7de1179f4c77b5267134e88044fd3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski at gmail.com>


More information about the vdsm-patches mailing list