Merge 1806 code of vid-common

Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

1 files changed, 74 insertions, 78 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/rest/MsoRestClientTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/rest/MsoRestClientTest.java
index e0ba55938..0cfc0be1c 100644
--- a/vid-app-common/src/test/java/org/onap/vid/mso/rest/MsoRestClientTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/mso/rest/MsoRestClientTest.java
@@ -1,78 +1,74 @@
-//package org.onap.vid.mso.rest;
-//
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//import org.json.JSONObject;
-//import org.junit.Assert;
-//import org.onap.portalsdk.core.util.SystemProperties;
-//import org.onap.vid.changeManagement.RequestDetails;
-//import org.onap.vid.controller.LocalWebConfig;
-//import org.onap.vid.domain.mso.CloudConfiguration;
-//import org.onap.vid.domain.mso.ModelInfo;
-//import org.onap.vid.domain.mso.RequestInfo;
-//import org.onap.vid.domain.mso.RequestParameters;
-//import org.onap.vid.mso.MsoBusinessLogic;
-//import org.onap.vid.mso.MsoBusinessLogicImpl;
-//import org.onap.vid.mso.rest.MsoRestClientNew;
-//import org.springframework.test.context.ContextConfiguration;
-//import org.springframework.test.context.web.WebAppConfiguration;
-//import org.testng.annotations.Test;
-//
-//
-//@ContextConfiguration(classes = {LocalWebConfig.class, SystemProperties.class})
-//@WebAppConfiguration
-//public class MsoRestClientTest {
-//
-//
-//    private MsoBusinessLogic msoBusinessLogic = new MsoBusinessLogicImpl(new MsoRestClientNew());
-//    private ObjectMapper om = new ObjectMapper();
-//
-//    @Test
-//    public void createInPlaceMsoRequest() {
-//        String result = null;
-//        try {
-//            RequestDetails requestDetails = generateMockMsoRequest();
-//            result = om.writeValueAsString(msoBusinessLogic.generateInPlaceMsoRequest(requestDetails));
-//
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//
-//        }
-//        if (result == null) {
-//            Assert.fail("Failed to create mso request");
-//        }
-//        JSONObject jsonObj = new JSONObject(result);
-//        Assert.assertNotNull(jsonObj.getJSONObject("requestDetails"));
-//
-//
-//    }
-//
-//    private RequestDetails generateMockMsoRequest() {
-//        RequestDetails requestDetails = new RequestDetails();
-//        requestDetails.setVnfInstanceId("vnf-instance-id");
-//        requestDetails.setVnfName("vnf-name");
-//        CloudConfiguration cloudConfiguration = new CloudConfiguration();
-//        cloudConfiguration.setTenantId("tenant-id");
-//        cloudConfiguration.setLcpCloudRegionId("lcp-region");
-//        requestDetails.setCloudConfiguration(cloudConfiguration);
-//        ModelInfo modelInfo = new ModelInfo();
-//        modelInfo.setModelInvariantId("model-invarient-id");
-//        modelInfo.setModelCustomizationName("modelCustomizationName");
-//        requestDetails.setModelInfo(modelInfo);
-//        RequestInfo requestInfo = new RequestInfo();
-//        requestInfo.setRequestorId("ok883e");
-//        requestInfo.setSource("VID");
-//        requestDetails.setRequestInfo(requestInfo);
-//        RequestParameters requestParameters = new RequestParameters();
-//        requestParameters.setSubscriptionServiceType("subscriber-service-type");
-//        requestParameters.setAdditionalProperty("a", 1);
-//        requestParameters.setAdditionalProperty("b", 2);
-//        requestParameters.setAdditionalProperty("c", 3);
-//        requestParameters.setAdditionalProperty("d", 4);
-//        String payload = "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}";
-//        requestParameters.setAdditionalProperty("payload", payload);
-//
-//        requestDetails.setRequestParameters(requestParameters);
-//        return requestDetails;
-//    }
-//
-//}
+package org.onap.vid.mso.rest;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.json.JSONObject;
+import org.junit.Assert;
+import org.onap.vid.changeManagement.RequestDetails;
+import org.onap.vid.domain.mso.CloudConfiguration;
+import org.onap.vid.domain.mso.ModelInfo;
+import org.onap.vid.domain.mso.RequestInfo;
+import org.onap.vid.domain.mso.RequestParameters;
+import org.onap.vid.mso.MsoBusinessLogic;
+import org.onap.vid.mso.MsoBusinessLogicImpl;
+import org.onap.vid.mso.rest.MsoRestClientNew;
+import org.onap.vid.controllers.LocalWebConfig;
+import org.onap.portalsdk.core.util.SystemProperties;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.testng.annotations.Test;
+import org.togglz.core.manager.FeatureManager;
+
+
+@ContextConfiguration(classes = {LocalWebConfig.class, SystemProperties.class})
+@WebAppConfiguration
+public class MsoRestClientTest {
+
+
+    private MsoBusinessLogic msoBusinessLogic = new MsoBusinessLogicImpl(new MsoRestClientNew(), null);
+    private ObjectMapper om = new ObjectMapper();
+
+    @Test
+    public void createInPlaceMsoRequest() {
+        String result = null;
+        try {
+            RequestDetails requestDetails = generateMockMsoRequest();
+            result = om.writeValueAsString(msoBusinessLogic.generateInPlaceMsoRequest(requestDetails));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (result == null) {
+            Assert.fail("Failed to create mso request");
+        }
+        JSONObject jsonObj = new JSONObject(result);
+        Assert.assertNotNull(jsonObj.getJSONObject("requestDetails"));
+    }
+
+    private RequestDetails generateMockMsoRequest() {
+        RequestDetails requestDetails = new RequestDetails();
+        requestDetails.setVnfInstanceId("vnf-instance-id");
+        requestDetails.setVnfName("vnf-name");
+        CloudConfiguration cloudConfiguration = new CloudConfiguration();
+        cloudConfiguration.setTenantId("tenant-id");
+        cloudConfiguration.setLcpCloudRegionId("lcp-region");
+        requestDetails.setCloudConfiguration(cloudConfiguration);
+        ModelInfo modelInfo = new ModelInfo();
+        modelInfo.setModelInvariantId("model-invarient-id");
+        modelInfo.setModelCustomizationName("modelCustomizationName");
+        requestDetails.setModelInfo(modelInfo);
+        RequestInfo requestInfo = new RequestInfo();
+        requestInfo.setRequestorId("ok883e");
+        requestInfo.setSource("VID");
+        requestDetails.setRequestInfo(requestInfo);
+        RequestParameters requestParameters = new RequestParameters();
+        requestParameters.setSubscriptionServiceType("subscriber-service-type");
+        requestParameters.setAdditionalProperty("a", 1);
+        requestParameters.setAdditionalProperty("b", 2);
+        requestParameters.setAdditionalProperty("c", 3);
+        requestParameters.setAdditionalProperty("d", 4);
+        String payload = "{\"existing_software_version\": \"3.1\",\"new_software_version\": \"3.2\", \"operations_timeout\": \"3600\"}";
+        requestParameters.setAdditionalProperty("payload", payload);
+
+        requestDetails.setRequestParameters(requestParameters);
+        return requestDetails;
+    }
+}