commit d72d6805ae03018254edb6608f9b193915495880
author jin xin <j00101220@huawei.com> Mon Sep 19 03:12:11 2016 +0000
committer Gerrit Code Review <gerrit@open-o.org> Mon Sep 19 03:12:11 2016 +0000
tree cfe0afa65acd6e2bfbe8574531ad47bf136cca8f
parent 043f605643e9de8c1bc2d6ae7719a518b05e6ec0
parent aaa5c732eb7094e1bd832ffc27f3d7ffd86e1f90

Merge "added auth UI code"

openo-portal/portal-lifecyclemgr/js/gsolcm.js

diff --git a/openo-portal/portal-lifecyclemgr/js/gsolcm.js b/openo-portal/portal-lifecyclemgr/js/gsolcm.js
index 9655691..d8c3fa1 100644
--- a/openo-portal/portal-lifecyclemgr/js/gsolcm.js
+++ b/openo-portal/portal-lifecyclemgr/js/gsolcm.js
@@ -282,8 +282,7 @@
     'nsdId': serviceInstance.serviceTemplateId,
     'nsName': serviceInstance.serviceName,
     'description': serviceInstance.serviceDescription,
-    'gatewayUri': gatewayUri,
-    'parameters': serviceInstance.serviceParameters
+    'gatewayUri': gatewayUri
   };
   var nsInstanceId;
   $.ajax({
@@ -396,15 +395,27 @@
 
 function deleteGsoServiceInstance(gatewayService, instanceId) {
     var gsoLcmUrl = '/openoapi/lifecyclemgr/v1/services/'+ instanceId;
-    return sendDeleteRequest(gatewayService, gsoLcmUrl);
+    var operation = 'DELETE';
+    return sendDeleteRequest(operation, gatewayService, gsoLcmUrl);
 }
 
 function deleteNfvoServiceInstance(gatewayService, instanceId) {
     var nfvoNsUrl = '/openoapi/nslcm/v1.0/ns/' + instanceId;
     var nfvoNsTerminateUrl = nfvoNsUrl +'/terminate';
-    var result = sendDeleteRequest(gatewayService, nfvoNsTerminateUrl);
+    var terminateParameter = {
+      'nsInstanceId': instanceId,
+      'terminationType': "graceful",
+      'gracefulTerminationTimeout': "60",
+      'operation': "POST",
+      'gatewayUri': nfvoNsTerminateUrl
+    };
+    var result = sendRequest(gatewayService, terminateParameter);
     if(result) {
-        result = sendDeleteRequest(gatewayService, nfvoNsUrl);
+      var serviceParameter = {
+          'operation': "DELETE",
+          'gatewayUri': nfvoNsUrl
+      };
+      result = sendRequest(gatewayService, serviceParameter);
     }
     return result;
 }
@@ -412,17 +423,25 @@
 function deleteSdnoServiceInstance(gatewayService, instanceId) {
     var sdnoNsUrl = '/openoapi/sdnonslcm/v1.0/ns/' + instanceId;
     var sdnoNsTerminateUrl = sdnoNsUrl + '/terminate';
-    var result = sendDeleteRequest(gatewayService, sdnoNsTerminateUrl);
+    var terminateParameter = {
+      'nsInstanceId': instanceId,
+      'terminationType': "graceful",
+      'gracefulTerminationTimeout': "60",
+      'operation': "POST",
+      'gatewayUri': sdnoNsTerminateUrl
+    };
+    var result = sendDeleteRequest(gatewayService, terminateParameter);
     if(result) {
-        result = sendDeleteRequest(gatewayService, sdnoNsUrl);
+      var serviceParameter = {
+        'operation': "DELETE",
+        'gatewayUri': sdnoNsUrl
+      };
+      result = sendDeleteRequest(gatewayService, serviceParameter);
     }
     return result;
 }
 
-function sendDeleteRequest(gatewayService, url) {
-    var parameter = {
-        URL: url
-    };
+function sendDeleteRequest(gatewayService, parameter) {
     var result = false;
     $.ajax({
         type : "DELETE",