Using pre-defined Flavors when Openstack not running
Modified the code so as to use pre-defined flavors when openstack is not running or an exception raises from openstack Change-Id: I02950e1d615b5d232acdd2f36794acf27bbec977 Closes-Bug: #1526965
This commit is contained in:
parent
01d2731aba
commit
c5fbaf39d9
@ -251,3 +251,35 @@ class ToscaComputeTest(TestCase):
|
|||||||
self._tosca_compute_test(
|
self._tosca_compute_test(
|
||||||
tpl_snippet,
|
tpl_snippet,
|
||||||
expectedprops)
|
expectedprops)
|
||||||
|
|
||||||
|
@patch('requests.post')
|
||||||
|
@patch('requests.get')
|
||||||
|
@patch('os.getenv')
|
||||||
|
def test_node_compute_without_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_content = {}
|
||||||
|
mock_ks_response.content = json.dumps(mock_ks_content)
|
||||||
|
expectedprops = {'key_name': 'userkey',
|
||||||
|
'flavor': 'm1.small',
|
||||||
|
'user_data_format': 'SOFTWARE_CONFIG',
|
||||||
|
'image': None}
|
||||||
|
self._tosca_compute_test(
|
||||||
|
tpl_snippet,
|
||||||
|
expectedprops)
|
||||||
|
@ -20,6 +20,7 @@ from toscaparser.utils.gettextutils import _
|
|||||||
from toscaparser.utils.validateutils import TOSCAVersionProperty
|
from toscaparser.utils.validateutils import TOSCAVersionProperty
|
||||||
import translator.common.utils
|
import translator.common.utils
|
||||||
from translator.hot.syntax.hot_resource import HotResource
|
from translator.hot.syntax.hot_resource import HotResource
|
||||||
|
|
||||||
log = logging.getLogger('heat-translator')
|
log = logging.getLogger('heat-translator')
|
||||||
|
|
||||||
|
|
||||||
@ -145,6 +146,7 @@ class ToscaCompute(HotResource):
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
headers = {'Content-Type': 'application/json'}
|
headers = {'Content-Type': 'application/json'}
|
||||||
|
try:
|
||||||
keystone_response = requests.post(auth_url + '/tokens',
|
keystone_response = requests.post(auth_url + '/tokens',
|
||||||
data=json.dumps(auth_dict),
|
data=json.dumps(auth_dict),
|
||||||
headers=headers)
|
headers=headers)
|
||||||
@ -160,7 +162,8 @@ class ToscaCompute(HotResource):
|
|||||||
if not nova_url:
|
if not nova_url:
|
||||||
return None
|
return None
|
||||||
nova_response = requests.get(nova_url + '/flavors/detail',
|
nova_response = requests.get(nova_url + '/flavors/detail',
|
||||||
headers={'X-Auth-Token': access_token})
|
headers={'X-Auth-Token':
|
||||||
|
access_token})
|
||||||
if nova_response.status_code != 200:
|
if nova_response.status_code != 200:
|
||||||
return None
|
return None
|
||||||
flavors = json.loads(nova_response.content)['flavors']
|
flavors = json.loads(nova_response.content)['flavors']
|
||||||
@ -172,6 +175,11 @@ class ToscaCompute(HotResource):
|
|||||||
'disk_size': flavor['disk'],
|
'disk_size': flavor['disk'],
|
||||||
'num_cpus': flavor['vcpus'],
|
'num_cpus': flavor['vcpus'],
|
||||||
}
|
}
|
||||||
|
except Exception as e:
|
||||||
|
# Handles any exception coming from openstack
|
||||||
|
log.warn(_('Choosing predefined flavors since received '
|
||||||
|
'Openstack Exception: %s') % str(e))
|
||||||
|
return None
|
||||||
return flavor_dict
|
return flavor_dict
|
||||||
|
|
||||||
def _best_flavor(self, properties):
|
def _best_flavor(self, properties):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user