openstack
/
heat-translator
Code Issues Proposed changes

Merge "Add support to fetch flavor details from nova"

This commit is contained in:
Jenkins 2015-12-10 19:59:41 +00:00 committed by Gerrit Code Review
parent efe22cce76 8cec5b6ba7
commit e627d8b5c6
2 changed files with 128 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
translator/hot/tosca/tests/test_tosca_compute.py
View File

@ -10,6 +10,10 @@
# License for the specific language governing permissions and limitations
# under the License.
import json
import mock
from mock import patch
from toscaparser.nodetemplate import NodeTemplate
from toscaparser.tests.base import TestCase
from toscaparser.utils.gettextutils import _
@ -191,3 +195,59 @@ class ToscaComputeTest(TestCase):
self._tosca_compute_test(
tpl_snippet,
expectedprops)
@patch('requests.post')
@patch('requests.get')
@patch('os.getenv')
def test_node_compute_with_nova_flavor(self, mock_os_getenv,
mock_get, mock_post):
tpl_snippet = '''
node_templates:
server:
type: tosca.nodes.Compute
capabilities:
host:
properties:
num_cpus: 1
disk_size: 1 GB
mem_size: 1 GB
'''
with patch('translator.hot.tosca.tosca_compute.ToscaCompute.'
'_check_for_env_variables') as mock_check_env:
mock_check_env.return_value = True
mock_os_getenv.side_effect = ['demo', 'demo',
'demo', 'http://abc.com/5000/']
mock_ks_response = mock.MagicMock()
mock_ks_response.status_code = 200
mock_ks_content = {
'access': {
'token': {
'id': 'd1dfa603-3662-47e0-b0b6-3ae7914bdf76'
},
'serviceCatalog': [{
'type': 'compute',
'endpoints': [{
'publicURL': 'http://abc.com'
}]
}]
}
}
mock_ks_response.content = json.dumps(mock_ks_content)
mock_nova_response = mock.MagicMock()
mock_nova_response.status_code = 200
mock_flavor_content = {
'flavors': [{
'name': 'm1.mock_flavor',
'ram': 1024,
'disk': 1,
'vcpus': 1
}]
}
mock_nova_response.content = \
json.dumps(mock_flavor_content)
mock_post.return_value = mock_ks_response
mock_get.return_value = mock_nova_response
expectedprops = {'flavor': 'm1.mock_flavor'}
self._tosca_compute_test(
tpl_snippet,
expectedprops)

73
translator/hot/tosca/tosca_compute.py
View File

@ -11,7 +11,11 @@
# License for the specific language governing permissions and limitations
# under the License.
import json
import logging
import os
import requests
from toscaparser.utils.validateutils import TOSCAVersionProperty
import translator.common.utils
from translator.hot.syntax.hot_resource import HotResource
@ -20,6 +24,8 @@ log = logging.getLogger('tosca')
# Name used to dynamically load appropriate map class.
TARGET_CLASS_NAME = 'ToscaCompute'
# Required environment variables to create novaclient object.
ENV_VARIABLES = ['OS_AUTH_URL', 'OS_PASSWORD', 'OS_USERNAME', 'OS_TENANT_NAME']
# A design issue to be resolved is how to translate the generic TOSCA server
# properties to OpenStack flavors and images. At the Atlanta design summit,
@ -114,35 +120,92 @@ class ToscaCompute(HotResource):
# parameter if no match is found.
return hot_properties
def _check_for_env_variables(self):
return set(ENV_VARIABLES) < set(os.environ.keys())
def _create_nova_flavor_dict(self):
'''Populates and returns the flavors dict using Nova ReST API'''
tenant_name = os.getenv('OS_TENANT_NAME')
username = os.getenv('OS_USERNAME')
password = os.getenv('OS_PASSWORD')
auth_url = os.getenv('OS_AUTH_URL')
auth_dict = {
"auth": {
"tenantName": tenant_name,
"passwordCredentials": {
"username": username,
"password": password
}
}
}
headers = {'Content-Type': 'application/json'}
keystone_response = requests.post(auth_url + '/tokens',
data=json.dumps(auth_dict),
headers=headers)
if keystone_response.status_code != 200:
return None
access_dict = json.loads(keystone_response.content)
access_token = access_dict['access']['token']['id']
service_catalog = access_dict['access']['serviceCatalog']
nova_url = ''
for service in service_catalog:
if service['type'] == 'compute':
nova_url = service['endpoints'][0]['publicURL']
if not nova_url:
return None
nova_response = requests.get(nova_url + '/flavors/detail',
headers={'X-Auth-Token': access_token})
if nova_response.status_code != 200:
return None
flavors = json.loads(nova_response.content)['flavors']
flavor_dict = dict()
for flavor in flavors:
flavor_name = str(flavor['name'])
flavor_dict[flavor_name] = {
'mem_size': flavor['ram'],
'disk_size': flavor['disk'],
'num_cpus': flavor['vcpus'],
}
return flavor_dict
def _best_flavor(self, properties):
# Check whether user exported all required environment variables.
flavors = FLAVORS
if self._check_for_env_variables():
resp = self._create_nova_flavor_dict()
if resp:
flavors = resp
# start with all flavors
match_all = FLAVORS.keys()
match_all = flavors.keys()
# TODO(anyone): Handle the case where the value contains something like
# get_input instead of a value.
# flavors that fit the CPU count
cpu = properties.get('num_cpus')
match_cpu = self._match_flavors(match_all, FLAVORS, 'num_cpus', cpu)
match_cpu = self._match_flavors(match_all, flavors, 'num_cpus', cpu)
# flavors that fit the mem size
mem = properties.get('mem_size')
if mem:
mem = translator.common.utils.MemoryUnit.convert_unit_size_to_num(
mem, 'MB')
match_cpu_mem = self._match_flavors(match_cpu, FLAVORS,
match_cpu_mem = self._match_flavors(match_cpu, flavors,
'mem_size', mem)
# flavors that fit the disk size
disk = properties.get('disk_size')
if disk:
disk = translator.common.utils.MemoryUnit.\
convert_unit_size_to_num(disk, 'GB')
match_cpu_mem_disk = self._match_flavors(match_cpu_mem, FLAVORS,
match_cpu_mem_disk = self._match_flavors(match_cpu_mem, flavors,
'disk_size', disk)
# if multiple match, pick the flavor with the least memory
# the selection can be based on other heuristic, e.g. pick one with the
# least total resource
if len(match_cpu_mem_disk) > 1:
return self._least_flavor(match_cpu_mem_disk, FLAVORS, 'mem_size')
return self._least_flavor(match_cpu_mem_disk, flavors, 'mem_size')
elif len(match_cpu_mem_disk) == 1:
return match_cpu_mem_disk[0]
else: