projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added coverage tests in tox
[osm/NBI.git]
/
osm_nbi
/
instance_topics.py
diff --git
a/osm_nbi/instance_topics.py
b/osm_nbi/instance_topics.py
index
6ac3bce
..
7a6397a
100644
(file)
--- a/
osm_nbi/instance_topics.py
+++ b/
osm_nbi/instance_topics.py
@@
-34,6
+34,7
@@
__author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
class NsrTopic(BaseTopic):
topic = "nsrs"
topic_msg = "ns"
class NsrTopic(BaseTopic):
topic = "nsrs"
topic_msg = "ns"
+ quota_name = "ns_instances"
schema_new = ns_instantiate
def __init__(self, db, fs, msg, auth):
schema_new = ns_instantiate
def __init__(self, db, fs, msg, auth):
@@
-283,6
+284,9
@@
class NsrTopic(BaseTopic):
"ssh-authorized-key": ns_request.get("ssh_keys"), # TODO remove
}
ns_request["nsr_id"] = nsr_id
"ssh-authorized-key": ns_request.get("ssh_keys"), # TODO remove
}
ns_request["nsr_id"] = nsr_id
+ if ns_request and ns_request.get("config-units"):
+ nsr_descriptor["config-units"] = ns_request["config-units"]
+
# Create vld
if nsd.get("vld"):
nsr_descriptor["vld"] = nsd["vld"]
# Create vld
if nsd.get("vld"):
nsr_descriptor["vld"] = nsd["vld"]
@@
-309,9
+313,6
@@
class NsrTopic(BaseTopic):
additional_params, vnf_params = self._format_additional_params(ns_request,
member_vnf["member-vnf-index"],
descriptor=vnfd)
additional_params, vnf_params = self._format_additional_params(ns_request,
member_vnf["member-vnf-index"],
descriptor=vnfd)
- vnf_k8s_namespace = ns_k8s_namespace
- if vnf_params and vnf_params.get("k8s-namespace"):
- vnf_k8s_namespace = vnf_params["k8s-namespace"]
vnfr_descriptor = {
"id": vnfr_id,
"_id": vnfr_id,
vnfr_descriptor = {
"id": vnfr_id,
"_id": vnfr_id,
@@
-327,6
+328,12
@@
class NsrTopic(BaseTopic):
"connection-point": [],
"ip-address": None, # mgmt-interface filled by LCM
}
"connection-point": [],
"ip-address": None, # mgmt-interface filled by LCM
}
+ vnf_k8s_namespace = ns_k8s_namespace
+ if vnf_params:
+ if vnf_params.get("k8s-namespace"):
+ vnf_k8s_namespace = vnf_params["k8s-namespace"]
+ if vnf_params.get("config-units"):
+ vnfr_descriptor["config-units"] = vnf_params["config-units"]
# Create vld
if vnfd.get("internal-vld"):
# Create vld
if vnfd.get("internal-vld"):
@@
-390,6
+397,8
@@
class NsrTopic(BaseTopic):
"ip-address": None, # mgmt-interface filled by LCM
"k8s-cluster": {},
}
"ip-address": None, # mgmt-interface filled by LCM
"k8s-cluster": {},
}
+ if kdu_params and kdu_params.get("config-units"):
+ kdur["config-units"] = kdu_params["config-units"]
for k8s_type in ("helm-chart", "juju-bundle"):
if kdu.get(k8s_type):
kdur[k8s_type] = kdu_model or kdu[k8s_type]
for k8s_type in ("helm-chart", "juju-bundle"):
if kdu.get(k8s_type):
kdur[k8s_type] = kdu_model or kdu[k8s_type]
@@
-398,8
+407,8
@@
class NsrTopic(BaseTopic):
vnfr_descriptor["kdur"].append(kdur)
for vdu in vnfd.get("vdu", ()):
vnfr_descriptor["kdur"].append(kdur)
for vdu in vnfd.get("vdu", ()):
- additional_params,
_ = self._format_additional_params(ns_request, member_vnf["member-vnf-index"],
-
vdu_id=vdu["id"], descriptor=vnfd)
+ additional_params,
vdu_params = self._format_additional_params(
+
ns_request, member_vnf["member-vnf-index"],
vdu_id=vdu["id"], descriptor=vnfd)
vdur = {
"vdu-id-ref": vdu["id"],
# TODO "name": "" Name of the VDU in the VIM
vdur = {
"vdu-id-ref": vdu["id"],
# TODO "name": "" Name of the VDU in the VIM
@@
-409,6
+418,10
@@
class NsrTopic(BaseTopic):
"interfaces": [],
"additionalParams": additional_params
}
"interfaces": [],
"additionalParams": additional_params
}
+ if vdu_params and vdu_params.get("config-units"):
+ vdur["config-units"] = vdu_params["config-units"]
+ if deep_get(vdu, ("supplemental-boot-data", "boot-data-drive")):
+ vdur["boot-data-drive"] = vdu["supplemental-boot-data"]["boot-data-drive"]
if vdu.get("pdu-type"):
vdur["pdu-type"] = vdu["pdu-type"]
# TODO volumes: name, volume-id
if vdu.get("pdu-type"):
vdur["pdu-type"] = vdu["pdu-type"]
# TODO volumes: name, volume-id
@@
-1070,6
+1083,7
@@
class NsLcmOpTopic(BaseTopic):
class NsiTopic(BaseTopic):
topic = "nsis"
topic_msg = "nsi"
class NsiTopic(BaseTopic):
topic = "nsis"
topic_msg = "nsi"
+ quota_name = "slice_instances"
def __init__(self, db, fs, msg, auth):
BaseTopic.__init__(self, db, fs, msg, auth)
def __init__(self, db, fs, msg, auth):
BaseTopic.__init__(self, db, fs, msg, auth)
@@
-1420,7
+1434,9
@@
class NsiLcmOpTopic(BaseTopic):
if nstId == netslice_subnet["id"]:
nsd_id = netslice_subnet["nsd-ref"]
if nsd_id not in nsds:
if nstId == netslice_subnet["id"]:
nsd_id = netslice_subnet["nsd-ref"]
if nsd_id not in nsds:
- nsds[nsd_id] = self.db.get_one("nsds", {"id": nsd_id})
+ _filter = self._get_project_filter(session)
+ _filter["id"] = nsd_id
+ nsds[nsd_id] = self.db.get_one("nsds", _filter)
return nsds[nsd_id]
else:
raise EngineException("Invalid parameter nstId='{}' is not one of the "
return nsds[nsd_id]
else:
raise EngineException("Invalid parameter nstId='{}' is not one of the "