projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
return op_id on asynchronous delete
[osm/NBI.git]
/
osm_nbi
/
instance_topics.py
diff --git
a/osm_nbi/instance_topics.py
b/osm_nbi/instance_topics.py
index
c9be059
..
d444116
100644
(file)
--- a/
osm_nbi/instance_topics.py
+++ b/
osm_nbi/instance_topics.py
@@
-18,7
+18,8
@@
from uuid import uuid4
from http import HTTPStatus
from time import time
from copy import copy, deepcopy
from http import HTTPStatus
from time import time
from copy import copy, deepcopy
-from osm_nbi.validation import validate_input, ValidationError, ns_instantiate, ns_action, ns_scale, nsi_instantiate
+from osm_nbi.validation import validate_input, ValidationError, ns_instantiate, ns_terminate, ns_action, ns_scale,\
+ nsi_instantiate
from osm_nbi.base_topic import BaseTopic, EngineException, get_iterable, deep_get
# from descriptor_topics import DescriptorTopic
from yaml import safe_dump
from osm_nbi.base_topic import BaseTopic, EngineException, get_iterable, deep_get
# from descriptor_topics import DescriptorTopic
from yaml import safe_dump
@@
-240,7
+241,7
@@
class NsrTopic(BaseTopic):
"deploymentStatus": None,
"configurationStatus": None,
"vcaStatus": None,
"deploymentStatus": None,
"configurationStatus": None,
"vcaStatus": None,
- "nsd":
nsd
,
+ "nsd":
{k: v for k, v in nsd.items() if k in ("vld", "_id", "id", "constituent-vnfd", "name")}
,
"datacenter": ns_request["vimAccountId"],
"resource-orchestrator": "osmopenmano",
"description": ns_request.get("nsDescription", ""),
"datacenter": ns_request["vimAccountId"],
"resource-orchestrator": "osmopenmano",
"description": ns_request.get("nsDescription", ""),
@@
-270,10
+271,7
@@
class NsrTopic(BaseTopic):
ns_request["nsr_id"] = nsr_id
# Create vld
if nsd.get("vld"):
ns_request["nsr_id"] = nsr_id
# Create vld
if nsd.get("vld"):
- nsr_descriptor["vld"] = []
- for nsd_vld in nsd.get("vld"):
- nsr_descriptor["vld"].append(
- {key: nsd_vld[key] for key in ("id", "vim-network-name", "vim-network-id") if key in nsd_vld})
+ nsr_descriptor["vld"] = nsd["vld"]
# Create VNFR
needed_vnfds = {}
# Create VNFR
needed_vnfds = {}
@@
-485,7
+483,7
@@
class NsLcmOpTopic(BaseTopic):
"instantiate": ns_instantiate,
"action": ns_action,
"scale": ns_scale,
"instantiate": ns_instantiate,
"action": ns_action,
"scale": ns_scale,
- "terminate":
Non
e,
+ "terminate":
ns_terminat
e,
}
def __init__(self, db, fs, msg, auth):
}
def __init__(self, db, fs, msg, auth):
@@
-984,7
+982,7
@@
class NsLcmOpTopic(BaseTopic):
try:
# Override descriptor with query string kwargs
try:
# Override descriptor with query string kwargs
- self._update_input_with_kwargs(indata, kwargs)
+ self._update_input_with_kwargs(indata, kwargs
, yaml_format=True
)
operation = indata["lcmOperationType"]
nsInstanceId = indata["nsInstanceId"]
operation = indata["lcmOperationType"]
nsInstanceId = indata["nsInstanceId"]