projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 2316: Fix for Unable to do vertical scaling when VM is in Shutdown state
[osm/RO.git]
/
NG-RO
/
osm_ng_ro
/
ns.py
diff --git
a/NG-RO/osm_ng_ro/ns.py
b/NG-RO/osm_ng_ro/ns.py
index
fc2b9a7
..
c71e113
100644
(file)
--- 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(
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"],
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["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"]
if interface.get("mac-address"):
net_item["mac_address"] = interface["mac-address"]
@@
-2066,9
+2070,9
@@
class Ns(object):
extra_dict["params"] = {
"name": "{}-{}-{}-{}".format(
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"],
existing_vdu.get("count-index") or 0,
),
"description": existing_vdu["vdu-name"],