projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RIFT 16501 get-package-endpoint now requires a valid package-type.
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwpkgmgr
/
rift
/
tasklets
/
rwpkgmgr
/
rpc.py
diff --git
a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py
b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py
index
a71f108
..
5c3303f
100644
(file)
--- a/
rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py
+++ b/
rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py
@@
-56,8
+56,9
@@
class EndpointDiscoveryRpcHandler(mano_dts.AbstractRpcHandler):
def callback(self, ks_path, msg):
"""Forwards the request to proxy.
"""
def callback(self, ks_path, msg):
"""Forwards the request to proxy.
"""
+
url = yield from self.proxy.endpoint(
url = yield from self.proxy.endpoint(
- msg.package_type,
+ msg.package_type
if msg.has_field('package_type') else ""
,
msg.package_id)
rpc_op = RPC_PKG_ENDPOINT.from_dict({"endpoint": url})
msg.package_id)
rpc_op = RPC_PKG_ENDPOINT.from_dict({"endpoint": url})
@@
-192,10
+193,13
@@
class PackageDeleteOperationsRpcHandler(mano_dts.AbstractRpcHandler):
rpc_op = RPC_PACKAGE_DELETE_ENDPOINT.from_dict({"status": str(True)})
try:
rpc_op = RPC_PACKAGE_DELETE_ENDPOINT.from_dict({"status": str(True)})
try:
+ package_file_type = msg.vnfd_file_type.lower() \
+ if msg.package_type == 'VNFD' else msg.nsd_file_type.lower()
self.proxy.package_file_delete(
msg.package_type,
msg.package_id,
self.proxy.package_file_delete(
msg.package_type,
msg.package_id,
- msg.package_path)
+ msg.package_path,
+ package_file_type)
except Exception as e:
self.log.exception(e)
rpc_op.status = str(False)
except Exception as e:
self.log.exception(e)
rpc_op.status = str(False)