x
/
ranger
Code Issues Proposed changes

Merge "CMS quota yaml logic update"

This commit is contained in:
Zuul 2019-02-20 19:29:05 +00:00 committed by Gerrit Code Review
parent 84e921b15d 1970a48648
commit dc266a3d79
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
orm/services/resource_distributor/config.py
View File

@ -99,10 +99,10 @@ yaml_configs = {
},
'cms_quota': {
'resource_quotas': {
'quota_supported_params': ['vips', 'members', 'pools',
'nat_instance', 'route_table',
'health_monitors', 'loadbalancer',
'listener']
'quota_unsupported_params': ['vip', 'member', 'pool',
'nat_instance', 'route_table',
'health_monitor', 'loadbalancer',
'listener']
}
}
},

32
orm/services/resource_distributor/rds/services/yaml_customer_builder.py
View File

@ -137,8 +137,8 @@ def yamlbuilder(alldata, region):
"network": ["neutron_quota", "OS::Neutron::Quota\n"],
"storage": ["cinder_quota", "OS::Cinder::Quota\n"]}
adjust_quota_resource = CMSAdjustResource(region['rangerAgentVersion'])
adjust_quota_resource.fix_quota_resource_item(alldata['uuid'], quotas, resources, options)
adjust_resource = CMSAdjustResource()
adjust_resource.fix_quota_resource_item(alldata['uuid'], quotas, resources, options)
# putting all parts together for full yaml
yamldata = create_final_yaml(title, description, resources, outputs)
@ -147,8 +147,8 @@ def yamlbuilder(alldata, region):
return yamldata
class CMSAdjustResource(object):
def __init__(self, rangerAgentVersion):
class CMSAdjustResource():
def __init__(self):
self.adjust_quota_parameters = CMSAdjustQuotaResource().adjust_quota_parameters
def fix_quota_resource_item(self, uuid, quotas, resources, options):
@ -157,13 +157,15 @@ class CMSAdjustResource(object):
for items in quotas:
for item in items:
# these lines added to check if got excpected keys if not they will be replaced
for ite in items[item].keys()[:]:
if ite in quotas_keys:
items[item][quotas_keys[ite]] = items[item][ite]
del items[item][ite]
# rename quota keys as needed
for quota_item in items[item].keys()[:]:
if quota_item in quotas_keys:
items[item][quotas_keys[quota_item]] = items[item][quota_item]
new_quota_item_key = quotas_keys[quota_item]
del items[item][quota_item]
quota_item = new_quota_item_key
self.adjust_quota_parameters(ite, items[item])
self.adjust_quota_parameters(quota_item, items[item])
# adding project to each quota
items[item]['project'] = \
@ -172,11 +174,13 @@ class CMSAdjustResource(object):
{"type": options[item][1], "properties": items[item]}
class CMSAdjustQuotaResource(object):
class CMSAdjustQuotaResource():
def __init__(self):
self.supported_new_params = conf.yaml_configs.customer_yaml.cms_quota.resource_quotas.quota_supported_params
self.unsupported_quotas = conf.yaml_configs.customer_yaml.cms_quota.resource_quotas.quota_unsupported_params
def adjust_quota_parameters(self, key, item):
if key in self.supported_new_params:
logger.debug("New quota parameter {} is added to quota resource".format(key))
if key in self.unsupported_quotas:
del item[key]
logger.warning("Region does not support Quota Parameter {}."
" removed from resource".format(key))