fix error propagation
Change-Id: I3bfa092c9f7f67fd237edb5c770d4fe4f47a1ccd
Signed-off-by: lombardofr <lombardo@everyup.it>
diff --git a/instancehandler/template/modal/instance_create_nsi.html b/instancehandler/template/modal/instance_create_nsi.html
index 21b410a..35e11e1 100644
--- a/instancehandler/template/modal/instance_create_nsi.html
+++ b/instancehandler/template/modal/instance_create_nsi.html
@@ -6,7 +6,7 @@
<span aria-hidden="true">×</span></button>
<h4 class="modal-title">New NSI</h4>
</div>
- <form id="formCreateNS" action='{% url "instances:create" type='nsi' %}'
+ <form id="formCreateNSI" action='{% url "instances:create" type='nsi' %}'
class="form-horizontal"
method="post" enctype="multipart/form-data">
{% csrf_token %}
diff --git a/instancehandler/views.py b/instancehandler/views.py
index bdc85a7..edf0da1 100644
--- a/instancehandler/views.py
+++ b/instancehandler/views.py
@@ -165,10 +165,14 @@
ns_data['wimAccountId'] = get_wim_account_id(wim_account)
except Exception as e:
- request.session["OSM_ERROR"] = "Error creating the NS; Invalid parameters provided."
- return __response_handler(request, {}, 'instances:list', to_redirect=True, type='ns', )
+ return __response_handler(request, {'status': 400, 'code': 'BAD_REQUEST', 'detail': e.message} , url=None, status=400)
result = client.ns_create(user.get_token(), ns_data)
- return __response_handler(request, result, 'instances:list', to_redirect=True, type='ns')
+ print result
+ if result['error']:
+ return __response_handler(request, result['data'], url=None,
+ status=result['data']['status'] if 'status' in result['data'] else 500)
+ else:
+ return __response_handler(request, {}, url=None, status=200)
elif type == 'nsi':
try:
@@ -245,11 +249,14 @@
raise ValueError("Error 'additionalParamsForSubnet' items must contain "
"'additionalParamsForNs' and/or 'additionalParamsForVnf'")
except Exception as e:
- request.session["OSM_ERROR"] = "Error creating the NSI; Invalid parameters provided."
- return __response_handler(request, {}, 'instances:list', to_redirect=True, type=type)
+ return __response_handler(request, {'status': 400, 'code': 'BAD_REQUEST', 'detail': e.message} , url=None, status=400)
result = client.nsi_create(user.get_token(), nsi_data)
- return __response_handler(request, result, 'instances:list', to_redirect=True, type=type)
+ if result['error']:
+ return __response_handler(request, result['data'], url=None,
+ status=result['data']['status'] if 'status' in result['data'] else 500)
+ else:
+ return __response_handler(request, {}, url=None, status=200)
elif type == 'pdu':
interface_param_name = request.POST.getlist('interfaces_name')
diff --git a/lib/osm/osm_util.py b/lib/osm/osm_util.py
index 6296d78..acc4726 100644
--- a/lib/osm/osm_util.py
+++ b/lib/osm/osm_util.py
@@ -155,7 +155,7 @@
"monitoring-param": [],
"internal-connection-point": [],
"image": "ubuntu",
- "cloud-init-file": "",
+ #"cloud-init-file": "",
"vm-flavor": {},
"interface": [],
"id": element_id,
diff --git a/lib/osm/osmclient/clientv2.py b/lib/osm/osmclient/clientv2.py
index 2025277..52e20b7 100644
--- a/lib/osm/osmclient/clientv2.py
+++ b/lib/osm/osmclient/clientv2.py
@@ -49,7 +49,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -66,7 +66,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -85,7 +85,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -104,7 +104,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -121,7 +121,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.no_content:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
else:
result['data'] = Util.json_loads_byteified(r.text)
@@ -139,7 +139,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.no_content:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
else:
result['data'] = Util.json_loads_byteified(r.text)
@@ -156,7 +156,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -173,7 +173,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -190,7 +190,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -209,7 +209,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -228,7 +228,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.no_content:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -245,7 +245,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.no_content:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
else:
result['data'] = Util.json_loads_byteified(r.text)
@@ -262,7 +262,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -279,7 +279,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json2yaml(yaml.load(str(r.text)))
@@ -297,7 +297,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -317,7 +317,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -337,7 +337,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -354,7 +354,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -371,7 +371,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -388,7 +388,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -405,7 +405,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -423,7 +423,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.no_content:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
return result
@@ -480,7 +480,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -500,7 +500,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -520,7 +520,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -540,7 +540,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['data'] = r.json()
result['error'] = False
if r.status_code == requests.codes.conflict:
@@ -561,7 +561,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['data'] = r.json()
result['error'] = False
if r.status_code == requests.codes.conflict:
@@ -588,7 +588,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
if r.status_code == requests.codes.conflict:
result['data'] = "Invalid ID."
@@ -616,7 +616,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
if r.status_code == requests.codes.conflict:
result['data'] = "Invalid ID."
@@ -634,7 +634,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.no_content:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
return result
@@ -659,7 +659,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.no_content:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
else:
try:
@@ -690,7 +690,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.no_content:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
else:
try:
@@ -712,7 +712,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
tarf = StringIO.StringIO(r.content)
return tarf
@@ -729,7 +729,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
tarf = StringIO.StringIO(r.content)
return tarf
@@ -851,7 +851,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
return yaml.load(r.text)
else:
@@ -872,7 +872,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
return yaml.load(r.text)
else:
@@ -893,7 +893,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = r.text
else:
@@ -915,7 +915,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = r.text
else:
@@ -939,7 +939,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -957,7 +957,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -975,7 +975,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -992,7 +992,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -1010,7 +1010,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -1028,7 +1028,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -1047,7 +1047,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -1121,7 +1121,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -1138,7 +1138,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -1155,7 +1155,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -1172,7 +1172,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -1188,7 +1188,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
# result['data'] = Util.json_loads_byteified(r.text)
result['data'] = r.text
@@ -1205,7 +1205,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
# result['data'] = Util.json_loads_byteified(r.text)
result['data'] = r.text
@@ -1222,7 +1222,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -1239,7 +1239,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
@@ -1256,7 +1256,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.accepted:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
else:
result['data'] = r.text
@@ -1273,7 +1273,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.accepted:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
else:
result['data'] = r.text
@@ -1292,7 +1292,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -1310,7 +1310,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -1328,7 +1328,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -1347,7 +1347,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -1363,7 +1363,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -1379,7 +1379,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.accepted:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
else:
result['data'] = r.text
@@ -1397,7 +1397,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.ok:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
@@ -1415,7 +1415,7 @@
log.exception(e)
result['data'] = str(e)
return result
- if r.status_code == requests.codes.created:
+ if r.status_code in (200, 201, 202, 204):
result['error'] = False
result['data'] = Util.json_loads_byteified(r.text)
return result
diff --git a/netslicehandler/template/nst_list.html b/netslicehandler/template/nst_list.html
index 57e940f..dadde87 100644
--- a/netslicehandler/template/nst_list.html
+++ b/netslicehandler/template/nst_list.html
@@ -149,10 +149,13 @@
{
"render": function (data, type, row) {
return '<div class="btn-group">' +
+<<<<<<< Updated upstream
' <button type="button" class="btn btn-default" data-container="body"\n' +
'data-toggle="tooltip" data-placement="top" title="Instantiate NS"\n' +
'onclick="javascript:openModalCreateNSI({\'template_name\':\''+row["name"]+'\', \'template_id\':\''+row["_id"]+'\', \'project_id\':\'{{ project_id }}\',\'vim_list_url\': \'{% url "vims:list" %}\', \'nst_list_url\': \'{% url "netslices:list_templates" %}\'})">\n' +
'<i class="fa fa-paper-plane"></i></button>\n'+
+=======
+>>>>>>> Stashed changes
' <button type="button" class="btn btn-default"' +
' onclick="javascript:showNstDetails(\'' + row["_id"] + '\')"' +
' data-toggle="tooltip" data-placement="top" data-container="body" title="Open">' +
diff --git a/static/src/instancehandler/instance_create.js b/static/src/instancehandler/instance_create.js
index fd6ecfa..124fb05 100644
--- a/static/src/instancehandler/instance_create.js
+++ b/static/src/instancehandler/instance_create.js
@@ -14,6 +14,7 @@
limitations under the License.
*/
+
function openModalCreatePDU(args) {
var select2_groups = $('#pdu_vim_accounts').select2({
placeholder: 'Select Vims',
diff --git a/static/src/instancehandler/instance_list.js b/static/src/instancehandler/instance_list.js
index 5580bbf..d04f465 100644
--- a/static/src/instancehandler/instance_list.js
+++ b/static/src/instancehandler/instance_list.js
@@ -54,7 +54,7 @@
}
else {
dialog.modal('hide');
- location.reload();
+ table.ajax.reload();
}
},
error: function (result) {
@@ -100,7 +100,7 @@
}
else {
dialog.modal('hide');
- location.reload();
+ table.ajax.reload();
}
},
error: function (result) {
@@ -138,7 +138,7 @@
}
else {
dialog.modal('hide');
- location.reload();
+ table.ajax.reload();
}
},
error: function (error) {
@@ -265,6 +265,35 @@
$(document).on('click', '.interface-group .btn-add', addInterfaceGroup);
$(document).on('click', '.interface-group .btn-remove', removeInterfaceGroup);
+
+ $("#formCreateNS").submit(function (event) {
+ event.preventDefault(); //prevent default action
+ var post_url = $(this).attr("action"); //get form action url
+ var request_method = $(this).attr("method"); //get form GET/POST method
+ var form_data = new FormData(this); //Encode form elements for submission
+ $.ajax({
+ url: post_url,
+ type: request_method,
+ data: form_data,
+ headers: {
+ "Accept": 'application/json'
+ },
+ contentType: false,
+ processData: false
+ }).done(function (response, textStatus, jqXHR) {
+ table.ajax.reload();
+ $('#modal_new_instance').modal('hide');
+ }).fail(function (result) {
+ var data = result.responseJSON;
+ var title = "Error " + (data.code ? data.code : 'unknown');
+ var message = data.detail ? data.detail : 'No detail available.';
+ bootbox.alert({
+ title: title,
+ message: message
+ });
+ });
+ });
+
$("#formCreatePDU").submit(function (event) {
event.preventDefault(); //prevent default action
var post_url = $(this).attr("action"); //get form action url
diff --git a/static/src/netslicehandler/templates_list.js b/static/src/netslicehandler/templates_list.js
index 813b395..7c52fe7 100644
--- a/static/src/netslicehandler/templates_list.js
+++ b/static/src/netslicehandler/templates_list.js
@@ -14,6 +14,35 @@
limitations under the License.
*/
+$(document).ready(function () {
+ $("#formCreateNSI").submit(function (event) {
+ event.preventDefault(); //prevent default action
+ var post_url = $(this).attr("action"); //get form action url
+ var request_method = $(this).attr("method"); //get form GET/POST method
+ var form_data = new FormData(this); //Encode form elements for submission
+ $.ajax({
+ url: post_url,
+ type: request_method,
+ data: form_data,
+ headers: {
+ "Accept": 'application/json'
+ },
+ contentType: false,
+ processData: false
+ }).done(function (response, textStatus, jqXHR) {
+ window.location.href = '/instances/nsi/list/'
+ }).fail(function (result) {
+ var data = result.responseJSON;
+ var title = "Error " + (data.code ? data.code : 'unknown');
+ var message = data.detail ? data.detail : 'No detail available.';
+ bootbox.alert({
+ title: title,
+ message: message
+ });
+ });
+ });
+});
+
function deleteTemplate(template_name, template_id) {
var url = '/netslices/templates/'+template_id+'/delete';
bootbox.confirm("Are you sure want to delete " + template_name + "?", function (result) {
diff --git a/static/src/packagehandler/packages_list.js b/static/src/packagehandler/packages_list.js
index 0eebca6..f7d5fcf 100644
--- a/static/src/packagehandler/packages_list.js
+++ b/static/src/packagehandler/packages_list.js
@@ -13,6 +13,37 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
+$(document).ready(function () {
+ $("#formCreateNS").submit(function (event) {
+ event.preventDefault(); //prevent default action
+ var post_url = $(this).attr("action"); //get form action url
+ var request_method = $(this).attr("method"); //get form GET/POST method
+ var form_data = new FormData(this); //Encode form elements for submission
+ $.ajax({
+ url: post_url,
+ type: request_method,
+ data: form_data,
+ headers: {
+ "Accept": 'application/json'
+ },
+ contentType: false,
+ processData: false
+ }).done(function (response, textStatus, jqXHR) {
+ window.location.href = '/instances/ns/list/';
+
+ }).fail(function (result) {
+ var data = result.responseJSON;
+ var title = "Error " + (data.code ? data.code : 'unknown');
+ var message = data.detail ? data.detail : 'No detail available.';
+ bootbox.alert({
+ title: title,
+ message: message
+ });
+ });
+ });
+
+
+});
function deletePackage(package_type, package_id, package_name) {
@@ -29,7 +60,7 @@
contentType: "application/json;charset=utf-8",
success: function (result) {
dialog.modal('hide');
- location.reload();
+ table.ajax.reload();
},
error: function (result) {
dialog.modal('hide');
@@ -61,7 +92,7 @@
contentType: "application/json;charset=utf-8",
success: function (result) {
dialog.modal('hide');
- location.reload();
+ table.ajax.reload();
},
error: function (result) {
dialog.modal('hide');