Replaced all tabs with spaces in java and pom.xml
[so.git] / mso-api-handlers / mso-api-handler-infra / src / test / java / org / onap / so / apihandlerinfra / tenantisolation / CloudResourcesOrchestrationTest.java
index c119653..5f12060 100644 (file)
@@ -26,11 +26,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-
 import java.text.ParseException;
-
 import javax.ws.rs.core.MediaType;
-
 import org.apache.http.HttpStatus;
 import org.junit.Before;
 import org.junit.Test;
@@ -43,272 +40,283 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.util.UriComponentsBuilder;
 
 
-public class CloudResourcesOrchestrationTest extends BaseTest{
-       
-       private String requestJSON = "{\"requestDetails\":{\"requestInfo\":{\"source\":\"VID\",\"requestorId\":\"xxxxxx\" } } }";
-       private static final String path = "/onap/so/infra/cloudResourcesRequests";
-
-       HttpHeaders headers = new HttpHeaders();
-       @Before
-       public void setupTestClass() throws Exception{
-               wireMockServer.stubFor(post(urlPathEqualTo(getTestUrl(""))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON).withStatus(HttpStatus.SC_CREATED)));
-       }
-       @Test
-       public void testUnlockFailObjectMapping() {
-               
-               headers.set("Accept", MediaType.APPLICATION_JSON);
-               headers.set("Content-Type", MediaType.APPLICATION_JSON);
-               HttpEntity<String> entity = new HttpEntity<String>(null, headers);
-       
-               UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/test/unlock");
-                      
-               ResponseEntity<String> response = restTemplate.exchange(
-                               builder.toUriString(),
-                               HttpMethod.POST, entity, String.class);
-               
-               String body = response.getBody();
-               assertTrue(body.contains("Mapping of request to JSON object failed."));
-               assertEquals(400, response.getStatusCodeValue());
-       }
-       
-       @Test
-       public void testParseOrchestrationError1() {
-               String requestJSON = "{\"requestDetails\": null }";
-               headers.set("Accept", MediaType.APPLICATION_JSON);
-               headers.set("Content-Type", MediaType.APPLICATION_JSON);
-               HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
-               
-               UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/test/unlock");
-                      
-               ResponseEntity<String> response = restTemplate.exchange(
-                               builder.toUriString(),
-                               HttpMethod.POST, entity, String.class);
-               String body = response.getBody();
-               assertTrue(body.contains("No valid requestDetails is specified"));
-               assertEquals(400, response.getStatusCodeValue());
-       }
-       
-       @Test
-       public void testParseOrchestrationError2() {
-               String requestJSON = "{\"requestDetails\":{\"requestInfo\":{\"source\":\"\",\"requestorId\":\"xxxxxx\" } } }";
-               headers.set("Accept", MediaType.APPLICATION_JSON);
-               headers.set("Content-Type", MediaType.APPLICATION_JSON);
-               HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
-
-               UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/test/unlock");
-                      
-               ResponseEntity<String> response = restTemplate.exchange(
-                               builder.toUriString(),
-                               HttpMethod.POST, entity, String.class);
-               String body = response.getBody();
-               assertTrue(body.contains("No valid source is specified"));
-               assertEquals(400, response.getStatusCodeValue());
-       }
-       
-       @Test
-       public void testParseOrchestrationError3() {
-               String requestJSON = "{\"requestDetails\":{\"requestInfo\":{\"source\":\"VID\",\"requestorId\":\"\" } } }";
-               headers.set("Accept", MediaType.APPLICATION_JSON);
-               headers.set("Content-Type", MediaType.APPLICATION_JSON);
-               HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
-
-               UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/test/unlock");
-                      
-               ResponseEntity<String> response = restTemplate.exchange(
-                               builder.toUriString(),
-                               HttpMethod.POST, entity, String.class);
-               String body = response.getBody();
-               assertTrue(body.contains("No valid requestorId is specified"));
-               assertEquals(400, response.getStatusCodeValue());
-       }
-       
-       @Test
-       public void testGetInfraActiveRequestNull() {
-               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("request-id-null-check"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                               .withStatus(HttpStatus.SC_OK)));
-               headers.set("Accept", MediaType.APPLICATION_JSON);
-               headers.set("Content-Type", MediaType.APPLICATION_JSON);
-               HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
-
-               UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/request-id-null-check/unlock");
-                      
-               ResponseEntity<String> response = restTemplate.exchange(
-                               builder.toUriString(),
-                               HttpMethod.POST, entity, String.class);
-               String body = response.getBody();
-               assertTrue(body.contains("Orchestration RequestId request-id-null-check is not found in DB"));
-               assertEquals(400, response.getStatusCodeValue());
-
-       }
-
-       @Test
-       public void testUnlock() throws ParseException {
-               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("requestIdtestUnlock"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                               .withBody(String.format(getResponseTemplate, "requestIdtestUnlock", "IN_PROGRESS"))
-                               .withStatus(HttpStatus.SC_OK)));
-               headers.set("Accept", MediaType.APPLICATION_JSON);
-               headers.set("Content-Type", MediaType.APPLICATION_JSON);
-               HttpEntity<String> entity = new HttpEntity<>(requestJSON, headers);
-       
-               UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/requestIdtestUnlock/unlock");
-                      
-               ResponseEntity<String> response = restTemplate.exchange(
-                               builder.toUriString(),
-                               HttpMethod.POST, entity, String.class);
-               
-               assertEquals(204, response.getStatusCodeValue());
-       }
-       
-       @Test
-       public void testUnlockComplete() throws ParseException {
-               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("requestIdtestUnlockComplete"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                               .withBody(String.format(getResponseTemplate, "requestIdtestUnlockComplete", "COMPLETE"))
-                               .withStatus(HttpStatus.SC_OK)));
-
-               headers.set("Accept", MediaType.APPLICATION_JSON);
-               headers.set("Content-Type", MediaType.APPLICATION_JSON);
-               HttpEntity<String> entity = new HttpEntity<>(requestJSON, headers);
-       
-               UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/requestIdtestUnlockComplete/unlock");
-                      
-               ResponseEntity<String> response = restTemplate.exchange(
-                               builder.toUriString(),
-                               HttpMethod.POST, entity, String.class);
-               String body = response.getBody().toString();
-               assertTrue(body.contains("Orchestration RequestId requestIdtestUnlockComplete has a status of COMPLETE and can not be unlocked"));
-               assertEquals(400, response.getStatusCodeValue());
-       }
-       
-       @Test
-       public void testGetOperationalEnvFilter() {
-               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("not-there"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                               .withStatus(HttpStatus.SC_OK)));
-               headers.set("Accept", MediaType.APPLICATION_JSON);
-               headers.set("Content-Type", MediaType.APPLICATION_JSON);
-               HttpEntity<String> entity = new HttpEntity<>(null, headers);
-       
-               UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
-               
-               builder.queryParam("requestId", "not-there");
-                      
-               ResponseEntity<String> response = restTemplate.exchange(
-                               builder.toUriString(),
-                               HttpMethod.GET, entity, String.class);
-               
-               //204s cannot have a body
-               //assertTrue(response.getBody().contains("Orchestration RequestId not-there is not found in DB"));
-               assertEquals(204, response.getStatusCodeValue());
-       }
-       
-       @Test
-       public void testGetOperationalEnvSuccess() throws ParseException {
-               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("90c56827-1c78-4827-bc4d-6afcdb37a51f"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                               .withBody(String.format(getResponseTemplateNoBody, "90c56827-1c78-4827-bc4d-6afcdb37a51f", "COMPLETE"))
-                               .withStatus(HttpStatus.SC_OK)));
-               headers.set("Accept", MediaType.APPLICATION_JSON);
-               headers.set("Content-Type", MediaType.APPLICATION_JSON);
-               HttpEntity<String> entity = new HttpEntity<>("", headers);
-       
-               UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
-               
-               builder.queryParam("requestId", "90c56827-1c78-4827-bc4d-6afcdb37a51f");
-                      
-               ResponseEntity<String> response = restTemplate.exchange(
-                               builder.toUriString(),
-                               HttpMethod.GET, entity, String.class);
-               
-               assertEquals(200, response.getStatusCodeValue());
+public class CloudResourcesOrchestrationTest extends BaseTest {
+
+    private String requestJSON =
+            "{\"requestDetails\":{\"requestInfo\":{\"source\":\"VID\",\"requestorId\":\"xxxxxx\" } } }";
+    private static final String path = "/onap/so/infra/cloudResourcesRequests";
+
+    HttpHeaders headers = new HttpHeaders();
+
+    @Before
+    public void setupTestClass() throws Exception {
+        wireMockServer.stubFor(post(urlPathEqualTo(getTestUrl(""))).willReturn(
+                aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withStatus(HttpStatus.SC_CREATED)));
+    }
+
+    @Test
+    public void testUnlockFailObjectMapping() {
+
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+        headers.set("Content-Type", MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<String>(null, headers);
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/test/unlock");
+
+        ResponseEntity<String> response =
+                restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class);
+
+        String body = response.getBody();
+        assertTrue(body.contains("Mapping of request to JSON object failed."));
+        assertEquals(400, response.getStatusCodeValue());
+    }
+
+    @Test
+    public void testParseOrchestrationError1() {
+        String requestJSON = "{\"requestDetails\": null }";
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+        headers.set("Content-Type", MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/test/unlock");
+
+        ResponseEntity<String> response =
+                restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class);
+        String body = response.getBody();
+        assertTrue(body.contains("No valid requestDetails is specified"));
+        assertEquals(400, response.getStatusCodeValue());
+    }
+
+    @Test
+    public void testParseOrchestrationError2() {
+        String requestJSON = "{\"requestDetails\":{\"requestInfo\":{\"source\":\"\",\"requestorId\":\"xxxxxx\" } } }";
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+        headers.set("Content-Type", MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/test/unlock");
+
+        ResponseEntity<String> response =
+                restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class);
+        String body = response.getBody();
+        assertTrue(body.contains("No valid source is specified"));
+        assertEquals(400, response.getStatusCodeValue());
+    }
+
+    @Test
+    public void testParseOrchestrationError3() {
+        String requestJSON = "{\"requestDetails\":{\"requestInfo\":{\"source\":\"VID\",\"requestorId\":\"\" } } }";
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+        headers.set("Content-Type", MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/test/unlock");
+
+        ResponseEntity<String> response =
+                restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class);
+        String body = response.getBody();
+        assertTrue(body.contains("No valid requestorId is specified"));
+        assertEquals(400, response.getStatusCodeValue());
+    }
+
+    @Test
+    public void testGetInfraActiveRequestNull() {
+        wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("request-id-null-check"))).willReturn(
+                aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withStatus(HttpStatus.SC_OK)));
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+        headers.set("Content-Type", MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<String>(requestJSON, headers);
+
+        UriComponentsBuilder builder =
+                UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/request-id-null-check/unlock");
+
+        ResponseEntity<String> response =
+                restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class);
+        String body = response.getBody();
+        assertTrue(body.contains("Orchestration RequestId request-id-null-check is not found in DB"));
+        assertEquals(400, response.getStatusCodeValue());
+
+    }
+
+    @Test
+    public void testUnlock() throws ParseException {
+        wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("requestIdtestUnlock"))).willReturn(
+                aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withBody(String.format(getResponseTemplate, "requestIdtestUnlock", "IN_PROGRESS"))
+                        .withStatus(HttpStatus.SC_OK)));
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+        headers.set("Content-Type", MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<>(requestJSON, headers);
+
+        UriComponentsBuilder builder =
+                UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/requestIdtestUnlock/unlock");
+
+        ResponseEntity<String> response =
+                restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class);
+
+        assertEquals(204, response.getStatusCodeValue());
+    }
+
+    @Test
+    public void testUnlockComplete() throws ParseException {
+        wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("requestIdtestUnlockComplete"))).willReturn(
+                aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withBody(String.format(getResponseTemplate, "requestIdtestUnlockComplete", "COMPLETE"))
+                        .withStatus(HttpStatus.SC_OK)));
+
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+        headers.set("Content-Type", MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<>(requestJSON, headers);
+
+        UriComponentsBuilder builder =
+                UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1/requestIdtestUnlockComplete/unlock");
+
+        ResponseEntity<String> response =
+                restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class);
+        String body = response.getBody().toString();
+        assertTrue(body.contains(
+                "Orchestration RequestId requestIdtestUnlockComplete has a status of COMPLETE and can not be unlocked"));
+        assertEquals(400, response.getStatusCodeValue());
+    }
+
+    @Test
+    public void testGetOperationalEnvFilter() {
+        wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("not-there"))).willReturn(
+                aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withStatus(HttpStatus.SC_OK)));
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+        headers.set("Content-Type", MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<>(null, headers);
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
+
+        builder.queryParam("requestId", "not-there");
+
+        ResponseEntity<String> response =
+                restTemplate.exchange(builder.toUriString(), HttpMethod.GET, entity, String.class);
+
+        // 204s cannot have a body
+        // assertTrue(response.getBody().contains("Orchestration RequestId not-there is not found in DB"));
+        assertEquals(204, response.getStatusCodeValue());
+    }
+
+    @Test
+    public void testGetOperationalEnvSuccess() throws ParseException {
+        wireMockServer
+                .stubFor(get(urlPathEqualTo(getTestUrl("90c56827-1c78-4827-bc4d-6afcdb37a51f"))).willReturn(
+                        aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                                .withBody(String.format(getResponseTemplateNoBody,
+                                        "90c56827-1c78-4827-bc4d-6afcdb37a51f", "COMPLETE"))
+                                .withStatus(HttpStatus.SC_OK)));
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+        headers.set("Content-Type", MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<>("", headers);
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
+
+        builder.queryParam("requestId", "90c56827-1c78-4827-bc4d-6afcdb37a51f");
+
+        ResponseEntity<String> response =
+                restTemplate.exchange(builder.toUriString(), HttpMethod.GET, entity, String.class);
+
+        assertEquals(200, response.getStatusCodeValue());
         assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
         assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
         assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
         assertEquals("1.0.0", response.getHeaders().get("X-LatestVersion").get(0));
         assertEquals("90c56827-1c78-4827-bc4d-6afcdb37a51f", response.getHeaders().get("X-TransactionID").get(0));
-       }
-       
-       @Test
-       public void testGetOperationalEnvFilterSuccess() throws ParseException {
-               wireMockServer.stubFor(get(urlPathEqualTo(getTestUrl("requestIdtestGetOperationalEnvFilterSuccess"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                               .withBody(String.format(getResponseTemplate, "requestIdtestGetOperationalEnvFilterSuccess", "COMPLETE"))
-                               .withStatus(HttpStatus.SC_OK)));
-
-               wireMockServer.stubFor(post(urlPathEqualTo(getTestUrl("getCloudOrchestrationFiltersFromInfraActive"))).willReturn(aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                               .withBody("{\"requestId\":\"getCloudOrchestrationFiltersFromInfraActive\", \"operationalEnvironmentName\":\"myVnfOpEnv\"}")
-                               .withBody("["+String.format(getResponseTemplateNoBody, "requestIdtestGetOperationalEnvFilterSuccess", "COMPLETE")+"]")
-                               .withStatus(HttpStatus.SC_OK)));
-
-               headers.set("Accept", MediaType.APPLICATION_JSON);
-               headers.set("Content-Type", MediaType.APPLICATION_JSON);
-               HttpEntity<String> entity = new HttpEntity<>(null, headers);
-               UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
-               
-               builder.queryParam("requestId", "requestIdtestGetOperationalEnvFilterSuccess");
-               builder.queryParam("operationalEnvironmentName", "myVnfOpEnv");
-                      
-               ResponseEntity<String> response = restTemplate.exchange(
-                               builder.toUriString(),
-                               HttpMethod.GET, entity, String.class);
-               
-               assertEquals(200, response.getStatusCodeValue());
+    }
+
+    @Test
+    public void testGetOperationalEnvFilterSuccess() throws ParseException {
+        wireMockServer
+                .stubFor(get(urlPathEqualTo(getTestUrl("requestIdtestGetOperationalEnvFilterSuccess"))).willReturn(
+                        aResponse().withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                                .withBody(String.format(getResponseTemplate,
+                                        "requestIdtestGetOperationalEnvFilterSuccess", "COMPLETE"))
+                                .withStatus(HttpStatus.SC_OK)));
+
+        wireMockServer.stubFor(
+                post(urlPathEqualTo(getTestUrl("getCloudOrchestrationFiltersFromInfraActive"))).willReturn(aResponse()
+                        .withHeader(javax.ws.rs.core.HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withBody(
+                                "{\"requestId\":\"getCloudOrchestrationFiltersFromInfraActive\", \"operationalEnvironmentName\":\"myVnfOpEnv\"}")
+                        .withBody("[" + String.format(getResponseTemplateNoBody,
+                                "requestIdtestGetOperationalEnvFilterSuccess", "COMPLETE") + "]")
+                        .withStatus(HttpStatus.SC_OK)));
+
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+        headers.set("Content-Type", MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<>(null, headers);
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
+
+        builder.queryParam("requestId", "requestIdtestGetOperationalEnvFilterSuccess");
+        builder.queryParam("operationalEnvironmentName", "myVnfOpEnv");
+
+        ResponseEntity<String> response =
+                restTemplate.exchange(builder.toUriString(), HttpMethod.GET, entity, String.class);
+
+        assertEquals(200, response.getStatusCodeValue());
         assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0));
         assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0));
         assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0));
         assertEquals("1.0.0", response.getHeaders().get("X-LatestVersion").get(0));
 
-       }
-       
-       @Test
-       public void testGetOperationalEnvFilterException1() throws ParseException {
-               InfraActiveRequests iar = new InfraActiveRequests();
-               iar.setRequestId("requestId-getOpEnvFilterEx1");
-               iar.setRequestScope("requestScope");
-               iar.setRequestType("requestType");
-               iar.setOperationalEnvId("operationalEnvironmentId");
-               iar.setOperationalEnvName("operationalEnvName");
-               iar.setRequestorId("xxxxxx");
-               iar.setRequestBody("");
-               iar.setRequestStatus("COMPLETE");
-               iar.setRequestAction("TEST");
-               
-               headers.set("Accept", MediaType.APPLICATION_JSON);
-               headers.set("Content-Type", MediaType.APPLICATION_JSON);
-               HttpEntity<String> entity = new HttpEntity<>("", headers);
-               UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
-               
-               builder.queryParam("filter", "operationalEnvironmentName:EQUALS:myVnfOpEnv");
-                      
-               ResponseEntity<String> response = restTemplate.exchange(
-                               builder.toUriString(),
-                               HttpMethod.GET, entity, String.class);
-               assertEquals(500, response.getStatusCodeValue());
-       }
-       
-       @Test
-       public void testGetOperationalEnvFilterException2() throws ParseException {
-               InfraActiveRequests iar = new InfraActiveRequests();
-               iar.setRequestId("requestIdFilterException2");
-               iar.setRequestScope("requestScope");
-               iar.setRequestType("requestType");
-               iar.setOperationalEnvId("operationalEnvId");
-               iar.setOperationalEnvName("operationalEnvName");
-               iar.setRequestorId("xxxxxx");
-               iar.setRequestBody("");
-               iar.setRequestStatus("COMPLETE");
-               iar.setRequestAction("TEST");
-               
-               headers.set("Accept", MediaType.APPLICATION_JSON);
-               headers.set("Content-Type", MediaType.APPLICATION_JSON);
-               HttpEntity<String> entity = new HttpEntity<>(null, headers);
-               UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
-               
-               builder.queryParam("operationalEnvironmentName", "");
-                      
-               ResponseEntity<String> response = restTemplate.exchange(
-                               builder.toUriString(),
-                               HttpMethod.GET, entity, String.class);
-               
-               
-               assertEquals(500, response.getStatusCodeValue());
-               assertTrue(response.getBody().toString().contains("No valid operationalEnvironmentName value is specified"));
-       }
+    }
+
+    @Test
+    public void testGetOperationalEnvFilterException1() throws ParseException {
+        InfraActiveRequests iar = new InfraActiveRequests();
+        iar.setRequestId("requestId-getOpEnvFilterEx1");
+        iar.setRequestScope("requestScope");
+        iar.setRequestType("requestType");
+        iar.setOperationalEnvId("operationalEnvironmentId");
+        iar.setOperationalEnvName("operationalEnvName");
+        iar.setRequestorId("xxxxxx");
+        iar.setRequestBody("");
+        iar.setRequestStatus("COMPLETE");
+        iar.setRequestAction("TEST");
+
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+        headers.set("Content-Type", MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<>("", headers);
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
+
+        builder.queryParam("filter", "operationalEnvironmentName:EQUALS:myVnfOpEnv");
+
+        ResponseEntity<String> response =
+                restTemplate.exchange(builder.toUriString(), HttpMethod.GET, entity, String.class);
+        assertEquals(500, response.getStatusCodeValue());
+    }
+
+    @Test
+    public void testGetOperationalEnvFilterException2() throws ParseException {
+        InfraActiveRequests iar = new InfraActiveRequests();
+        iar.setRequestId("requestIdFilterException2");
+        iar.setRequestScope("requestScope");
+        iar.setRequestType("requestType");
+        iar.setOperationalEnvId("operationalEnvId");
+        iar.setOperationalEnvName("operationalEnvName");
+        iar.setRequestorId("xxxxxx");
+        iar.setRequestBody("");
+        iar.setRequestStatus("COMPLETE");
+        iar.setRequestAction("TEST");
+
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+        headers.set("Content-Type", MediaType.APPLICATION_JSON);
+        HttpEntity<String> entity = new HttpEntity<>(null, headers);
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(path) + "/v1");
+
+        builder.queryParam("operationalEnvironmentName", "");
+
+        ResponseEntity<String> response =
+                restTemplate.exchange(builder.toUriString(), HttpMethod.GET, entity, String.class);
+
+
+        assertEquals(500, response.getStatusCodeValue());
+        assertTrue(response.getBody().toString().contains("No valid operationalEnvironmentName value is specified"));
+    }
 
 }