diff options
5 files changed, 274 insertions, 137 deletions
diff --git a/aai-resources/src/main/java/org/onap/aai/entities/PolicyException.java b/aai-resources/src/main/java/org/onap/aai/entities/PolicyException.java new file mode 100644 index 0000000..c8e6e2f --- /dev/null +++ b/aai-resources/src/main/java/org/onap/aai/entities/PolicyException.java @@ -0,0 +1,36 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.aai + * ================================================================================ + * Copyright © 2024 Deutsche Telekom. All rights reserved. + * ================================================================================ + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.aai.entities; + +import java.util.List; + +import lombok.Builder; +import lombok.Data; +import lombok.extern.jackson.Jacksonized; + +@Data +@Builder +@Jacksonized +public class PolicyException { + private String messageId; + private String text; + private List<String> variables; +} diff --git a/aai-resources/src/main/java/org/onap/aai/entities/RequestError.java b/aai-resources/src/main/java/org/onap/aai/entities/RequestError.java index 3fb051b..fb04e63 100644 --- a/aai-resources/src/main/java/org/onap/aai/entities/RequestError.java +++ b/aai-resources/src/main/java/org/onap/aai/entities/RequestError.java @@ -29,4 +29,5 @@ import lombok.extern.jackson.Jacksonized; @Jacksonized public class RequestError { private ServiceException serviceException; + private PolicyException policyException; } diff --git a/aai-resources/src/main/java/org/onap/aai/rest/ResourcesController.java b/aai-resources/src/main/java/org/onap/aai/rest/ResourcesController.java index ade12db..12839d4 100644 --- a/aai-resources/src/main/java/org/onap/aai/rest/ResourcesController.java +++ b/aai-resources/src/main/java/org/onap/aai/rest/ResourcesController.java @@ -58,8 +58,12 @@ public class ResourcesController extends RESTAPI { @Path("/{uri: .+}") @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) - public Response update(String content, @PathParam("version") String versionParam, - @PathParam("uri") @Encoded String uri, @Context HttpHeaders headers, @Context UriInfo info, + public Response update( + String content, + @PathParam("version") String versionParam, + @PathParam("uri") @Encoded String uri, + @Context HttpHeaders headers, + @Context UriInfo info, @Context HttpServletRequest req) { Set<String> roles = getRoles(req.getUserPrincipal(), req.getMethod()); MediaType mediaType = headers.getMediaType(); @@ -70,8 +74,12 @@ public class ResourcesController extends RESTAPI { @Path("/{uri: .+}/relationship-list/relationship") @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) - public Response updateRelationship(String content, @PathParam("version") String versionParam, - @PathParam("uri") @Encoded String uri, @Context HttpHeaders headers, @Context UriInfo info, + public Response updateRelationship( + String content, + @PathParam("version") String versionParam, + @PathParam("uri") @Encoded String uri, + @Context HttpHeaders headers, + @Context UriInfo info, @Context HttpServletRequest req) { return resourcesService.updateRelationship(content, versionParam, uri, headers, info); @@ -81,8 +89,12 @@ public class ResourcesController extends RESTAPI { @Path("/{uri: .+}") @Consumes({"application/merge-patch+json"}) @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) - public Response patch(String content, @PathParam("version") String versionParam, - @PathParam("uri") @Encoded String uri, @Context HttpHeaders headers, @Context UriInfo info, + public Response patch( + String content, + @PathParam("version") String versionParam, + @PathParam("uri") @Encoded String uri, + @Context HttpHeaders headers, + @Context UriInfo info, @Context HttpServletRequest req) { Set<String> roles = getRoles(req.getUserPrincipal(), req.getMethod()); MediaType mediaType = MediaType.APPLICATION_JSON_TYPE; @@ -140,8 +152,12 @@ public class ResourcesController extends RESTAPI { @DELETE @Path("/{uri: .+}") @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) - public Response delete(@PathParam("version") String versionParam, @PathParam("uri") @Encoded String uri, - @Context HttpHeaders headers, @Context UriInfo info, @QueryParam("resource-version") String resourceVersion, + public Response delete( + @PathParam("version") String versionParam, + @PathParam("uri") @Encoded String uri, + @Context HttpHeaders headers, + @Context UriInfo info, + @QueryParam("resource-version") String resourceVersion, @Context HttpServletRequest req) { Set<String> roles = getRoles(req.getUserPrincipal(), req.getMethod()); return resourcesService.delete(versionParam, uri, headers, info, req, roles); @@ -149,21 +165,17 @@ public class ResourcesController extends RESTAPI { /** * This whole method does nothing because the body is being dropped while fielding the request. - * - * @param content the content - * @param versionParam the version param - * @param uri the uri - * @param headers the headers - * @param info the info - * @param req the req - * @return the response */ @DELETE @Path("/{uri: .+}/relationship-list/relationship") @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) - public Response deleteRelationship(String content, @PathParam("version") String versionParam, - @PathParam("uri") @Encoded String uri, @Context HttpHeaders headers, @Context UriInfo info, + public Response deleteRelationship( + String content, + @PathParam("version") String versionParam, + @PathParam("uri") @Encoded String uri, + @Context HttpHeaders headers, + @Context UriInfo info, @Context HttpServletRequest req) { return resourcesService.deleteRelationship(content, versionParam, uri, headers, info); diff --git a/aai-resources/src/main/java/org/onap/aai/service/ResourcesService.java b/aai-resources/src/main/java/org/onap/aai/service/ResourcesService.java index da326a0..d721ff2 100644 --- a/aai-resources/src/main/java/org/onap/aai/service/ResourcesService.java +++ b/aai-resources/src/main/java/org/onap/aai/service/ResourcesService.java @@ -81,7 +81,7 @@ public class ResourcesService { Loader loader; try { - validateRequest(info); + validateUriEncoding(info); SchemaVersion version = new SchemaVersion(versionParam); final HttpEntry traversalUriHttpEntry = SpringContextAware.getBean("traversalUriHttpEntry", HttpEntry.class); @@ -150,7 +150,7 @@ public class ResourcesService { boolean success = true; try { - validateRequest(info); + validateUriEncoding(info); SchemaVersion version = new SchemaVersion(versionParam); HttpEntry traversalUriHttpEntry = SpringContextAware.getBean("traversalUriHttpEntry", HttpEntry.class); @@ -208,7 +208,7 @@ public class ResourcesService { boolean success = true; try { - validateRequest(info); + validateUriEncoding(info); version = new SchemaVersion(versionParam); @@ -281,7 +281,7 @@ public class ResourcesService { boolean success = true; try { - this.validateRequest(info); + this.validateUriEncoding(info); SchemaVersion version = new SchemaVersion(versionParam); HttpEntry traversalUriHttpEntry = SpringContextAware.getBean("traversalUriHttpEntry", HttpEntry.class); @@ -337,7 +337,7 @@ public class ResourcesService { Loader loader = null; try { - validateRequest(info); + validateUriEncoding(info); SchemaVersion version = new SchemaVersion(versionParam); final HttpEntry traversalUriHttpEntry = SpringContextAware.getBean("traversalUriHttpEntry", HttpEntry.class); @@ -408,7 +408,7 @@ public class ResourcesService { try { - validateRequest(info); + validateUriEncoding(info); SchemaVersion version = new SchemaVersion(versionParam); HttpEntry traversalUriHttpEntry = SpringContextAware.getBean("traversalUriHttpEntry", HttpEntry.class); @@ -496,7 +496,7 @@ public class ResourcesService { return uri.toString().contains("/" + RestTokens.COUSIN + "/"); } - private void validateRequest(UriInfo info) throws AAIException, UnsupportedEncodingException { + private void validateUriEncoding(UriInfo info) throws AAIException, UnsupportedEncodingException { if (!ValidateEncoding.getInstance().validate(info)) { throw new AAIException("AAI_3008", "uri=" + getPath(info)); diff --git a/aai-resources/src/test/java/org/onap/aai/rest/ResourcesControllerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/ResourcesControllerTest.java index 3b729e7..c75fec2 100644 --- a/aai-resources/src/test/java/org/onap/aai/rest/ResourcesControllerTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/ResourcesControllerTest.java @@ -24,10 +24,10 @@ package org.onap.aai.rest; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.samePropertyValuesAs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertIterableEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; @@ -51,12 +51,13 @@ import javax.ws.rs.core.UriInfo; import org.apache.commons.io.IOUtils; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; -import org.hamcrest.Matcher; import org.janusgraph.core.JanusGraph; +import org.janusgraph.core.JanusGraphTransaction; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import org.json.simple.parser.ParseException; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -64,8 +65,11 @@ import org.mockito.Mockito; import org.onap.aai.config.WebClientConfiguration; import org.onap.aai.db.props.AAIProperties; import org.onap.aai.dbmap.AAIGraph; +import org.onap.aai.entities.AAIErrorResponse; import org.onap.aai.entities.PServer; import org.onap.aai.entities.PServerListResponse; +import org.onap.aai.entities.PolicyException; +import org.onap.aai.entities.ServiceException; import org.onap.aai.exceptions.AAIException; import org.onap.aai.service.ResourcesService; import org.onap.aai.setup.SchemaVersions; @@ -78,11 +82,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.context.annotation.Import; +import org.springframework.http.HttpMethod; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.test.web.reactive.server.WebTestClient; import com.fasterxml.jackson.databind.ObjectMapper; +import reactor.core.publisher.Mono; + @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @Import(WebClientConfiguration.class) public class ResourcesControllerTest { @@ -152,6 +159,25 @@ public class ResourcesControllerTest { when(httpHeaders.getMediaType()).thenReturn(APPLICATION_JSON); } + @AfterEach + public void tearDown() { + JanusGraph janusGraph = AAIGraph.getInstance().getGraph(); + JanusGraphTransaction transaction = janusGraph.newTransaction(); + boolean success = true; + try { + GraphTraversalSource g = transaction.traversal(); + g.V().drop().iterate(); + } catch (Exception ex) { + success = false; + } finally { + if (success) { + transaction.commit(); + } else { + transaction.rollback(); + } + } + } + @Test public void testResponsePutGetDeleteOnResource() throws JSONException, IOException, AAIException { String payload = getResourcePayload(getObjectName()); @@ -245,15 +271,15 @@ public class ResourcesControllerTest { String hostname = "590a8943-1200-43b3-825b-75dde6b8f44a"; String physicalLocationId = "e13d4587-19ad-4bf5-80f5-c021efb5b61c"; - String pserverUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); - String cloudRegionUri = String.format("cloud-infrastructure/complexes/complex/%s", physicalLocationId); + String pserverUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); + String cloudRegionUri = String.format("/cloud-infrastructure/complexes/complex/%s", physicalLocationId); doSetupResource(pserverUri, pserverData); doSetupResource(cloudRegionUri, complexData); String cloudToPserverRelationshipData = getRelationshipPayload("pserver-complex-relationship"); String cloudToPserverRelationshipUri = - String.format("cloud-infrastructure/pservers/pserver/%s/relationship-list/relationship", hostname); + String.format("/cloud-infrastructure/pservers/pserver/%s/relationship-list/relationship", hostname); MockHttpServletRequest mockReq = new MockHttpServletRequest("PUT", cloudToPserverRelationshipUri); Response response = resourcesController.updateRelationship(cloudToPserverRelationshipData, defaultSchemaVersion, cloudToPserverRelationshipUri, httpHeaders, uriInfo, @@ -288,30 +314,36 @@ public class ResourcesControllerTest { public void testPutPassWithEmptyData() throws JSONException { String payload = "{}"; - String pserverUri = String.format("cloud-infrastructure/pservers/pserver/%s", UUID.randomUUID().toString()); + String pserverUri = String.format("/cloud-infrastructure/pservers/pserver/%s", UUID.randomUUID().toString()); doSetupResource(pserverUri, payload); - payload = ""; - pserverUri = String.format("cloud-infrastructure/pservers/pserver/%s", UUID.randomUUID().toString()); + payload = "{}"; + pserverUri = String.format("/cloud-infrastructure/pservers/pserver/%s", UUID.randomUUID().toString()); doSetupResource(pserverUri, payload); } @Test - public void testFailureWithInvalidUri() throws JSONException { - - String payload = "{}"; - String uri = "fake-infrastructure/pservers/pserver/fajsidj"; - - when(uriInfo.getPath()).thenReturn(uri); - when(uriInfo.getPath(false)).thenReturn(uri); - MockHttpServletRequest mockReq = new MockHttpServletRequest("PUT", uri); - Response response = resourcesController.update(payload, defaultSchemaVersion, uri, - httpHeaders, uriInfo, mockReq); - - int code = response.getStatus(); - logger.info("Response Code: " + code + "\tEntity: " + response.getEntity()); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), code); + public void thatUnknownPathReturnsBadRequest() throws JSONException { + String uri = "/fake-infrastructure/pservers/pserver/fajsidj"; + AAIErrorResponse errorResponse = webClient.put() + .uri(uri) + .bodyValue("{}") + .exchange() + .expectStatus().isBadRequest() + .returnResult(AAIErrorResponse.class) + .getResponseBody() + .blockFirst(); + + ServiceException serviceException = errorResponse.getRequestError().getServiceException(); + assertEquals("SVC3000", serviceException.getMessageId()); + assertEquals("Invalid input performing %1 on %2 (msg=%3) (ec=%4)", serviceException.getText()); + List<String> expected = List.of( + "PUT", + "v29/fake-infrastructure/pservers/pserver/fajsidj", + "Invalid input performing %1 on %2:Unrecognized AAI object fake-infrastructure", + "ERR.5.2.3000"); + assertIterableEquals(expected, serviceException.getVariables()); } @Test @@ -320,6 +352,17 @@ public class ResourcesControllerTest { String payload = "{}"; String uri = "fake-infrastructure/pservers/pserver/fajsidj"; + // webClient.put() + // .uri(uri) + // .bodyValue(payload) + // .exchange() + // .expectStatus().isEqualTo(500) + // .expectBody(AAIErrorResponse.class) + // .value(responseBody -> { + // assertNotNull(responseBody, "Response body should not be null"); + // assertEquals("SVC3002", responseBody.getRequestError().getServiceException().getMessageId()); + // }); + when(uriInfo.getPath()).thenReturn(uri); when(uriInfo.getPath(false)).thenThrow(new IllegalArgumentException()); MockHttpServletRequest mockReq = new MockHttpServletRequest("PUT", uri); @@ -361,29 +404,56 @@ public class ResourcesControllerTest { public void testInvalidUriContainingRelatedToShouldThrowAAIException() throws JSONException { String payload = "{}"; - String uri = "cloud-infrastructure/related-to/fsdf"; + String uri = "/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf"; + + AAIErrorResponse errorResponse = webClient.put() + .uri(uri) + .bodyValue(payload) + .exchange() + .expectStatus().isBadRequest() + .returnResult(AAIErrorResponse.class) + .getResponseBody() + .blockFirst(); + + ServiceException serviceException = errorResponse.getRequestError().getServiceException(); + assertEquals("SVC3002", serviceException.getMessageId()); + assertEquals("Error writing output performing %1 on %2 (msg=%3) (ec=%4)", serviceException.getText()); + List<String> expected = List.of( + "PUT", + "v29/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf", + "Cannot write via this URL", + "ERR.5.6.3010"); + assertIterableEquals(expected, serviceException.getVariables()); + + uri = "/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf/relationship-list/relationship"; + + errorResponse = webClient.put() + .uri(uri) + .bodyValue(payload) + .exchange() + .expectStatus().isBadRequest() + .returnResult(AAIErrorResponse.class) + .getResponseBody() + .blockFirst(); + + serviceException = errorResponse.getRequestError().getServiceException(); + expected = List.of( + "PUT", + "v29/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf/relationship-list/relationship", + "Cannot write via this URL", + "ERR.5.6.3010"); + assertIterableEquals(expected, serviceException.getVariables()); + when(uriInfo.getPath()).thenReturn(uri); when(uriInfo.getPath(false)).thenReturn(uri); MockHttpServletRequest mockReq = new MockHttpServletRequest("PUT", uri); - Response response = resourcesController.update(payload, defaultSchemaVersion, uri, - httpHeaders, uriInfo, mockReq); - - int code = response.getStatus(); - logger.info("Response Code: " + code + "\tEntity: " + response.getEntity()); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), code); - - response = resourcesController.updateRelationship(payload, defaultSchemaVersion, uri, - httpHeaders, uriInfo, mockReq); - - code = response.getStatus(); - logger.info("Response Code: " + code + "\tEntity: " + response.getEntity()); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), code); - + Response response; + int code; mockReq = new MockHttpServletRequest("GET", uri); response = resourcesController.getLegacy(defaultSchemaVersion, uri, -1, -1, false, "all", "false", httpHeaders, uriInfo, mockReq); - + code = response.getStatus(); assertNotNull(response, "Response from the legacy moxy consumer returned null"); assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), code); @@ -451,24 +521,18 @@ public class ResourcesControllerTest { } protected void doSetupResource(String uri, String payload) throws JSONException { - when(uriInfo.getPath()).thenReturn(uri); when(uriInfo.getPath(false)).thenReturn(uri); - HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class); when(mockRequest.getRequestURL()).thenReturn(new StringBuffer(String.format("https://localhost:8447/aai/%s/", defaultSchemaVersion) + uri)); - Response response = resourcesController.getLegacy(defaultSchemaVersion, uri, -1, -1, false, "all", "false", httpHeaders, uriInfo, mockRequest); - assertNotNull(response, "Response from the legacy moxy consumer returned null"); assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatus(), "Expected to not have the data already in memory"); - response = resourcesController.update(payload, defaultSchemaVersion, uri, httpHeaders, uriInfo, mockRequest); - assertNotNull(response, "Response from the legacy moxy consumer returned null"); int code = response.getStatus(); if (!VALID_HTTP_STATUS_CODES.contains(code)) { @@ -477,38 +541,62 @@ public class ResourcesControllerTest { assertEquals(Response.Status.CREATED.getStatusCode(), response.getStatus(), "Expected to return status created from the response"); - queryParameters.add("depth", "10000"); response = resourcesController.getLegacy(defaultSchemaVersion, uri, -1, -1, false, "all", "false", httpHeaders, uriInfo, mockRequest); - assertNotNull(response, "Response from the legacy moxy consumer returned null"); assertEquals(Response.Status.OK.getStatusCode(), response.getStatus(), "Expected to return the pserver data that was just put in memory"); - if ("".equalsIgnoreCase(payload)) { payload = "{}"; } - JSONAssert.assertEquals(payload, response.getEntity().toString(), false); + + // TODO: Replace the above with this + // webClient.get() + // .uri(uri) + // .exchange() + // .expectStatus() + // .isNotFound(); + + // webClient.put() + // .uri(uri) + // .bodyValue(payload) + // .exchange() + // .expectStatus() + // .isCreated(); + + // String responseBody = webClient.get() + // .uri(uri) + // .exchange() + // .expectStatus() + // .isOk() + // .expectBody(String.class) + // .returnResult().getResponseBody(); + + // JSONAssert.assertEquals(payload, responseBody, false); } @Test - public void testDeleteRelationshipThrowsException() { - - String payload = ""; - String hostname = "testData"; - String uri = String.format("cloud-infrastructure/pservers/pserver/%s/relationship-list/relationship", hostname); - - when(uriInfo.getPath()).thenReturn(uri); - when(uriInfo.getPath(false)).thenReturn(uri); - - MockHttpServletRequest mockReq = new MockHttpServletRequest("DELETE", uri); - Response response = resourcesController.deleteRelationship(payload, - defaultSchemaVersion, uri, httpHeaders, uriInfo, mockReq); - - int code = response.getStatus(); - logger.info("Response Code: " + code + "\tEntity: " + response.getEntity()); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), code); + public void testDeleteRelationshipWithEmptyBodyReturnsBadRequest() { + String uri = "/cloud-infrastructure/pservers/pserver/testData/relationship-list/relationship"; + AAIErrorResponse errorResponse = webClient.method(HttpMethod.DELETE) + .uri(uri) + .body(Mono.just(""), String.class) + .exchange() + .expectStatus().isBadRequest() + .returnResult(AAIErrorResponse.class) + .getResponseBody() + .blockFirst(); + + PolicyException policyException = errorResponse.getRequestError().getPolicyException(); + assertEquals("POL3102", policyException.getMessageId()); + assertEquals("Error parsing input performing %1 on %2 (msg=%3) (ec=%4)", policyException.getText()); + List<String> expected = List.of( + "DELETE", + "v29/cloud-infrastructure/pservers/pserver/testData/relationship-list/relationship", + "Error parsing input performing %1 on %2:You must supply a relationship", + "ERR.5.1.3102"); + assertIterableEquals(expected, policyException.getVariables()); } // TODO - Change this to be abstract and inheritable @@ -527,11 +615,11 @@ public class ResourcesControllerTest { } public String getUri(String hostname) { - return String.format("cloud-infrastructure/pservers/pserver/%s", hostname); + return String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); } public String getGetAllPserversURI() { - return "cloud-infrastructure/pservers"; + return "/cloud-infrastructure/pservers"; } public String getUri() { @@ -629,15 +717,15 @@ public class ResourcesControllerTest { String hostname = "590a8943-1200-43b3-825b-75dde6b8f44b"; String physicalLocationId = "e13d4587-19ad-4bf5-80f5-c021efb5b61d"; - String pserverUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); - String cloudRegionUri = String.format("cloud-infrastructure/complexes/complex/%s", physicalLocationId); + String pserverUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); + String cloudRegionUri = String.format("/cloud-infrastructure/complexes/complex/%s", physicalLocationId); doSetupResource(pserverUri, pserverData); doSetupResource(cloudRegionUri, complexData); String cloudToPserverRelationshipData = getRelationshipPayload("pserver-complex-relationship2"); String cloudToPserverRelationshipUri = - String.format("cloud-infrastructure/pservers/pserver/%s/relationship-list/relationship", hostname); + String.format("/cloud-infrastructure/pservers/pserver/%s/relationship-list/relationship", hostname); MockHttpServletRequest mockReq = new MockHttpServletRequest("PUT", cloudToPserverRelationshipUri); Response response = resourcesController.updateRelationship(cloudToPserverRelationshipData, defaultSchemaVersion, cloudToPserverRelationshipUri, httpHeaders, uriInfo, @@ -654,7 +742,7 @@ public class ResourcesControllerTest { "Expected to return status created from the response"); logger.info("Response Code: " + code + "\tEntity: " + response.getEntity()); - String getRelationshipUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); + String getRelationshipUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class); when(mockRequest.getRequestURL()) .thenReturn(new StringBuffer(String.format("https://localhost:8447/aai/%s/", defaultSchemaVersion) + getRelationshipUri)); @@ -679,15 +767,15 @@ public class ResourcesControllerTest { String hostname = "590a8943-1200-43b3-825b-75dde6b8f44c"; String physicalLocationId = "e13d4587-19ad-4bf5-80f5-c021efb5b61e"; - String pserverUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); - String cloudRegionUri = String.format("cloud-infrastructure/complexes/complex/%s", physicalLocationId); + String pserverUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); + String cloudRegionUri = String.format("/cloud-infrastructure/complexes/complex/%s", physicalLocationId); doSetupResource(pserverUri, pserverData); doSetupResource(cloudRegionUri, complexData); String cloudToPserverRelationshipData = getRelationshipPayload("pserver-complex-relationship3"); String cloudToPserverRelationshipUri = - String.format("cloud-infrastructure/pservers/pserver/%s/relationship-list/relationship", hostname); + String.format("/cloud-infrastructure/pservers/pserver/%s/relationship-list/relationship", hostname); MockHttpServletRequest mockReq = new MockHttpServletRequest("PUT", cloudToPserverRelationshipUri); Response response = resourcesController.updateRelationship(cloudToPserverRelationshipData, defaultSchemaVersion, cloudToPserverRelationshipUri, httpHeaders, uriInfo, @@ -705,8 +793,8 @@ public class ResourcesControllerTest { logger.info("Response Code: " + code + "\tEntity: " + response.getEntity()); String getRelationshipMockRequestUri = - String.format("cloud-infrastructure/pservers/pserver/%s/relationship-list", hostname); - String getRelationshipUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); + String.format("/cloud-infrastructure/pservers/pserver/%s/relationship-list", hostname); + String getRelationshipUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); queryParameters.add("format", "resource"); HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class); when(mockRequest.getRequestURL()) @@ -762,15 +850,15 @@ public class ResourcesControllerTest { String hostname = "590a8943-1200-43b3-825b-75dde6b8f44d"; String physicalLocationId = "e13d4587-19ad-4bf5-80f5-c021efb5b61f"; - String pserverUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); - String cloudRegionUri = String.format("cloud-infrastructure/complexes/complex/%s", physicalLocationId); + String pserverUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); + String cloudRegionUri = String.format("/cloud-infrastructure/complexes/complex/%s", physicalLocationId); doSetupResource(pserverUri, pserverData); doSetupResource(cloudRegionUri, complexData); String getRelationshipMockRequestUri = - String.format("cloud-infrastructure/pservers/pserver/%s/relationship-list", hostname); - String getRelationshipUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); + String.format("/cloud-infrastructure/pservers/pserver/%s/relationship-list", hostname); + String getRelationshipUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); MockHttpServletRequest mockReq = new MockHttpServletRequest("GET_RELATIONSHIP", getRelationshipMockRequestUri); HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class); when(mockRequest.getRequestURL()) @@ -797,18 +885,18 @@ public class ResourcesControllerTest { String tenant = "tenant01"; String vserver = "vserver01"; - String pserverUri = String.format("cloud-infrastructure/pservers/pserver/%s?skip-related-to=true", hostname); + String pserverUri = String.format("/cloud-infrastructure/pservers/pserver/%s?skip-related-to=true", hostname); String vserverUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s?skip-related-to=true", cloudRegionId); + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s?skip-related-to=true", cloudRegionId); // PUT the resources putResourceWithQueryParam(pserverUri, pserverData); putResourceWithQueryParam(vserverUri, vserverData); String pserverMockRequestUri = - String.format("cloud-infrastructure/pservers/pserver/%s?skip-related-to=true", hostname); + String.format("/cloud-infrastructure/pservers/pserver/%s?skip-related-to=true", hostname); String vserverMockRequestUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s?skip-related-to=true", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s?skip-related-to=true", cloudRegionId, tenant, vserver); // === GET - related-to-property should not exist === @@ -824,7 +912,7 @@ public class ResourcesControllerTest { // === Clean up (DELETE) === // vserver String deleteUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", cloudRegionId, tenant, vserver); Response response = deleteServerObject(vserverMockRequestUri, deleteUri, "vserver"); int code = response.getStatus(); @@ -834,7 +922,7 @@ public class ResourcesControllerTest { assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatus()); // pserver - deleteUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); + deleteUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); response = deleteServerObject(pserverMockRequestUri, deleteUri, "pserver"); code = response.getStatus(); if (!VALID_HTTP_STATUS_CODES.contains(code)) { @@ -853,16 +941,16 @@ public class ResourcesControllerTest { String tenant = "tenant02"; String vserver = "vserver02"; - String pserverUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); - String vserverUri = String.format("cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s", cloudRegionId); + String pserverUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); + String vserverUri = String.format("/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s", cloudRegionId); // PUT the resources doSetupResource(pserverUri, pserverData); doSetupResource(vserverUri, vserverData); - String pserverMockRequestUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); + String pserverMockRequestUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); String vserverMockRequestUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", cloudRegionId, tenant, vserver); // === GET - related-to-property should not exist === @@ -878,7 +966,7 @@ public class ResourcesControllerTest { // === Clean up (DELETE) === // vserver String deleteUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", cloudRegionId, tenant, vserver); Response response = deleteServerObject(vserverMockRequestUri, deleteUri, "vserver"); int code = response.getStatus(); @@ -888,7 +976,7 @@ public class ResourcesControllerTest { assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatus()); // pserver - deleteUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); + deleteUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); response = deleteServerObject(pserverMockRequestUri, deleteUri, "pserver"); code = response.getStatus(); if (!VALID_HTTP_STATUS_CODES.contains(code)) { @@ -908,9 +996,9 @@ public class ResourcesControllerTest { String vserver = "vserver03"; String pserverUri = String - .format("cloud-infrastructure/pservers/pserver/%s?skip-related-to=true&format=resource", hostname); + .format("/cloud-infrastructure/pservers/pserver/%s?skip-related-to=true&format=resource", hostname); String vserverUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s?skip-related-to=true&format=resource", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s?skip-related-to=true&format=resource", cloudRegionId); // PUT the resources @@ -918,9 +1006,9 @@ public class ResourcesControllerTest { putResourceWithQueryParam(vserverUri, vserverData); String pserverMockRequestUri = String - .format("cloud-infrastructure/pservers/pserver/%s?skip-related-to=true&format=resource", hostname); + .format("/cloud-infrastructure/pservers/pserver/%s?skip-related-to=true&format=resource", hostname); String vserverMockRequestUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s?skip-related-to=true&format=resource", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s?skip-related-to=true&format=resource", cloudRegionId, tenant, vserver); // === GET - related-to-property should not exist === @@ -936,10 +1024,10 @@ public class ResourcesControllerTest { // === Clean up (DELETE) === // vserver String deleteUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", cloudRegionId, tenant, vserver); String vserverMockRequestUriNoFormat = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", cloudRegionId, tenant, vserver); Response response = deleteServerObject(vserverMockRequestUriNoFormat, deleteUri, "vserver"); int code = response.getStatus(); @@ -949,7 +1037,7 @@ public class ResourcesControllerTest { assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatus()); // pserver - deleteUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); + deleteUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); response = deleteServerObject(pserverMockRequestUri, deleteUri, "pserver"); code = response.getStatus(); if (!VALID_HTTP_STATUS_CODES.contains(code)) { @@ -970,9 +1058,9 @@ public class ResourcesControllerTest { String vserver = "vserver04"; String pserverUri = String.format( - "cloud-infrastructure/pservers/pserver/%s?skip-related-to=true&format=resource_and_url", hostname); + "/cloud-infrastructure/pservers/pserver/%s?skip-related-to=true&format=resource_and_url", hostname); String vserverUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s?skip-related-to=true&format=resource_and_url", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s?skip-related-to=true&format=resource_and_url", cloudRegionId); // PUT the resources @@ -980,9 +1068,9 @@ public class ResourcesControllerTest { putResourceWithQueryParam(vserverUri, vserverData); String pserverMockRequestUri = String.format( - "cloud-infrastructure/pservers/pserver/%s?skip-related-to=true&format=resource_and_url", hostname); + "/cloud-infrastructure/pservers/pserver/%s?skip-related-to=true&format=resource_and_url", hostname); String vserverMockRequestUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s?skip-related-to=true&format=resource_and_url", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s?skip-related-to=true&format=resource_and_url", cloudRegionId, tenant, vserver); // === GET - related-to-property should not exist === @@ -998,10 +1086,10 @@ public class ResourcesControllerTest { // === Clean up (DELETE) === // vserver String deleteUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", cloudRegionId, tenant, vserver); String vserverMockRequestUriNoFormat = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", cloudRegionId, tenant, vserver); Response response = deleteServerObject(vserverMockRequestUriNoFormat, deleteUri, "vserver"); int code = response.getStatus(); @@ -1011,7 +1099,7 @@ public class ResourcesControllerTest { assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatus()); // pserver - deleteUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); + deleteUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); response = deleteServerObject(pserverMockRequestUri, deleteUri, "pserver"); code = response.getStatus(); if (!VALID_HTTP_STATUS_CODES.contains(code)) { @@ -1030,18 +1118,18 @@ public class ResourcesControllerTest { String tenant = "tenant05"; String vserver = "vserver05"; - String pserverUri = String.format("cloud-infrastructure/pservers/pserver/%s?skip-related-to=true", hostname); + String pserverUri = String.format("/cloud-infrastructure/pservers/pserver/%s?skip-related-to=true", hostname); String vserverUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s?skip-related-to=true", cloudRegionId); + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s?skip-related-to=true", cloudRegionId); // PUT the resources putResourceWithQueryParam(pserverUri, pserverData); putResourceWithQueryParam(vserverUri, vserverData); String pserverMockRequestUri = - String.format("cloud-infrastructure/pservers/pserver/%s?skip-related-to=true", hostname); + String.format("/cloud-infrastructure/pservers/pserver/%s?skip-related-to=true", hostname); String vserverMockRequestUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers?vserver-selflink=somelink05&skip-related-to=true", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers?vserver-selflink=somelink05&skip-related-to=true", cloudRegionId, tenant, vserver); // === GET - related-to-property should not exist === @@ -1057,10 +1145,10 @@ public class ResourcesControllerTest { // === Clean up (DELETE) === // vserver String deleteUri = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", cloudRegionId, tenant, vserver); String vserverMockRequestUriNoFormat = String.format( - "cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", + "/cloud-infrastructure/cloud-regions/cloud-region/test-aic/%s/tenants/tenant/%s/vservers/vserver/%s", cloudRegionId, tenant, vserver); Response response = deleteServerObject(vserverMockRequestUriNoFormat, deleteUri, "vserver"); int code = response.getStatus(); @@ -1070,7 +1158,7 @@ public class ResourcesControllerTest { assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatus()); // pserver - deleteUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname); + deleteUri = String.format("/cloud-infrastructure/pservers/pserver/%s", hostname); response = deleteServerObject(pserverMockRequestUri, deleteUri, "pserver"); code = response.getStatus(); if (!VALID_HTTP_STATUS_CODES.contains(code)) { |