diff --git a/nova/api/openstack/compute/schemas/aggregates.py b/nova/api/openstack/compute/schemas/aggregates.py index 75c9ea8a50..29d36c9290 100644 --- a/nova/api/openstack/compute/schemas/aggregates.py +++ b/nova/api/openstack/compute/schemas/aggregates.py @@ -26,7 +26,6 @@ availability_zone_with_leading_trailing_spaces = { create = { 'type': 'object', 'properties': { - 'type': 'object', 'aggregate': { 'type': 'object', 'properties': { @@ -52,7 +51,6 @@ create_v20['properties']['aggregate']['properties']['availability_zone'] = ( update = { 'type': 'object', 'properties': { - 'type': 'object', 'aggregate': { 'type': 'object', 'properties': { @@ -81,7 +79,6 @@ update_v20['properties']['aggregate']['properties']['availability_zone'] = ( add_host = { 'type': 'object', 'properties': { - 'type': 'object', 'add_host': { 'type': 'object', 'properties': { @@ -98,7 +95,6 @@ add_host = { remove_host = { 'type': 'object', 'properties': { - 'type': 'object', 'remove_host': { 'type': 'object', 'properties': { @@ -116,7 +112,6 @@ remove_host = { set_metadata = { 'type': 'object', 'properties': { - 'type': 'object', 'set_metadata': { 'type': 'object', 'properties': { diff --git a/nova/api/openstack/compute/schemas/hosts.py b/nova/api/openstack/compute/schemas/hosts.py index 983e428393..b0e6fb486b 100644 --- a/nova/api/openstack/compute/schemas/hosts.py +++ b/nova/api/openstack/compute/schemas/hosts.py @@ -29,12 +29,12 @@ update = { 'Enable', 'Disable', 'ENABLE', 'DISABLE'], }, - 'anyOf': [ - {'required': ['status']}, - {'required': ['maintenance_mode']} - ], }, - 'additionalProperties': False + 'anyOf': [ + {'required': ['status']}, + {'required': ['maintenance_mode']} + ], + 'additionalProperties': False, } index_query = { diff --git a/nova/api/openstack/compute/schemas/quota_classes.py b/nova/api/openstack/compute/schemas/quota_classes.py index 6b181359b9..d094f024cc 100644 --- a/nova/api/openstack/compute/schemas/quota_classes.py +++ b/nova/api/openstack/compute/schemas/quota_classes.py @@ -18,8 +18,8 @@ from nova.api.openstack.compute.schemas import quota_sets update = { 'type': 'object', 'properties': { - 'type': 'object', 'quota_class_set': { + 'type': 'object', 'properties': quota_sets.quota_resources, 'additionalProperties': False, }, diff --git a/nova/api/openstack/compute/schemas/quota_sets.py b/nova/api/openstack/compute/schemas/quota_sets.py index 7dad6f70db..6df33d71fa 100644 --- a/nova/api/openstack/compute/schemas/quota_sets.py +++ b/nova/api/openstack/compute/schemas/quota_sets.py @@ -59,8 +59,8 @@ del update_quota_set_v236['networks'] update = { 'type': 'object', 'properties': { - 'type': 'object', 'quota_set': { + 'type': 'object', 'properties': update_quota_set, 'additionalProperties': False, }, diff --git a/nova/api/openstack/compute/schemas/server_tags.py b/nova/api/openstack/compute/schemas/server_tags.py index bc616acee9..947a167e5d 100644 --- a/nova/api/openstack/compute/schemas/server_tags.py +++ b/nova/api/openstack/compute/schemas/server_tags.py @@ -30,6 +30,4 @@ update_all = { update = { "title": "Server tag", "type": "null", - 'required': [], - 'additionalProperties': False }