From 1d06252b7d0c997bde9b379177e7bb08392f9125 Mon Sep 17 00:00:00 2001 From: Felipe Vicens Date: Thu, 6 Jun 2019 02:26:02 +0200 Subject: [PATCH] Fix bug #677 osm nsi-op-list name' and 'osm nsi-op-show id' returns null Change-Id: If7c330bef21613916ffd3bdd12b1962f8f7877e8 Signed-off-by: Felipe Vicens --- entrypoint.sh | 0 instancehandler/template/instance_operations_list.html | 4 ++-- lib/osm/osmclient/clientv2.py | 2 +- static/src/instancehandler/instance_operations_list.js | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) mode change 100644 => 100755 entrypoint.sh diff --git a/entrypoint.sh b/entrypoint.sh old mode 100644 new mode 100755 diff --git a/instancehandler/template/instance_operations_list.html b/instancehandler/template/instance_operations_list.html index 1568717..3f54f1f 100644 --- a/instancehandler/template/instance_operations_list.html +++ b/instancehandler/template/instance_operations_list.html @@ -153,7 +153,7 @@ "render": function (data, type, row) { return '
\n' + ' \n' + @@ -178,4 +178,4 @@ {% block footer %} {% include "footer.html" %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/lib/osm/osmclient/clientv2.py b/lib/osm/osmclient/clientv2.py index 384eeaa..95b4b97 100644 --- a/lib/osm/osmclient/clientv2.py +++ b/lib/osm/osmclient/clientv2.py @@ -1092,7 +1092,7 @@ class Client(object): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/json", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nsilcm/v1/nsi_lcm_op_occs/?nsInstanceId={1}".format(self._base_path, id) + _url = "{0}/nsilcm/v1/nsi_lcm_op_occs/?netsliceInstanceId={1}".format(self._base_path, id) try: r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) diff --git a/static/src/instancehandler/instance_operations_list.js b/static/src/instancehandler/instance_operations_list.js index d85ebcf..5341c89 100644 --- a/static/src/instancehandler/instance_operations_list.js +++ b/static/src/instancehandler/instance_operations_list.js @@ -15,8 +15,8 @@ */ -function showOperationDetails(instance_id, operation_id) { - var url_info = '/instances/ns/'+instance_id+'/operation/' + operation_id; +function showOperationDetails(type, instance_id, operation_id) { + var url_info = '/instances/'+type+'/'+instance_id+'/operation/' + operation_id; var dialog = bootbox.dialog({ message: '
Loading...
', closeButton: true @@ -72,4 +72,4 @@ $(document).ready(function () { }, json_editor_settings); -}); \ No newline at end of file +}); -- 2.25.1