projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 2281: Healing operation Failing for Dual stack IP feature
[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
6cab53a
..
317579b
100644
(file)
--- a/
NG-RO/osm_ng_ro/ns.py
+++ b/
NG-RO/osm_ng_ro/ns.py
@@
-737,9
+737,11
@@
class Ns(object):
# Pinning policy "ISOLATE" uses cores as host should not support SMT architecture
# Pinning policy "PREFER" uses threads in case host supports SMT architecture
numa[
# Pinning policy "ISOLATE" uses cores as host should not support SMT architecture
# Pinning policy "PREFER" uses threads in case host supports SMT architecture
numa[
- "cores"
- if guest_epa_quota.get("cpu-thread-pinning-policy") == "ISOLATE"
- else "threads"
+ (
+ "cores"
+ if guest_epa_quota.get("cpu-thread-pinning-policy") == "ISOLATE"
+ else "threads"
+ )
] = max(vcpu_count, 1)
local_epa_vcpu_set = True
] = max(vcpu_count, 1)
local_epa_vcpu_set = True
@@
-1999,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"]
@@
-3393,9
+3399,9
@@
class Ns(object):
return_data = {
"status": global_status,
return_data = {
"status": global_status,
- "details":
". ".join(details)
- if details
-
else "progress {}/{}".format(done, total
),
+ "details":
(
+ ". ".join(details) if details else "progress {}/{}".format(done, total)
+ ),
"nsr_id": nsr_id,
"action_id": action_id,
"tasks": task_list,
"nsr_id": nsr_id,
"action_id": action_id,
"tasks": task_list,