The fix requires merging this https://osm.etsi.org/gerrit/c/osm/N2VC/+/11086 commit.
Then it can pass the jenkins w/o failure
Change-Id: Icef9a467b8b037db33a0cf3c444247378ff6499b
Signed-off-by: aktas <emin.aktas@ulakhaberlesme.com.tr>
.pydevproject
pyvenv.cfg
venv/
.pydevproject
pyvenv.cfg
venv/
+.idea
\ No newline at end of file
namespace = "{nsi}.{ns}".format(nsi=nsi_id if nsi_id else "", ns=nsr_id)
namespace = "{nsi}.{ns}".format(nsi=nsi_id if nsi_id else "", ns=nsr_id)
+ if vca_type == "native_charm":
+ index_number = 0
+ else:
+ index_number = vdu_index or 0
+
if vnfr_id:
element_type = "VNF"
element_under_configuration = vnfr_id
if vnfr_id:
element_type = "VNF"
element_under_configuration = vnfr_id
- namespace += ".{}-{}".format(vnfr_id, vdu_index or 0)
+ namespace += ".{}-{}".format(vnfr_id, index_number)
- namespace += ".{}-{}".format(vdu_id, vdu_index or 0)
+ namespace += ".{}-{}".format(vdu_id, index_number)
- element_under_configuration = "{}-{}".format(vdu_id, vdu_index or 0)
+ element_under_configuration = "{}-{}".format(vdu_id, index_number)
osm_config["osm"]["vdu_id"] = vdu_id
elif kdu_name:
osm_config["osm"]["vdu_id"] = vdu_id
elif kdu_name:
- namespace += ".{}.{}".format(kdu_name, vdu_index or 0)
+ namespace += ".{}".format(kdu_name)
element_type = "KDU"
element_under_configuration = kdu_name
osm_config["osm"]["kdu_name"] = kdu_name
element_type = "KDU"
element_under_configuration = kdu_name
osm_config["osm"]["kdu_name"] = kdu_name
config=config,
num_units=num_units,
vca_id=vca_id,
config=config,
num_units=num_units,
vca_id=vca_id,
)
# write in db flag of configuration_sw already installed
)
# write in db flag of configuration_sw already installed
params_dict=primitive_params_,
db_dict=db_dict,
vca_id=vca_id,
params_dict=primitive_params_,
db_dict=db_dict,
vca_id=vca_id,
)
# Once some primitive has been exec, check and write at db if it needs to exec terminated primitives
if check_if_terminated_needed:
)
# Once some primitive has been exec, check and write at db if it needs to exec terminated primitives
if check_if_terminated_needed:
await self.vca_map[vca_type].delete_execution_environment(
vca_deployed["ee_id"],
scaling_in=scaling_in,
await self.vca_map[vca_type].delete_execution_environment(
vca_deployed["ee_id"],
scaling_in=scaling_in,
total_timeout=self.timeout_primitive,
db_dict=db_dict,
vca_id=vca_id,
total_timeout=self.timeout_primitive,
db_dict=db_dict,
vca_id=vca_id,
),
timeout=timeout or self.timeout_primitive,
)
),
timeout=timeout or self.timeout_primitive,
)