From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 31 Dec 2018 17:21:27 +0200
Subject: Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../webapp/app/vid/scripts/services/msoService.js  | 38 +++++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

(limited to '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 273f8e9e3..790f79880 100755
--- 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
 
     };
 
+    var buildPayloadForActivateFabricConfiguration = function (model, userId) {
+        var requestDetails = {
+            "modelInfo": {
+                "modelType": "service",
+                "modelInvariantId": model.service.invariantUuid,
+                "modelVersionId": model.service.uuid,
+                "modelName": model.service.name,
+                "modelVersion": model.service.version
+            },
+            "requestInfo": {
+                "source": "VID",
+                "requestorId": userId
+            },
+            "requestParameters": {
+                "aLaCarte": false
+            }
+        };
+
+        $log.debug("Service Activate Fabric Configuration payload", requestDetails);
+
+        return requestDetails;
+
+    };
+
     var activateInstance = function(requestParams) {
         var requestDetails = buildPayloadForServiceActivateDeactivate(requestParams.model, requestParams.userId);
 
@@ -94,12 +118,10 @@ var MsoService = function($http, $log, $q, PropertyService, AaiService, UtilityS
             requestDetails);
     };
 
-    var sendPostRequest = function(url, requestDetails) {
+    var sendPostRequestWithBody = function(url, requestBody) {
         var deferred = $q.defer();
         if (url) {
-            $http.post(url, {
-                requestDetails: requestDetails
-            }, {
+            $http.post(url, requestBody, {
                 timeout: PropertyService.getServerResponseTimeoutMsec()
             }).success(function (response) {
                 deferred.resolve({data: response});
@@ -111,9 +133,16 @@ var MsoService = function($http, $log, $q, PropertyService, AaiService, UtilityS
         return deferred.promise;
     };
 
+    var sendPostRequest = function(url, requestDetails) {
+        return sendPostRequestWithBody(url, {requestDetails: requestDetails});
+    };
+
     return {
         createInstance : requestInstanceUpdate,
         deleteInstance : requestInstanceUpdate,
+        createAndDeleteInstance: function(requestParams)  {
+            return sendPostRequest("mso/" + requestParams.url, requestParams.requestDetails);
+        },
         getOrchestrationRequest : function(requestId, successCallbackFunction) {
             $log.debug("MsoService:getOrchestrationRequest: requestId: "
                 + requestId);
@@ -312,7 +341,6 @@ var MsoService = function($http, $log, $q, PropertyService, AaiService, UtilityS
                         "modelCustomizationName": requestParams.configurationModelInfo.modelCustomizationName
                     },
                     "cloudConfiguration": {
-                        // "tenantId": ????
                         "lcpCloudRegionId": requestParams.portMirroringConfigFields.lcpRegion.value
                     },
                     "requestInfo": {
-- 
cgit 1.2.3-korg