]
vnf_count = ""
vdu_count = ""
+ vdu_id = None
expected_result = "simple-ns-charm-abc-000-rrrr-nnnn-4444-h-ns"
application_name = self.n2vc._generate_application_name(
charm_level,
vnfrs,
vca_records,
vnf_count=vnf_count,
+ vdu_id=vdu_id,
vdu_count=vdu_count,
)
self.assertEqual(application_name, expected_result)
vca_records = []
vnf_count = ""
vdu_count = ""
+ vdu_id = None
with self.assertRaises(N2VCException):
self.n2vc._generate_application_name(
charm_level,
vnfrs,
vca_records,
vnf_count=vnf_count,
+ vdu_id=vdu_id,
vdu_count=vdu_count,
)
]
vnf_count = "1"
vdu_count = ""
+ vdu_id = None
expected_result = "simple-ee-ab-1-vnf111-xxx-y-vnf"
application_name = self.n2vc._generate_application_name(
charm_level,
vnfrs,
vca_records,
vnf_count=vnf_count,
+ vdu_id=vdu_id,
vdu_count=vdu_count,
)
self.assertEqual(application_name, expected_result)
{
"target_element": "vnf/vnf1/mgmtvm",
"member-vnf-index": "vnf111-xxx-yyy-zzz",
- "vdu_id": "38912ff7-5bdd-4228-911f-c2bee259c44a",
+ "vdu_id": "mgmtVM",
"kdu_name": None,
"vdu_count_index": None,
"vnfd_id": "r7fbd751-3de4-4e68-bd40-ec5ae0a53898",
]
vnf_count = "2"
vdu_count = "0"
+ vdu_id = "mgmtVM"
expected_result = "simple-ee-ab-2-vnf111-xxx-y-mgmtVM-0-vdu"
application_name = self.n2vc._generate_application_name(
charm_level,
vnfrs,
vca_records,
vnf_count=vnf_count,
+ vdu_id=vdu_id,
vdu_count=vdu_count,
)
self.assertEqual(application_name, expected_result)
self.assertLess(len(application_name), 50)
- def test_generate_application_name_vdu_charm_wrong_vnfrs(self):
+ def test_generate_application_name_vdu_charm_vdu_id_none(self):
charm_level = "vdu-level"
vnfrs = {
"member-vnf-index-ref": "vnf111-xxx-yyy-zzz",
{
"target_element": "vnf/vnf1/mgmtvm",
"member-vnf-index": "vnf111-xxx-yyy-zzz",
- "vdu_id": "38912ff7-5bdd-4228-911f-c2bee259c44a",
+ "vdu_id": None,
"kdu_name": None,
"vdu_count_index": None,
"vnfd_id": "r7fbd751-3de4-4e68-bd40-ec5ae0a53898",
]
vnf_count = "2"
vdu_count = "0"
- with self.assertRaises(KeyError):
+ vdu_id = None
+ with self.assertRaises(N2VCException):
self.n2vc._generate_application_name(
charm_level,
vnfrs,
vca_records,
vnf_count=vnf_count,
+ vdu_id=vdu_id,
vdu_count=vdu_count,
)
{
"target_element": "vnf/vnf1/mgmtvm",
"member-vnf-index": "vnf111-xxx-yyy-zzz",
- "vdu_id": "38912ff7-5bdd-4228-911f-c2bee259c44a",
+ "vdu_id": "mgmtVM",
"kdu_name": None,
"vdu_count_index": None,
"vnfd_id": "r7fbd751-3de4-4e68-bd40-ec5ae0a53898",
{
"target_element": "vnf/openldap/kdu/ldap",
"member-vnf-index": "openldap",
- "vdu_id": None,
+ "vdu_id": "ldap",
"kdu_name": "ldap",
"vdu_count_index": 0,
"operational-status": "init",
}
vnf_count = "0"
mock_vnf_count_and_record.return_value = (vnf_count, db_vnfr)
- expected_result = "openldap-ee-z0-openldap-vdu"
+ expected_result = "openldap-ee-z0-openldap-ldap-vdu"
with patch.object(self.n2vc, "db", self.db), patch.object(
self.n2vc, "_get_vnf_count_and_record", mock_vnf_count_and_record
):