x/ranger
Code Issues Proposed changes

Ranger fixes for python 3.6 and stein heat

Browse Source 
Fixes number of errors so that ranger json
sent to heat matches the parameters that heat
expects for resource allocation

Change-Id: I23d77923756fb7f86e311a6fea89cc7724d63b5b
This commit is contained in:
jh629g 2019-11-08 14:46:35 -06:00
parent 87d644675e
commit 9470cc0f0d
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
orm/services/resource_distributor/rds/services/resource.py
View File

@ -3,7 +3,7 @@ import logging
import time
from orm.services.resource_distributor.rds.services import region_resource_id_status as regionResourceIdStatus
from orm.services.resource_distributor.rds.services import (yaml_customer_builder, yaml_flavor_bulder,
from orm.services.resource_distributor.rds.services import (yaml_customer_builder, yaml_flavor_builder,
yaml_group_builder, yaml_image_builder)
from orm.services.resource_distributor.rds.services.base import ConflictValue, ErrorMessage
from orm.services.resource_distributor.rds.services.model.resource_input import ResourceData as InputData
@ -102,7 +102,7 @@ def _create_data_to_sot(input_data):
elif input_data.resource_type == "group":
yamldata = yaml_group_builder.yamlbuilder(jsondata, target)
elif input_data.resource_type == "flavor":
yamldata = yaml_flavor_bulder.yamlbuilder(jsondata, target)
yamldata = yaml_flavor_builder.yamlbuilder(jsondata, target)
elif input_data.resource_type == "image":
yamldata = yaml_image_builder.yamlbuilder(jsondata, target)
targetslist.append({"region_id": target['name'],

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

@ -106,8 +106,7 @@ def yamlbuilder(alldata, region):
else:
resources['resources'][user['id']] = \
{'type': 'OS::Keystone::UserRoleAssignment\n',
'properties': {'user': user['id'],
'user_domain': domain,
'properties': {'user': (user['id'] + "{%s}" % domain),
'roles': user_roles}}
# create the output for users

0
orm/services/resource_distributor/rds/services/yaml_flavor_bulder.py → orm/services/resource_distributor/rds/services/yaml_flavor_builder.py
View File

4
orm/tests/unit/rds/services/test_create_resource.py
View File

@ -139,7 +139,7 @@ class CreateResource(unittest.TestCase):
# @patch.object(ResourceService.regionResourceIdStatus, 'add_status',
# return_value=None)
# @patch.object(ResourceService.yaml_flavor_bulder, 'yamlbuilder',
# @patch.object(ResourceService.yaml_flavor_builder, 'yamlbuilder',
# return_value=["anystring"])
# @patch.object(ResourceService.sot_factory, 'get_sot', return_value=SoT())
# @patch.object(ResourceService.regionResourceIdStatus,
@ -206,7 +206,7 @@ class CreateResource(unittest.TestCase):
resource_id = ResourceService.main(flavorjsondata, uuid,
'flavor', 'delete')
# @patch.object(ResourceService.yaml_flavor_bulder,
# @patch.object(ResourceService.yaml_flavor_builder,
# 'yamlbuilder', return_value=["anystring"])
# @patch.object(ResourceService.regionResourceIdStatus,
# 'add_status', return_value=None)

4
orm/tests/unit/rds/services/test_customer_yaml.py
View File

@ -218,11 +218,11 @@ full_yaml_ldap = 'heat_template_version: 2015-1-2\n\ndescription: yaml file' \
'- project: {get_resource: 1e24981a-fa51-11e5-86aa-5e5517507c66}\n ' \
'role: admin\n - project: ' \
'{get_resource: 1e24981a-fa51-11e5-86aa-5e5517507c66}\n ' \
'role: other\n user_domain: default\n user: userId1\n ' \
'role: other\n user: userId1{default}\n ' \
'type: OS::Keystone::UserRoleAssignment\n\n \n ' \
'userId2:\n properties:\n roles:\n ' \
'- project: {get_resource: 1e24981a-fa51-11e5-86aa-5e5517507c66}\n ' \
'role: storage\n user_domain: default\n user: userId2\n ' \
'role: storage\n user: userId2{default}\n ' \
'type: OS::Keystone::UserRoleAssignment\n\n \n ' \
'1e24981a-fa51-11e5-86aa-5e5517507c66:\n properties:\n ' \
'description: this is a description\n ' \

2
orm/tests/unit/rds/services/test_flavor_yaml.py
View File

@ -4,7 +4,7 @@ import unittest
import yaml
from mock import patch
from orm.services.resource_distributor.rds.services import yaml_flavor_bulder as FlavorBuild
from orm.services.resource_distributor.rds.services import yaml_flavor_builder as FlavorBuild
alldata = {'status': 'complete', 'series': 'P2',
'description': 'First flavor for AMAR',