X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=NG-RO%2Fosm_ng_ro%2Fns.py;h=c71e1134dd6124b5d83ed9ada7a14fed15dea45c;hb=29712418a90f80aee5042bb605f1c4c394a92c6a;hp=fc2b9a746b4909026e4886c2840a513a846b437e;hpb=aca8cb5e63ebd11cc69373323d8df62b5d8cbfe2;p=osm%2FRO.git diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py index fc2b9a74..c71e1134 100644 --- a/NG-RO/osm_ng_ro/ns.py +++ b/NG-RO/osm_ng_ro/ns.py @@ -1837,9 +1837,9 @@ class Ns(object): extra_dict["params"] = { "name": "{}-{}-{}-{}".format( - indata["name"][:16], - vnfr["member-vnf-index-ref"][:16], - target_vdu["vdu-name"][:32], + indata["name"], + vnfr["member-vnf-index-ref"], + target_vdu["vdu-name"], target_vdu.get("count-index") or 0, ), "description": target_vdu["vdu-name"], @@ -2001,7 +2001,11 @@ class Ns(object): net_item["model"] = interface.get("type") if interface.get("ip-address"): - net_item["ip_address"] = interface["ip-address"] + dual_ip = interface.get("ip-address").split(";") + if len(dual_ip) == 2: + net_item["ip_address"] = dual_ip + else: + net_item["ip_address"] = interface["ip-address"] if interface.get("mac-address"): net_item["mac_address"] = interface["mac-address"] @@ -2066,9 +2070,9 @@ class Ns(object): extra_dict["params"] = { "name": "{}-{}-{}-{}".format( - db_nsr["name"][:16], - vnfr["member-vnf-index-ref"][:16], - existing_vdu["vdu-name"][:32], + db_nsr["name"], + vnfr["member-vnf-index-ref"], + existing_vdu["vdu-name"], existing_vdu.get("count-index") or 0, ), "description": existing_vdu["vdu-name"],