openstack/tacker
Code Issues Proposed changes

Merge "replace the class path uuid based stack names with vnf names"

Browse Source
This commit is contained in:
Zuul 2018-01-24 03:17:28 +00:00 committed by Gerrit Code Review
commit 8fb6b27faa
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
releasenotes/notes/bug-1590215-8b4bba0d0decc3f1.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Replace the class path uuid based stack names with vnf name plus vnf id
so that it is easy to find which stack is for which vnf.

2
tacker/tests/functional/vnfm/test_tosca_vnf_alarm.py
View File

@ -143,7 +143,7 @@ class VnfTestAlarmMonitor(base.BaseTackerTest):
def test_vnf_alarm_respawn(self): def test_vnf_alarm_respawn(self):
self._test_vnf_tosca_alarm( self._test_vnf_tosca_alarm(
'sample-tosca-alarm-respawn.yaml', 'sample-tosca-alarm-respawn.yaml',
'alarm and respawn vnf') 'alarm and respawn-vnf')
@unittest.skip("Skip and wait for releasing Heat Translator") @unittest.skip("Skip and wait for releasing Heat Translator")
def test_vnf_alarm_scale(self): def test_vnf_alarm_scale(self):

16
tacker/tests/unit/vnfm/infra_drivers/openstack/test_openstack.py
View File

@ -87,20 +87,16 @@ class TestOpenStack(base.TestCase):
def _get_expected_fields(self): def _get_expected_fields(self):
return {'stack_name': return {'stack_name':
'tacker.vnfm.infra_drivers.openstack.openstack_OpenStack' 'test_openwrt_eb84260e-5ff7-4332-b032-50a14d6c1123',
'-eb84260e-5ff7-4332-b032-50a14d6c1123', 'template': 'template': self.hot_template}
self.hot_template}
def _get_expected_fields_user_data(self): def _get_expected_fields_user_data(self):
return {'stack_name': return {'stack_name':
'tacker.vnfm.infra_drivers.openstack.openstack_OpenStack' 'test_userdata_18685f68-2b2a-4185-8566-74f54e548811',
'-18685f68-2b2a-4185-8566-74f54e548811',
'template': self.hot_param_template} 'template': self.hot_param_template}
def _get_expected_fields_ipaddr_data(self): def _get_expected_fields_ipaddr_data(self):
return {'stack_name': return {'stack_name': 'test_ip_d1337add-d5a1-4fd4-9447-bb9243c8460b',
'tacker.vnfm.infra_drivers.openstack.openstack_OpenStack'
'-d1337add-d5a1-4fd4-9447-bb9243c8460b',
'template': self.hot_ipparam_template} 'template': self.hot_ipparam_template}
def _get_expected_vnf_wait_obj(self, param_values=''): def _get_expected_vnf_wait_obj(self, param_values=''):
@ -187,9 +183,7 @@ class TestOpenStack(base.TestCase):
def _get_expected_fields_tosca(self, template): def _get_expected_fields_tosca(self, template):
return {'stack_name': return {'stack_name':
'tacker.vnfm.infra_drivers.openstack.openstack_OpenStack' 'test_openwrt_eb84260e-5ff7-4332-b032-50a14d6c1123',
'-eb84260e'
'-5ff7-4332-b032-50a14d6c1123',
'template': _get_template(template)} 'template': _get_template(template)}
def _get_expected_tosca_vnf(self, def _get_expected_tosca_vnf(self,

2
tacker/vnfm/infra_drivers/openstack/openstack.py
View File

@ -108,7 +108,7 @@ class OpenStack(abstract_driver.DeviceAbstractDriver,
@log.log @log.log
def _create_stack(self, heatclient, vnf, fields): def _create_stack(self, heatclient, vnf, fields):
if 'stack_name' not in fields: if 'stack_name' not in fields:
name = __name__ + '_' + self.__class__.__name__ + '-' + vnf['id'] name = vnf['name'].replace(' ', '_') + '_' + vnf['id']
if vnf['attributes'].get('failure_count'): if vnf['attributes'].get('failure_count'):
name += ('-RESPAWN-%s') % str(vnf['attributes'][ name += ('-RESPAWN-%s') % str(vnf['attributes'][
'failure_count']) 'failure_count'])