projects
/
osm
/
LCM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 1609 fix
[osm/LCM.git]
/
osm_lcm
/
ns.py
diff --git
a/osm_lcm/ns.py
b/osm_lcm/ns.py
index
cb281e4
..
1c18ec7
100644
(file)
--- a/
osm_lcm/ns.py
+++ b/
osm_lcm/ns.py
@@
-1603,17
+1603,22
@@
class NsLcm(LcmBase):
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
)
if vdu_id:
if vdu_id:
- namespace += ".{}-{}".format(vdu_id,
vdu_index or 0
)
+ namespace += ".{}-{}".format(vdu_id,
index_number
)
element_type = "VDU"
element_type = "VDU"
- 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
@@
-1806,6
+1811,7
@@
class NsLcm(LcmBase):
config=config,
num_units=num_units,
vca_id=vca_id,
config=config,
num_units=num_units,
vca_id=vca_id,
+ vca_type=vca_type,
)
# write in db flag of configuration_sw already installed
)
# write in db flag of configuration_sw already installed
@@
-1922,6
+1928,7
@@
class NsLcm(LcmBase):
params_dict=primitive_params_,
db_dict=db_dict,
vca_id=vca_id,
params_dict=primitive_params_,
db_dict=db_dict,
vca_id=vca_id,
+ vca_type=vca_type,
)
# 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:
@@
-2390,9
+2397,7
@@
class NsLcm(LcmBase):
deploy_params_vdu["OSM"] = get_osm_params(
db_vnfr, vdu_id, vdu_count_index=0
)
deploy_params_vdu["OSM"] = get_osm_params(
db_vnfr, vdu_id, vdu_count_index=0
)
- vdud_count = get_vdu_profile(vnfd, vdu_id).get(
- "max-number-of-instances", 1
- )
+ vdud_count = get_number_of_instances(vnfd, vdu_id)
self.logger.debug("VDUD > {}".format(vdud))
self.logger.debug(
self.logger.debug("VDUD > {}".format(vdud))
self.logger.debug(
@@
-3747,6
+3752,7
@@
class NsLcm(LcmBase):
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,
+ vca_type=vca_type,
vca_id=vca_id,
)
vca_id=vca_id,
)
@@
-4520,6
+4526,7
@@
class NsLcm(LcmBase):
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,
+ vca_type=vca_type,
),
timeout=timeout or self.timeout_primitive,
)
),
timeout=timeout or self.timeout_primitive,
)