replace all fixed wiremock ports

[so.git] / bpmn / mso-infrastructure-bpmn / src / test / java / org / onap / so / bpmn / common / OofHomingTestIT.java

diff --git a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/OofHomingTestIT.java b/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/OofHomingTestIT.java
index 398efb9..390f529 100644 (file)
--- a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/OofHomingTestIT.java
+++ b/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/OofHomingTestIT.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -34,7 +36,8 @@ import org.onap.so.bpmn.core.domain.ServiceDecomposition;
 import org.onap.so.bpmn.core.domain.ServiceInstance;
 import org.onap.so.bpmn.core.domain.VnfResource;
 import org.onap.so.bpmn.mock.FileUtil;
-import org.onap.so.logger.MsoLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -56,7 +59,7 @@ import static org.onap.so.bpmn.mock.StubResponseOof.mockOof_500;
 @Ignore
 public class OofHomingTestIT extends BaseIntegrationTest {
 
-       MsoLogger logger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL,CreateAAIVfModuleIT.class);
+       Logger logger = LoggerFactory.getLogger(CreateAAIVfModuleIT.class);
 
     ServiceDecomposition serviceDecomposition = new ServiceDecomposition();
     String subscriber = "";
@@ -261,7 +264,7 @@ public class OofHomingTestIT extends BaseIntegrationTest {
         vnfModel.setModelType("testModelTypeVNF");
         vnf.setModelInfo(vnfModel);
         vnfList.add(vnf);
-        logger.debug("SERVICE DECOMP: " + serviceDecomposition.getServiceResourcesJsonString());
+        logger.debug("SERVICE DECOMP: {}", serviceDecomposition.getServiceResourcesJsonString());
         serviceDecomposition.setModelInfo(sModel);
         serviceDecomposition.setAllottedResources(arList);
         serviceDecomposition.setVnfResources(vnfList);
@@ -276,7 +279,7 @@ public class OofHomingTestIT extends BaseIntegrationTest {
 
     public void testHoming_success_2AR1Vnf() throws Exception {
 
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
@@ -329,7 +332,7 @@ public class OofHomingTestIT extends BaseIntegrationTest {
 
     public void testHoming_success_2AR1Vnf2Net() throws Exception {
 
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
@@ -406,7 +409,7 @@ public class OofHomingTestIT extends BaseIntegrationTest {
     public void testHoming_success_vnfResourceList() throws Exception {
 
         // Create a Service Decomposition
-        MockGetServiceResourcesCatalogDataByModelUuid("2f7f309d-c842-4644-a2e4-34167be5eeb4",
+        MockGetServiceResourcesCatalogDataByModelUuid(wireMockServer, "2f7f309d-c842-4644-a2e4-34167be5eeb4",
                 "/BuildingBlocks/oofCatalogResp.json");
         String busKey = UUID.randomUUID().toString();
         Map<String, Object> vars = new HashMap<>();
@@ -416,14 +419,13 @@ public class OofHomingTestIT extends BaseIntegrationTest {
 
         ServiceDecomposition sd = (ServiceDecomposition) getVariableFromHistory(busKey,
                 "serviceDecomposition");
-        logger.debug("In testHoming_success_vnfResourceList, ServiceDecomposition = " + sd);
+        logger.debug("In testHoming_success_vnfResourceList, ServiceDecomposition = {}", sd);
         List<VnfResource> vnfResourceList = sd.getVnfResources();
-//logger.debug(" vnfResourceList = " + vnfResourceList);
         vnfResourceList.get(0).setResourceId("test-resource-id-000");
 
         // Invoke Homing
 
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
@@ -454,29 +456,27 @@ public class OofHomingTestIT extends BaseIntegrationTest {
                 "WorkflowException");
         ServiceDecomposition serviceDecompositionExp = (ServiceDecomposition) getVariableFromHistory(businessKey,
                 "serviceDecomposition");
-        logger.debug("serviceDecompositionExp is: " + serviceDecompositionExp);
+        logger.debug("serviceDecompositionExp is: {}", serviceDecompositionExp);
 
         Resource resourceVnf = serviceDecompositionExp.getServiceResource("test-resource-id-000");
-        logger.debug("resourceVnf is: " + resourceVnf);
+        logger.debug("resourceVnf is: {}", resourceVnf);
         HomingSolution resourceVnfHoming = resourceVnf.getHomingSolution();
 
         String resourceVnfHomingString = resourceVnfHoming.toString();
-        logger.debug("resourceVnfHomingString is: " + resourceVnfHomingString);
+        logger.debug("resourceVnfHomingString is: {}", resourceVnfHomingString);
         resourceVnfHomingString = resourceVnfHomingString.replaceAll("\\s+", " ");
-        logger.debug("Now resourceVnfHomingString is: " + resourceVnfHomingString);
+        logger.debug("Now resourceVnfHomingString is: {}", resourceVnfHomingString);
 
         assertNull(workflowException);
 
         //Verify request
         String oofRequest = (String) getVariableFromHistory(businessKey, "oofRequest");
-        logger.debug("oofRequest is: " + oofRequest);
+        logger.debug("oofRequest is: {}", oofRequest);
         assertEquals(FileUtil.readResourceFile("__files/BuildingBlocks/oofRequest_infravnf").
                 replaceAll("\n", "").replaceAll("\r", "").
                 replaceAll("\t", ""), oofRequest.replaceAll("\n", "").
                 replaceAll("\r", "").replaceAll("\t", ""));
 
-        //logger.debug("resourceVnfHoming.getVnf().getResourceId() is: " + resourceVnfHoming.getVnf().getResourceId());
-
         assertEquals(homingSolutionService("service", "service-instance-01234",
                 "MDTNJ01", "test-resource-id-000","CloudOwner",
                 "mtmnj1a",
@@ -489,7 +489,7 @@ public class OofHomingTestIT extends BaseIntegrationTest {
     @Test
     public void testHoming_success_existingLicense() throws Exception {
 
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<String, Object>();
@@ -539,7 +539,6 @@ public class OofHomingTestIT extends BaseIntegrationTest {
     }
 
     @Test
-
     public void testHoming_error_inputVariable() throws Exception {
 
         String businessKey = UUID.randomUUID().toString();
@@ -561,7 +560,7 @@ public class OofHomingTestIT extends BaseIntegrationTest {
     @Test
 
     public void testHoming_error_badResponse() throws Exception {
-        mockOof_500();
+        mockOof_500(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
@@ -582,7 +581,7 @@ public class OofHomingTestIT extends BaseIntegrationTest {
     @Test
 
     public void testHoming_error_oofNoSolution() throws Exception {
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
@@ -605,7 +604,7 @@ public class OofHomingTestIT extends BaseIntegrationTest {
     @Test
 
     public void testHoming_error_oofPolicyException() throws Exception {
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();
@@ -629,7 +628,7 @@ public class OofHomingTestIT extends BaseIntegrationTest {
     @Test
 
     public void testHoming_error_oofServiceException() throws Exception {
-        mockOof();
+        mockOof(wireMockServer);
 
         String businessKey = UUID.randomUUID().toString();
         Map<String, Object> variables = new HashMap<>();