projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix project delete failures
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwvnfm
/
rift
/
tasklets
/
rwvnfmtasklet
/
rwvnfmtasklet.py
diff --git
a/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
b/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
index
abf73ae
..
a6277f1
100755
(executable)
--- a/
rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
+++ b/
rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
@@
-1219,7
+1219,7
@@
class VirtualNetworkFunctionRecord(object):
@staticmethod
def vnfd_xpath(vnfd_id):
""" VNFD xpath associated with this VNFR """
@staticmethod
def vnfd_xpath(vnfd_id):
""" VNFD xpath associated with this VNFR """
- return ("C,/
vnfd:vnfd-catalog/vnfd:vnfd[
vnfd:id = '{}']".
+ return ("C,/
project-vnfd:vnfd-catalog/project-vnfd:vnfd[project-
vnfd:id = '{}']".
format(vnfd_id))
@property
format(vnfd_id))
@property
@@
-1989,7
+1989,7
@@
class VirtualNetworkFunctionRecord(object):
class VnfdDtsHandler(object):
""" DTS handler for VNFD config changes """
class VnfdDtsHandler(object):
""" DTS handler for VNFD config changes """
- XPATH = "C,/
vnfd:vnfd-catalog/
vnfd:vnfd"
+ XPATH = "C,/
project-vnfd:vnfd-catalog/project-
vnfd:vnfd"
def __init__(self, dts, log, loop, vnfm):
self._dts = dts
def __init__(self, dts, log, loop, vnfm):
self._dts = dts
@@
-2025,8
+2025,9
@@
class VnfdDtsHandler(object):
@asyncio.coroutine
def on_prepare(dts, acg, xact, xact_info, ks_path, msg, scratch):
""" on prepare callback """
@asyncio.coroutine
def on_prepare(dts, acg, xact, xact_info, ks_path, msg, scratch):
""" on prepare callback """
- self._log.debug("Got on prepare for VNFD (path: %s) (action: %s)",
- ks_path.to_xpath(RwVnfmYang.get_schema()), msg)
+ self._log.debug("Got on prepare for VNFD (path: %s) (action: %s) (msg: %s)",
+ ks_path.to_xpath(RwVnfmYang.get_schema()),
+ xact_info.query_action, msg)
fref = ProtobufC.FieldReference.alloc()
fref.goto_whole_message(msg.to_pbcm())
fref = ProtobufC.FieldReference.alloc()
fref.goto_whole_message(msg.to_pbcm())
@@
-2621,7
+2622,7
@@
class VnfManager(object):
def deregister(self):
self.log.debug("De-register VNFM project {}".format(self.name))
for hdl in self._dts_handlers:
def deregister(self):
self.log.debug("De-register VNFM project {}".format(self.name))
for hdl in self._dts_handlers:
-
yield from
hdl.deregister()
+ hdl.deregister()
@asyncio.coroutine
def run(self):
@asyncio.coroutine
def run(self):