5bfa57a433
This adds support for the 2.50 microversion which does the following: * Adds the server_groups and server_groups_members resources to the output for the 'nova quota-class-show' and 'nova quota-class-update' CLIs. * Removes the ability to show or update network-related resource quota class values, specifically floating_ips, fixed_ips, security_groups and security_group_members. * Defines explicit kwargs for the update() method in the python API binding. This also fixes a problem where the 'nova quota-class-update' CLI was incorrectly capped at the 2.35 microversion for updating network-related resources. That was true for the os-quota-sets API which is tenant-specific, but not for the os-quota-class-sets API which is global. Functional tests are added for the 2.1 and 2.50 microversion behavior for both commands. Part of blueprint fix-quota-classes-api Change-Id: I2531f9094d92e1b9ed36ab03bc43ae1be5290790
84 lines
3.3 KiB
Python
84 lines
3.3 KiB
Python
# Copyright 2012 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from novaclient import api_versions
|
|
from novaclient import base
|
|
|
|
|
|
class QuotaClassSet(base.Resource):
|
|
|
|
def update(self, *args, **kwargs):
|
|
return self.manager.update(self.id, *args, **kwargs)
|
|
|
|
|
|
class QuotaClassSetManager(base.Manager):
|
|
resource_class = QuotaClassSet
|
|
|
|
def get(self, class_name):
|
|
return self._get("/os-quota-class-sets/%s" % (class_name),
|
|
"quota_class_set")
|
|
|
|
def _update_body(self, **kwargs):
|
|
return {'quota_class_set': kwargs}
|
|
|
|
# NOTE(mriedem): Before 2.50 the resources you could update was just a
|
|
# kwargs dict and not validated on the client-side, only on the API server
|
|
# side.
|
|
@api_versions.wraps("2.0", "2.49")
|
|
def update(self, class_name, **kwargs):
|
|
body = self._update_body(**kwargs)
|
|
|
|
for key in list(body['quota_class_set']):
|
|
if body['quota_class_set'][key] is None:
|
|
body['quota_class_set'].pop(key)
|
|
|
|
return self._update('/os-quota-class-sets/%s' % (class_name),
|
|
body,
|
|
'quota_class_set')
|
|
|
|
# NOTE(mriedem): 2.50 does strict validation of the resources you can
|
|
# specify since the network-related resources are blocked in 2.50.
|
|
@api_versions.wraps("2.50")
|
|
def update(self, class_name, instances=None, cores=None, ram=None,
|
|
metadata_items=None, injected_files=None,
|
|
injected_file_content_bytes=None, injected_file_path_bytes=None,
|
|
key_pairs=None, server_groups=None, server_group_members=None):
|
|
resources = {}
|
|
if instances is not None:
|
|
resources['instances'] = instances
|
|
if cores is not None:
|
|
resources['cores'] = cores
|
|
if ram is not None:
|
|
resources['ram'] = ram
|
|
if metadata_items is not None:
|
|
resources['metadata_items'] = metadata_items
|
|
if injected_files is not None:
|
|
resources['injected_files'] = injected_files
|
|
if injected_file_content_bytes is not None:
|
|
resources['injected_file_content_bytes'] = (
|
|
injected_file_content_bytes)
|
|
if injected_file_path_bytes is not None:
|
|
resources['injected_file_path_bytes'] = injected_file_path_bytes
|
|
if key_pairs is not None:
|
|
resources['key_pairs'] = key_pairs
|
|
if server_groups is not None:
|
|
resources['server_groups'] = server_groups
|
|
if server_group_members is not None:
|
|
resources['server_group_members'] = server_group_members
|
|
|
|
body = {'quota_class_set': resources}
|
|
return self._update('/os-quota-class-sets/%s' % class_name, body,
|
|
'quota_class_set')
|