X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fmodel-loader.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Frestclient%2FTestAaiRestClient.java;h=37b7e121ece78a36c6f24368017d7d48556142d2;hp=97b30f54a4bf135e99e990dc8873d19c614886f8;hb=HEAD;hpb=9a00ccfbf7202b571a7dbc40e63b60750c5773f6 diff --git a/src/test/java/org/onap/aai/modelloader/restclient/TestAaiRestClient.java b/src/test/java/org/onap/aai/modelloader/restclient/TestAaiRestClient.java index 97b30f5..191e032 100644 --- a/src/test/java/org/onap/aai/modelloader/restclient/TestAaiRestClient.java +++ b/src/test/java/org/onap/aai/modelloader/restclient/TestAaiRestClient.java @@ -20,23 +20,25 @@ */ package org.onap.aai.modelloader.restclient; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import java.util.Properties; import java.util.stream.IntStream; import java.util.stream.Stream; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; + import javax.xml.parsers.DocumentBuilderFactory; -import org.onap.aai.modelloader.config.ModelLoaderConfig; + +import org.onap.aai.modelloader.config.AaiProperties; import org.onap.aai.modelloader.entity.ArtifactType; import org.onap.aai.modelloader.entity.model.ModelArtifact; import org.onap.aai.modelloader.entity.model.ModelArtifactParser; -import org.onap.aai.restclient.client.OperationResult; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.RestTemplate; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -47,12 +49,11 @@ public class TestAaiRestClient { // This test requires a running A&AI system. To test locally, annotate with org.junit.Test public void testRestClient() throws Exception { - Properties props = new Properties(); - props.setProperty("ml.distribution.ARTIFACT_TYPES", "MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG"); - props.setProperty("ml.aai.BASE_URL", "https://localhost:8443"); - props.setProperty("ml.aai.MODEL_URL", "/aai/v9/service-design-and-creation/models/model/"); - - ModelLoaderConfig config = new ModelLoaderConfig(props, "."); + AaiProperties aaiProperties = new AaiProperties(); + aaiProperties.setBaseUrl("http://aai.onap:80"); + aaiProperties.setModelUrl("/aai/%s/service-design-and-creation/models/model/"); + aaiProperties.setNamedQueryUrl("/aai/%s/service-design-and-creation/named-queries/named-query/"); + aaiProperties.setVnfImageUrl("/aai/%s/service-design-and-creation/vnf-images"); File xmlFile = new File(MODEL_FILE); DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); @@ -87,21 +88,21 @@ public class TestAaiRestClient { model.setPayload(readFile(MODEL_FILE)); model.setModelNamespace("http://org.openecomp.aai.inventory/v9"); - AaiRestClient aaiClient = new AaiRestClient(config); + AaiRestClient aaiClient = new AaiRestClient(aaiProperties, new RestTemplate()); // GET model - OperationResult opResult = - aaiClient.getResource(getUrl(model, config), "example-trans-id-0", MediaType.APPLICATION_XML_TYPE); - assertTrue(opResult.getResultCode() == Response.Status.NOT_FOUND.getStatusCode()); + ResponseEntity opResult = + aaiClient.getResource(getUrl(model, aaiProperties), "example-trans-id-0", MediaType.APPLICATION_XML, String.class); + assertEquals(opResult.getStatusCode(), HttpStatus.NOT_FOUND); // PUT the model - opResult = aaiClient.putResource(getUrl(model, config), model.getPayload(), "example-trans-id-1", - MediaType.APPLICATION_XML_TYPE); - assertTrue(opResult.getResultCode() == Response.Status.CREATED.getStatusCode()); + opResult = aaiClient.putResource(getUrl(model, aaiProperties), model.getPayload(), "example-trans-id-1", + MediaType.APPLICATION_XML, String.class); + assertEquals(opResult.getStatusCode(), HttpStatus.CREATED); // DELETE the model - opResult = aaiClient.getAndDeleteResource(getUrl(model, config), "example-trans-id-3"); - assertTrue(opResult.getResultCode() == Response.Status.NO_CONTENT.getStatusCode()); + opResult = aaiClient.getAndDeleteResource(getUrl(model, aaiProperties), "example-trans-id-3"); + assertEquals(opResult.getStatusCode(), HttpStatus.NO_CONTENT); } catch (Exception e) { e.printStackTrace(); } @@ -116,15 +117,15 @@ public class TestAaiRestClient { return new String(encoded); } - private String getUrl(ModelArtifact model, ModelLoaderConfig config) { + private String getUrl(ModelArtifact model, AaiProperties aaiProperties) { String subUrl; if (model.getType().equals(ArtifactType.MODEL)) { - subUrl = config.getAaiModelUrl(model.getModelNamespaceVersion()).trim(); + subUrl = String.format(aaiProperties.getModelUrl(), model.getModelNamespaceVersion()).trim(); } else { - subUrl = config.getAaiNamedQueryUrl(model.getModelNamespaceVersion()).trim(); + subUrl = String.format(aaiProperties.getNamedQueryUrl(), model.getModelNamespaceVersion()).trim(); } - String baseUrl = config.getAaiBaseUrl().trim(); + String baseUrl = aaiProperties.getBaseUrl().trim(); if (!baseUrl.endsWith("/") && !subUrl.startsWith("/")) { baseUrl = baseUrl + "/"; }