projects
/
osm
/
LCM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feature 1429 add n2vc key to all mgmt vdus
[osm/LCM.git]
/
osm_lcm
/
ns.py
diff --git
a/osm_lcm/ns.py
b/osm_lcm/ns.py
index
f9244e5
..
d54187d
100644
(file)
--- a/
osm_lcm/ns.py
+++ b/
osm_lcm/ns.py
@@
-216,6
+216,9
@@
class NsLcm(LcmBase):
"vnfs": {},
"networks": {},
}
"vnfs": {},
"networks": {},
}
+ if ns_params.get("vduImage"):
+ RO_ns_params["vduImage"] = ns_params["vduImage"]
+
if ns_params.get("ssh-authorized-key"):
RO_ns_params["cloud-config"] = {"key-pairs": ns_params["ssh-authorized-key"]}
if ns_params.get("vnf"):
if ns_params.get("ssh-authorized-key"):
RO_ns_params["cloud-config"] = {"key-pairs": ns_params["ssh-authorized-key"]}
if ns_params.get("vnf"):
@@
-544,6
+547,11
@@
class NsLcm(LcmBase):
step = db_nsr_update["detailed-status"] = "Checking instantiation parameters"
RO_ns_params = self.ns_params_2_RO(ns_params, nsd, needed_vnfd)
step = db_nsr_update["detailed-status"] = "Checking instantiation parameters"
RO_ns_params = self.ns_params_2_RO(ns_params, nsd, needed_vnfd)
+
+ n2vc_key = await self.n2vc.GetPublicKey()
+ RO_ns_params["mgmt_keys"] = [n2vc_key]
+ # TODO feature 1429. Add this option only to VMs with configuration and no password
+
step = db_nsr_update["detailed-status"] = "Creating ns at RO"
desc = await RO.create("ns", descriptor=RO_ns_params,
name=db_nsr["name"],
step = db_nsr_update["detailed-status"] = "Creating ns at RO"
desc = await RO.create("ns", descriptor=RO_ns_params,
name=db_nsr["name"],