Merge "Templates: show correct values of sdnc-preload, volume-group name"

[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 790f798..ac6eeea 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================\r
  * VID\r
  * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -42,7 +42,7 @@ var MsoService = function($http, $log, $q, PropertyService, AaiService, UtilityS
         if (response.data.status < 200 || response.data.status > 202) {\r
             throw {\r
                 type : FIELD.ID.MSO_FAILURE\r
-            }\r
+            };\r
         }\r
     };\r
 \r
@@ -172,7 +172,7 @@ var MsoService = function($http, $log, $q, PropertyService, AaiService, UtilityS
         getFormattedCommonResponse : function(response) {\r
             return UtilityService.getCurrentTime() + " HTTP Status: "\r
                 + UtilityService.getHttpStatusText(response.data.status)\r
-                + "\n" + angular.toJson(response.data.entity, true)\r
+                + "\n" + angular.toJson(response.data.entity, true);\r
 \r
         },\r
         checkValidStatus : checkValidStatus,\r
@@ -326,7 +326,7 @@ var MsoService = function($http, $log, $q, PropertyService, AaiService, UtilityS
                 $log.debug("model info from instance", instance);\r
                 $log.debug("model info to model", modelInfo);\r
 \r
-                return modelInfo\r
+                return modelInfo;\r
             };\r
 \r
             var payload = {\r
@@ -341,7 +341,8 @@ var MsoService = function($http, $log, $q, PropertyService, AaiService, UtilityS
                         "modelCustomizationName": requestParams.configurationModelInfo.modelCustomizationName\r
                     },\r
                     "cloudConfiguration": {\r
-                        "lcpCloudRegionId": requestParams.portMirroringConfigFields.lcpRegion.value\r
+                        "lcpCloudRegionId": requestParams.portMirroringConfigFields.cloudRegionId,\r
+                        "cloudOwner" : requestParams.portMirroringConfigFields.cloudOwner\r
                     },\r
                     "requestInfo": {\r
                         "instanceName": requestParams.portMirroringConfigFields.instanceName.value,\r
@@ -551,8 +552,27 @@ var MsoService = function($http, $log, $q, PropertyService, AaiService, UtilityS
                 requestParams.serviceInstanceId,\r
                 ''\r
             ].join(COMPONENT.FORWARD_SLASH), payload);\r
+        },\r
+        activateFabricConfiguration: function(requestParams) {\r
+            var payload = buildPayloadForActivateFabricConfiguration(requestParams.model, requestParams.userId);\r
+\r
+            var url = COMPONENT.MSO_ACTIVATE_FABRIC_CONFIGURATION_INSTANCE.replace('@serviceInstanceId', requestParams.serviceInstanceId);\r
+            return sendPostRequest(url, payload);\r
+        },\r
+        deactivateAndCloudDelete : function (requestParams)  {\r
+            var payload = {\r
+                tenantId: requestParams.tenantId,\r
+                lcpCloudRegionId: requestParams.lcpCloudRegionId,\r
+                userId: requestParams.userId\r
+            };\r
+\r
+            var url = COMPONENT.MSO_DEACTIVATE_AND_CLOUD_DELETE_INSTANCE.replace('@serviceInstanceId', requestParams.serviceInstanceId)\r
+                        .replace('@vnfInstanceId', requestParams.vnfInstanceId)\r
+                        .replace('@vfModuleInstanceId', requestParams.vfModuleInstanceId);\r
+\r
+            return sendPostRequestWithBody(url, payload);\r
         }\r
-    }\r
+    };\r
 };\r
 \r
 appDS2.factory("MsoService", MsoService );\r