projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update requirements-dev.in to follow branch v12.0 instead of master
[osm/NBI.git]
/
osm_nbi
/
instance_topics.py
diff --git
a/osm_nbi/instance_topics.py
b/osm_nbi/instance_topics.py
index
d371216
..
176f86d
100644
(file)
--- a/
osm_nbi/instance_topics.py
+++ b/
osm_nbi/instance_topics.py
@@
-30,6
+30,7
@@
from osm_nbi.validation import (
ns_heal,
nsi_instantiate,
ns_migrate,
ns_heal,
nsi_instantiate,
ns_migrate,
+ ns_verticalscale,
)
from osm_nbi.base_topic import (
BaseTopic,
)
from osm_nbi.base_topic import (
BaseTopic,
@@
-895,7
+896,10
@@
class NsrTopic(BaseTopic):
vdur["internal-connection-point"].append(vdu_icp)
for iface in icp.get("virtual-network-interface-requirement", ()):
vdur["internal-connection-point"].append(vdu_icp)
for iface in icp.get("virtual-network-interface-requirement", ()):
- iface_fields = ("name", "mac-address")
+ # Name, mac-address and interface position is taken from VNFD
+ # and included into VNFR. By this way RO can process this information
+ # while creating the VDU.
+ iface_fields = ("name", "mac-address", "position")
vdu_iface = {
x: iface[x] for x in iface_fields if iface.get(x) is not None
}
vdu_iface = {
x: iface[x] for x in iface_fields if iface.get(x) is not None
}
@@
-1167,6
+1171,7
@@
class NsLcmOpTopic(BaseTopic):
"heal": ns_heal,
"terminate": ns_terminate,
"migrate": ns_migrate,
"heal": ns_heal,
"terminate": ns_terminate,
"migrate": ns_migrate,
+ "verticalscale": ns_verticalscale,
}
def __init__(self, db, fs, msg, auth):
}
def __init__(self, db, fs, msg, auth):
@@
-1488,7
+1493,7
@@
class NsLcmOpTopic(BaseTopic):
if in_vdu["id"] == vdu["id"]:
for volume in get_iterable(in_vdu.get("volume")):
for volumed in get_iterable(vdu.get("virtual-storage-desc")):
if in_vdu["id"] == vdu["id"]:
for volume in get_iterable(in_vdu.get("volume")):
for volumed in get_iterable(vdu.get("virtual-storage-desc")):
- if volumed
["id"]
== volume["name"]:
+ if volumed == volume["name"]:
break
else:
raise EngineException(
break
else:
raise EngineException(
@@
-1508,7
+1513,7
@@
class NsLcmOpTopic(BaseTopic):
):
vdu_if_names.add(iface.get("name"))
):
vdu_if_names.add(iface.get("name"))
- for in_iface in get_iterable(in_vdu
["interface"]
):
+ for in_iface in get_iterable(in_vdu
.get("interface")
):
if in_iface["name"] in vdu_if_names:
break
else:
if in_iface["name"] in vdu_if_names:
break
else: