Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / services / msoService.js

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/msoService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/msoService.js
index 273f8e9..790f798 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/msoService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/msoService.js
@@ -80,6 +80,30 @@ var MsoService = function($http, $log, $q, PropertyService, AaiService, UtilityS
 \r
     };\r
 \r
+    var buildPayloadForActivateFabricConfiguration = function (model, userId) {\r
+        var requestDetails = {\r
+            "modelInfo": {\r
+                "modelType": "service",\r
+                "modelInvariantId": model.service.invariantUuid,\r
+                "modelVersionId": model.service.uuid,\r
+                "modelName": model.service.name,\r
+                "modelVersion": model.service.version\r
+            },\r
+            "requestInfo": {\r
+                "source": "VID",\r
+                "requestorId": userId\r
+            },\r
+            "requestParameters": {\r
+                "aLaCarte": false\r
+            }\r
+        };\r
+\r
+        $log.debug("Service Activate Fabric Configuration payload", requestDetails);\r
+\r
+        return requestDetails;\r
+\r
+    };\r
+\r
     var activateInstance = function(requestParams) {\r
         var requestDetails = buildPayloadForServiceActivateDeactivate(requestParams.model, requestParams.userId);\r
 \r
@@ -94,12 +118,10 @@ var MsoService = function($http, $log, $q, PropertyService, AaiService, UtilityS
             requestDetails);\r
     };\r
 \r
-    var sendPostRequest = function(url, requestDetails) {\r
+    var sendPostRequestWithBody = function(url, requestBody) {\r
         var deferred = $q.defer();\r
         if (url) {\r
-            $http.post(url, {\r
-                requestDetails: requestDetails\r
-            }, {\r
+            $http.post(url, requestBody, {\r
                 timeout: PropertyService.getServerResponseTimeoutMsec()\r
             }).success(function (response) {\r
                 deferred.resolve({data: response});\r
@@ -111,9 +133,16 @@ var MsoService = function($http, $log, $q, PropertyService, AaiService, UtilityS
         return deferred.promise;\r
     };\r
 \r
+    var sendPostRequest = function(url, requestDetails) {\r
+        return sendPostRequestWithBody(url, {requestDetails: requestDetails});\r
+    };\r
+\r
     return {\r
         createInstance : requestInstanceUpdate,\r
         deleteInstance : requestInstanceUpdate,\r
+        createAndDeleteInstance: function(requestParams)  {\r
+            return sendPostRequest("mso/" + requestParams.url, requestParams.requestDetails);\r
+        },\r
         getOrchestrationRequest : function(requestId, successCallbackFunction) {\r
             $log.debug("MsoService:getOrchestrationRequest: requestId: "\r
                 + requestId);\r
@@ -312,7 +341,6 @@ var MsoService = function($http, $log, $q, PropertyService, AaiService, UtilityS
                         "modelCustomizationName": requestParams.configurationModelInfo.modelCustomizationName\r
                     },\r
                     "cloudConfiguration": {\r
-                        // "tenantId": ????\r
                         "lcpCloudRegionId": requestParams.portMirroringConfigFields.lcpRegion.value\r
                     },\r
                     "requestInfo": {\r