Reduce log noise/warnings format to conventions
[so.git] / mso-api-handlers / mso-api-handler-infra / src / test / java / org / openecomp / mso / apihandlerinfra / OrchestrationRequestsTest.java
index 5f2f396..04175fd 100644 (file)
@@ -22,6 +22,7 @@ package org.openecomp.mso.apihandlerinfra;
 import static org.junit.Assert.assertEquals;\r
 \r
 import static org.junit.Assert.assertFalse;\r
+\r
 import java.io.IOException;\r
 import javax.ws.rs.core.Response;\r
 \r
@@ -43,159 +44,159 @@ import org.openecomp.mso.apihandlerinfra.serviceinstancebeans.ServiceInstancesRe
 \r
 public class OrchestrationRequestsTest {\r
 \r
-       private static final String CHECK_HTML = "<!DOCTYPE html><html><head><meta charset=\"ISO-8859-1\"><title></title></head><body></body></html>";\r
-       public static final Response RESPONSE = Response.status(HttpStatus.SC_OK).entity(CHECK_HTML).build();\r
-       @Mock\r
-       private static RequestsDatabase db;\r
-       private static OrchestrationRequests orReq;\r
-       private static GetOrchestrationResponse orRes;\r
-\r
-       @Test\r
-       public void testGetOrchestrationRequest() {\r
-               orReq = Mockito.mock(OrchestrationRequests.class);\r
-               orRes = new GetOrchestrationResponse();\r
-               try {\r
-                       // create InfraActiveRequests object\r
-                       InfraActiveRequests infraRequests = new InfraActiveRequests();\r
-                       infraRequests.setRequestId("rq1234d1-5a33-55df-13ab-12abad84e333");\r
-                       infraRequests.setNetworkType("CONTRAIL30_BASIC");\r
-                       infraRequests.setRequestType("createInstance");\r
-                       infraRequests.setSource("VID");\r
-                       infraRequests.setTenantId("19123c2924c648eb8e42a3c1f14b7682");\r
-                       infraRequests.setServiceInstanceId("bc305d54-75b4-431b-adb2-eb6b9e546014");\r
-                       infraRequests.setRequestStatus("IN_PROGRESS");\r
-                       infraRequests.setRequestorId("ab1234");\r
-                       String body = "{\"modelInfo\":{\"modelInvariantId\":\"9771b085-4705-4bf7-815d-8c0627bb7e36\",\"modelType\":\"service\",\"modelName\":\"Service with VNFs with modules\",\"modelVersion\":\"1.0\"}}";            \r
-                       infraRequests.setRequestBody(body);\r
-       \r
-                       db = Mockito.mock(RequestsDatabase.class);\r
-                       Mockito.when(db.getRequestFromInfraActive(Mockito.anyString())).thenReturn(infraRequests);\r
-\r
-                       ///// mock mapInfraActiveRequestToRequest()\r
-                       Request request = new Request();\r
-                       request.setRequestId(infraRequests.getRequestId());\r
-                       request.setRequestScope(infraRequests.getRequestScope());\r
-                       request.setRequestType(infraRequests.getRequestAction());\r
-\r
-                       InstanceReferences ir = new InstanceReferences();\r
-                       if (infraRequests.getNetworkId() != null)\r
-                               ir.setNetworkInstanceId(infraRequests.getNetworkId());\r
-                       if (infraRequests.getNetworkName() != null)\r
-                               ir.setNetworkInstanceName(infraRequests.getNetworkName());\r
-                       if (infraRequests.getServiceInstanceId() != null)\r
-                               ir.setServiceInstanceId(infraRequests.getServiceInstanceId());\r
-                       if (infraRequests.getServiceInstanceName() != null)\r
-                               ir.setServiceInstanceName(infraRequests.getServiceInstanceName());\r
-                       if (infraRequests.getVfModuleId() != null)\r
-                               ir.setVfModuleInstanceId(infraRequests.getVfModuleId());\r
-                       if (infraRequests.getVfModuleName() != null)\r
-                               ir.setVfModuleInstanceName(infraRequests.getVfModuleName());\r
-                       if (infraRequests.getVnfId() != null)\r
-                               ir.setVnfInstanceId(infraRequests.getVnfId());\r
-                       if (infraRequests.getVnfName() != null)\r
-                               ir.setVnfInstanceName(infraRequests.getVnfName());\r
-                       if (infraRequests.getVolumeGroupId() != null)\r
-                               ir.setVolumeGroupInstanceId(infraRequests.getVolumeGroupId());\r
-                       if (infraRequests.getVolumeGroupName() != null)\r
-                               ir.setVolumeGroupInstanceName(infraRequests.getVolumeGroupName());\r
-                       if (infraRequests.getRequestorId() != null)\r
-                               ir.setRequestorId(infraRequests.getRequestorId());\r
-\r
-                       request.setInstanceReferences(ir);\r
-                       RequestStatus status = new RequestStatus();\r
-\r
-                       if (infraRequests.getRequestStatus() != null) {\r
-                               status.setRequestState(infraRequests.getRequestStatus());\r
-                       }\r
-\r
-                       request.setRequestStatus(status);\r
-               //      RequestStatus reqStatus = request.getRequestStatus();   \r
-                       orRes.setRequest(request);      \r
-                       Mockito.when(orReq.getOrchestrationRequest(Mockito.anyString(), Mockito.anyString())).thenReturn(RESPONSE);\r
-                       Response resp = orReq.getOrchestrationRequest("rq1234d1-5a33-55df-13ab-12abad84e333", "v3");\r
-                       \r
-                       assertEquals(db.getRequestFromInfraActive("rq1234d1-5a33-55df-13ab-12abad84e333").getRequestId(),\r
-                                       "rq1234d1-5a33-55df-13ab-12abad84e333");\r
-                       assertEquals(db.getRequestFromInfraActive("rq1234d1-5a33-55df-13ab-12abad84e333").getSource(), "VID");\r
-                       assertEquals(db.getRequestFromInfraActive("rq1234d1-5a33-55df-13ab-12abad84e333").getTenantId(),\r
-                                       "19123c2924c648eb8e42a3c1f14b7682");\r
-                       assertEquals(db.getRequestFromInfraActive("rq1234d1-5a33-55df-13ab-12abad84e333").getServiceInstanceId(),\r
-                                       "bc305d54-75b4-431b-adb2-eb6b9e546014");\r
-                       assertEquals(db.getRequestFromInfraActive("rq1234d1-5a33-55df-13ab-12abad84e333").getRequestStatus(),\r
-                                       "IN_PROGRESS");\r
-                       assertEquals(db.getRequestFromInfraActive("rq1234d1-5a33-55df-13ab-12abad84e333").getRequestorId(),\r
-                                       "ab1234");\r
-                       assertEquals(request.getInstanceReferences().getServiceInstanceId(),"bc305d54-75b4-431b-adb2-eb6b9e546014");\r
-                       assertEquals(request.getInstanceReferences().getRequestorId(),"ab1234");\r
-                       assertEquals(orRes.getRequest().getRequestId(), "rq1234d1-5a33-55df-13ab-12abad84e333");\r
-                       assertEquals(resp.getStatus(), HttpStatus.SC_OK);\r
-               } catch (Exception e) {\r
-\r
-                       e.printStackTrace();\r
-               }\r
-       }\r
-\r
-       @Test\r
-       public void testGetOrchestrationRequestNotPresent() {\r
-               orReq = Mockito.mock(OrchestrationRequests.class);\r
-               orRes = new GetOrchestrationResponse();\r
-               try {\r
-                       // create InfraActiveRequests object\r
-                       InfraActiveRequests infraRequests = Mockito.mock(InfraActiveRequests.class);                    \r
-                       db = Mockito.mock(RequestsDatabase.class);\r
-                       Mockito.when(db.getRequestFromInfraActive(Mockito.anyString())).thenReturn(infraRequests);\r
-\r
-                       Request request = new Request();\r
-                       RequestStatus status = new RequestStatus();\r
-                       request.setRequestStatus(status);\r
-                       orRes.setRequest(request);              \r
-                       assertFalse("rq1234d1-5a33-55df-13ab-12abad84e333".equalsIgnoreCase(orRes.getRequest().getRequestId()));\r
-               } catch (Exception e) {\r
-\r
-                       e.printStackTrace();\r
-               }\r
-       }\r
-\r
-       @Test\r
-       public void testUnlockOrchestrationRequest()\r
-                       throws JsonParseException, JsonMappingException, IOException, ValidationException {\r
-               ObjectMapper mapper = new ObjectMapper();\r
-               String requestJSON = " {\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"ab1234\"}}}";\r
-               \r
-               MsoRequest msoRequest = new MsoRequest("rq1234d1-5a33-55df-13ab-12abad84e333");\r
-               ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);\r
-               msoRequest.parseOrchestration(sir);\r
-\r
-               //create object instead of a DB call.\r
-               InfraActiveRequests infraRequests = new InfraActiveRequests();\r
-               infraRequests.setRequestId("rq1234d1-5a33-55df-13ab-12abad84e333");\r
-               infraRequests.setNetworkType("CONTRAIL30_BASIC");\r
-               infraRequests.setSource("VID");\r
-               infraRequests.setTenantId("19123c2924c648eb8e42a3c1f14b7682");\r
-               infraRequests.setServiceInstanceId("ea4d5374-d28d-4bbf-9691-22985f088b12");\r
-               infraRequests.setRequestStatus("IN-PROGRESS");\r
-\r
-               db = Mockito.mock(RequestsDatabase.class);\r
-               Mockito.when(db.getRequestFromInfraActive(Mockito.anyString())).thenReturn(infraRequests);\r
-\r
-               Request request = new Request();\r
-               InstanceReferences ir = new InstanceReferences();\r
-               request.setInstanceReferences(ir);\r
-               RequestStatus status = new RequestStatus();\r
-\r
-               if (infraRequests.getRequestStatus() != null) {\r
-                       status.setRequestState(infraRequests.getRequestStatus());\r
-               }\r
-               request.setRequestStatus(status);\r
-               RequestStatus reqStatus = request.getRequestStatus();\r
-               \r
-               assertEquals(reqStatus.getRequestState(),"IN-PROGRESS");\r
-               \r
-               if (reqStatus.getRequestState().equalsIgnoreCase("IN-PROGRESS")){\r
-                       reqStatus.setRequestState(Status.UNLOCKED.toString ());\r
-                       }\r
-               assertEquals(reqStatus.getRequestState(),"UNLOCKED");\r
-\r
-       }\r
+    private static final String CHECK_HTML = "<!DOCTYPE html><html><head><meta charset=\"ISO-8859-1\"><title></title></head><body></body></html>";\r
+    public static final Response RESPONSE = Response.status(HttpStatus.SC_OK).entity(CHECK_HTML).build();\r
+    @Mock\r
+    private static RequestsDatabase db;\r
+    private static OrchestrationRequests orReq;\r
+    private static GetOrchestrationResponse orRes;\r
+\r
+    @Test\r
+    public void testGetOrchestrationRequest() {\r
+        orReq = Mockito.mock(OrchestrationRequests.class);\r
+        orRes = new GetOrchestrationResponse();\r
+        try {\r
+            // create InfraActiveRequests object\r
+            InfraActiveRequests infraRequests = new InfraActiveRequests();\r
+            infraRequests.setRequestId("rq1234d1-5a33-55df-13ab-12abad84e333");\r
+            infraRequests.setNetworkType("CONTRAIL30_BASIC");\r
+            infraRequests.setRequestType("createInstance");\r
+            infraRequests.setSource("VID");\r
+            infraRequests.setTenantId("19123c2924c648eb8e42a3c1f14b7682");\r
+            infraRequests.setServiceInstanceId("bc305d54-75b4-431b-adb2-eb6b9e546014");\r
+            infraRequests.setRequestStatus("IN_PROGRESS");\r
+            infraRequests.setRequestorId("ab1234");\r
+            String body = "{\"modelInfo\":{\"modelInvariantId\":\"9771b085-4705-4bf7-815d-8c0627bb7e36\",\"modelType\":\"service\",\"modelName\":\"Service with VNFs with modules\",\"modelVersion\":\"1.0\"}}";\r
+            infraRequests.setRequestBody(body);\r
+\r
+            db = Mockito.mock(RequestsDatabase.class);\r
+            Mockito.when(db.getRequestFromInfraActive(Mockito.anyString())).thenReturn(infraRequests);\r
+\r
+            ///// mock mapInfraActiveRequestToRequest()\r
+            Request request = new Request();\r
+            request.setRequestId(infraRequests.getRequestId());\r
+            request.setRequestScope(infraRequests.getRequestScope());\r
+            request.setRequestType(infraRequests.getRequestAction());\r
+\r
+            InstanceReferences ir = new InstanceReferences();\r
+            if (infraRequests.getNetworkId() != null)\r
+                ir.setNetworkInstanceId(infraRequests.getNetworkId());\r
+            if (infraRequests.getNetworkName() != null)\r
+                ir.setNetworkInstanceName(infraRequests.getNetworkName());\r
+            if (infraRequests.getServiceInstanceId() != null)\r
+                ir.setServiceInstanceId(infraRequests.getServiceInstanceId());\r
+            if (infraRequests.getServiceInstanceName() != null)\r
+                ir.setServiceInstanceName(infraRequests.getServiceInstanceName());\r
+            if (infraRequests.getVfModuleId() != null)\r
+                ir.setVfModuleInstanceId(infraRequests.getVfModuleId());\r
+            if (infraRequests.getVfModuleName() != null)\r
+                ir.setVfModuleInstanceName(infraRequests.getVfModuleName());\r
+            if (infraRequests.getVnfId() != null)\r
+                ir.setVnfInstanceId(infraRequests.getVnfId());\r
+            if (infraRequests.getVnfName() != null)\r
+                ir.setVnfInstanceName(infraRequests.getVnfName());\r
+            if (infraRequests.getVolumeGroupId() != null)\r
+                ir.setVolumeGroupInstanceId(infraRequests.getVolumeGroupId());\r
+            if (infraRequests.getVolumeGroupName() != null)\r
+                ir.setVolumeGroupInstanceName(infraRequests.getVolumeGroupName());\r
+            if (infraRequests.getRequestorId() != null)\r
+                ir.setRequestorId(infraRequests.getRequestorId());\r
+\r
+            request.setInstanceReferences(ir);\r
+            RequestStatus status = new RequestStatus();\r
+\r
+            if (infraRequests.getRequestStatus() != null) {\r
+                status.setRequestState(infraRequests.getRequestStatus());\r
+            }\r
+\r
+            request.setRequestStatus(status);\r
+            // RequestStatus reqStatus = request.getRequestStatus();\r
+            orRes.setRequest(request);\r
+            Mockito.when(orReq.getOrchestrationRequest(Mockito.anyString(), Mockito.anyString())).thenReturn(RESPONSE);\r
+            Response resp = orReq.getOrchestrationRequest("rq1234d1-5a33-55df-13ab-12abad84e333", "v3");\r
+\r
+            assertEquals(db.getRequestFromInfraActive("rq1234d1-5a33-55df-13ab-12abad84e333").getRequestId(),\r
+                    "rq1234d1-5a33-55df-13ab-12abad84e333");\r
+            assertEquals(db.getRequestFromInfraActive("rq1234d1-5a33-55df-13ab-12abad84e333").getSource(), "VID");\r
+            assertEquals(db.getRequestFromInfraActive("rq1234d1-5a33-55df-13ab-12abad84e333").getTenantId(),\r
+                    "19123c2924c648eb8e42a3c1f14b7682");\r
+            assertEquals(db.getRequestFromInfraActive("rq1234d1-5a33-55df-13ab-12abad84e333").getServiceInstanceId(),\r
+                    "bc305d54-75b4-431b-adb2-eb6b9e546014");\r
+            assertEquals(db.getRequestFromInfraActive("rq1234d1-5a33-55df-13ab-12abad84e333").getRequestStatus(),\r
+                    "IN_PROGRESS");\r
+            assertEquals(db.getRequestFromInfraActive("rq1234d1-5a33-55df-13ab-12abad84e333").getRequestorId(),\r
+                    "ab1234");\r
+            assertEquals(request.getInstanceReferences().getServiceInstanceId(), "bc305d54-75b4-431b-adb2-eb6b9e546014");\r
+            assertEquals(request.getInstanceReferences().getRequestorId(), "ab1234");\r
+            assertEquals(orRes.getRequest().getRequestId(), "rq1234d1-5a33-55df-13ab-12abad84e333");\r
+            assertEquals(resp.getStatus(), HttpStatus.SC_OK);\r
+        } catch (Exception e) {\r
+\r
+            e.printStackTrace();\r
+        }\r
+    }\r
+\r
+    @Test\r
+    public void testGetOrchestrationRequestNotPresent() {\r
+        orReq = Mockito.mock(OrchestrationRequests.class);\r
+        orRes = new GetOrchestrationResponse();\r
+        try {\r
+            // create InfraActiveRequests object\r
+            InfraActiveRequests infraRequests = Mockito.mock(InfraActiveRequests.class);\r
+            db = Mockito.mock(RequestsDatabase.class);\r
+            Mockito.when(db.getRequestFromInfraActive(Mockito.anyString())).thenReturn(infraRequests);\r
+\r
+            Request request = new Request();\r
+            RequestStatus status = new RequestStatus();\r
+            request.setRequestStatus(status);\r
+            orRes.setRequest(request);\r
+            assertFalse("rq1234d1-5a33-55df-13ab-12abad84e333".equalsIgnoreCase(orRes.getRequest().getRequestId()));\r
+        } catch (Exception e) {\r
+\r
+            e.printStackTrace();\r
+        }\r
+    }\r
+\r
+    @Test\r
+    public void testUnlockOrchestrationRequest()\r
+            throws JsonParseException, JsonMappingException, IOException, ValidationException {\r
+        ObjectMapper mapper = new ObjectMapper();\r
+        String requestJSON = " {\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"ab1234\"}}}";\r
+\r
+        MsoRequest msoRequest = new MsoRequest("rq1234d1-5a33-55df-13ab-12abad84e333");\r
+        ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);\r
+        msoRequest.parseOrchestration(sir);\r
+\r
+        //create object instead of a DB call.\r
+        InfraActiveRequests infraRequests = new InfraActiveRequests();\r
+        infraRequests.setRequestId("rq1234d1-5a33-55df-13ab-12abad84e333");\r
+        infraRequests.setNetworkType("CONTRAIL30_BASIC");\r
+        infraRequests.setSource("VID");\r
+        infraRequests.setTenantId("19123c2924c648eb8e42a3c1f14b7682");\r
+        infraRequests.setServiceInstanceId("ea4d5374-d28d-4bbf-9691-22985f088b12");\r
+        infraRequests.setRequestStatus("IN-PROGRESS");\r
+\r
+        db = Mockito.mock(RequestsDatabase.class);\r
+        Mockito.when(db.getRequestFromInfraActive(Mockito.anyString())).thenReturn(infraRequests);\r
+\r
+        Request request = new Request();\r
+        InstanceReferences ir = new InstanceReferences();\r
+        request.setInstanceReferences(ir);\r
+        RequestStatus status = new RequestStatus();\r
+\r
+        if (infraRequests.getRequestStatus() != null) {\r
+            status.setRequestState(infraRequests.getRequestStatus());\r
+        }\r
+        request.setRequestStatus(status);\r
+        RequestStatus reqStatus = request.getRequestStatus();\r
+\r
+        assertEquals(reqStatus.getRequestState(), "IN-PROGRESS");\r
+\r
+        if (reqStatus.getRequestState().equalsIgnoreCase("IN-PROGRESS")) {\r
+            reqStatus.setRequestState(Status.UNLOCKED.toString());\r
+        }\r
+        assertEquals(reqStatus.getRequestState(), "UNLOCKED");\r
+\r
+    }\r
 \r
 }\r