openstack
/
tacker
Code Issues Proposed changes

Delete test_create_vnffg_pre() for Python3 unittest 

In Python3 test, the test "test_create_vnffg_pre()" affects
other tests regarding mocked "__new__" part.
Because most part of this test are covered in
test_create_vnffg_abstract_types(), this test should be deleted.

Change-Id: Icf118cbb3e9dda745248cedbe16a6d4a0be1569f
This commit is contained in:
Keiko Kuriu 2019-10-17 11:32:39 +09:00
parent 4e6929c434
commit b320839d73
1 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
tacker/tests/unit/nfvo/test_nfvo_plugin.py
View File

@ -592,76 +592,6 @@ class TestNfvoPlugin(db_base.SqlTestCase):
self.assertIn('template_source', result)
self.assertEqual('example_vnffgd', result['name'])
def test_create_vnffg_pre(self):
VNFFG_ID = 'ffc1a59b-65bb-4874-94d3-84f639e63c74'
ACLMATCHCRI_ID = 'ffc1a59b-65bb-4874-94d3-84f639e63c75'
with patch.object(TackerManager, 'get_service_plugins') as \
mock_plugins:
mock_plugins.return_value = {'VNFM': FakeVNFMPlugin()}
mock.patch('tacker.common.driver_manager.DriverManager',
side_effect=FakeDriverManager()).start()
self._insert_dummy_vnffg_template()
vnffg_obj = utils.get_dummy_vnffg_obj()
vnffg_obj['vnffg']['id'] = VNFFG_ID
vnffg = vnffg_obj['vnffg']
template_id = vnffg['vnffgd_id']
template_db = self.nfvo_plugin._get_resource(self.context,
vnffg_db.VnffgTemplate,
template_id)
vnf_members = self.nfvo_plugin._get_vnffg_property(
template_db.template, 'constituent_vnfs')
vnf_mapping = self.nfvo_plugin._get_vnf_mapping(self.context,
vnffg.get('vnf_mapping'),
vnf_members)
nfp_dict = self.nfvo_plugin._create_nfp_pre(template_db)
vnffg_attrs = {'id': vnffg.get('id'),
'tenant_id': vnffg.get('tenant_id'),
'name': vnffg.get('name'),
'description': 'fake_template_description',
'vnffgd_id': vnffg.get('vnffgd_id'),
'ns_id': None,
'attributes': template_db.get('template'),
'status': constants.PENDING_CREATE,
'vnf_mapping': vnf_mapping}
vnffg_db_obj = vnffg_db.Vnffg(**vnffg_attrs)
mock.patch('tacker.db.nfvo.vnffg_db.Vnffg.__new__',
return_value=vnffg_db_obj).start()
match = self.nfvo_plugin._policy_to_acl_criteria(self.context,
template_db,
nfp_dict['name'],
vnf_mapping)
aclmatchcri_attrs = {'id': ACLMATCHCRI_ID,
'vnffgc_id': uuidutils.generate_uuid(),
'tenant_id': vnffg.get('tenant_id')}
aclmatchcri_attrs.update(**match[0]['match'])
aclmatchcri_db_obj = vnffg_db.ACLMatchCriteria(**aclmatchcri_attrs)
mock.patch('tacker.db.nfvo.vnffg_db.ACLMatchCriteria.__new__',
return_value=aclmatchcri_db_obj).start()
result = self.nfvo_plugin.create_vnffg(self.context, vnffg_obj)
vnffg_db.Vnffg.__new__.assert_called_with(vnffg_db.Vnffg,
**vnffg_attrs)
aclmatchcri_attrs.update({'id': mock.ANY, 'vnffgc_id': mock.ANY,
})
vnffg_db.ACLMatchCriteria.__new__.assert_called_with(
vnffg_db.ACLMatchCriteria,
**aclmatchcri_attrs)
self.assertIsNotNone(result)
self.assertIn('id', result)
self.assertIn('status', result)
self.assertEqual('PENDING_CREATE', result['status'])
self._driver_manager.invoke.assert_called_with(
mock.ANY, mock.ANY,
name=mock.ANY,
path_id=mock.ANY,
vnfs=mock.ANY,
fc_ids=mock.ANY,
auth_attr=mock.ANY,
symmetrical=mock.ANY,
correlation=mock.ANY)
def test_create_vnffg_abstract_types(self):
with patch.object(TackerManager, 'get_service_plugins') as \
mock_plugins: