projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Descriptor Unification"
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwnsm
/
rift
/
tasklets
/
rwnsmtasklet
/
openmano_nsm.py
diff --git
a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
index
ddc4c9b
..
e4c5f93
100644
(file)
--- 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):
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
self._log = log
self._loop = loop
self._cli_api = cli_api
@@
-164,6
+164,8
@@
class OpenmanoVnfr(object):
self._created = False
self._created = False
+ self.nsd = nsd
+
@property
def vnfd(self):
return rift2openmano.RiftVNFD(self._vnfr.vnfd)
@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)
@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
return openmano_vnfd
@property
@@
-430,7
+432,7
@@
class OpenmanoNsr(object):
@asyncio.coroutine
def add_vnfr(self, vnfr):
@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)
yield from vnfr.create()
self._vnfrs.append(vnfr)