X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwlaunchpad%2Fplugins%2Frwnsm%2Frift%2Ftasklets%2Frwnsmtasklet%2Fopenmano_nsm.py;fp=rwlaunchpad%2Fplugins%2Frwnsm%2Frift%2Ftasklets%2Frwnsmtasklet%2Fopenmano_nsm.py;h=e4c5f93fa6f08da1cb469521317a7daac97c9b65;hb=4e5c3543f4a3681141a706919984efc36b5be252;hp=ddc4c9baeb7922ffbdfdb2c2b10a3d1f7d2f35b7;hpb=f027e7263e0c1e1dfa28d9b4cfd4a747e7f29db9;p=osm%2FSO.git diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py index ddc4c9ba..e4c5f93f 100644 --- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py +++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py @@ -153,7 +153,7 @@ class VnfrConsoleOperdataDtsHandler(object): class OpenmanoVnfr(object): - def __init__(self, log, loop, cli_api, vnfr): + def __init__(self, log, loop, cli_api, vnfr, nsd): self._log = log self._loop = loop self._cli_api = cli_api @@ -164,6 +164,8 @@ class OpenmanoVnfr(object): self._created = False + self.nsd = nsd + @property def vnfd(self): return rift2openmano.RiftVNFD(self._vnfr.vnfd) @@ -183,7 +185,7 @@ class OpenmanoVnfr(object): @property def openmano_vnfd(self): self._log.debug("Converting vnfd %s from rift to openmano", self.vnfd.id) - openmano_vnfd = rift2openmano.rift2openmano_vnfd(self.vnfd) + openmano_vnfd = rift2openmano.rift2openmano_vnfd(self.vnfd, self.nsd) return openmano_vnfd @property @@ -430,7 +432,7 @@ class OpenmanoNsr(object): @asyncio.coroutine def add_vnfr(self, vnfr): - vnfr = OpenmanoVnfr(self._log, self._loop, self._cli_api, vnfr) + vnfr = OpenmanoVnfr(self._log, self._loop, self._cli_api, vnfr, nsd=self.nsd) yield from vnfr.create() self._vnfrs.append(vnfr)