import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
-import java.util.Properties;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import org.junit.Test;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
-import org.onap.aai.modelloader.config.ModelLoaderConfig;
+import org.onap.aai.modelloader.config.AaiProperties;
import org.onap.aai.modelloader.entity.Artifact;
+import org.onap.aai.modelloader.entity.ArtifactType;
import org.onap.aai.modelloader.restclient.AaiRestClient;
-import org.onap.aai.restclient.client.OperationResult;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
public class TestVnfCatalogArtifactHandler {
- protected static String CONFIG_FILE = "model-loader.properties";
+ protected static AaiProperties aaiProperties = new AaiProperties();
private AaiRestClient mockRestClient = mock(AaiRestClient.class);
+ @BeforeAll
+ public static void setup() {
+ 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/v*/service-design-and-creation/vnf-images");
+ }
+
/**
* Update A&AI with 4 images, 2 of which already exist.
- *
+ *
* @throws Exception
*/
@Test
public void testUpdateVnfImages() throws Exception {
// GET operation
- OperationResult mockGetResp = mock(OperationResult.class);
+ ResponseEntity mockGetResp = mock(ResponseEntity.class);
// @formatter:off
- when(mockGetResp.getResultCode())
- .thenReturn(Response.Status.OK.getStatusCode())
- .thenReturn(Response.Status.NOT_FOUND.getStatusCode())
- .thenReturn(Response.Status.NOT_FOUND.getStatusCode())
- .thenReturn(Response.Status.OK.getStatusCode());
+ when(mockGetResp.getStatusCodeValue())
+ .thenReturn(HttpStatus.OK.value())
+ .thenReturn(HttpStatus.NOT_FOUND.value())
+ .thenReturn(HttpStatus.NOT_FOUND.value())
+ .thenReturn(HttpStatus.OK.value());
// @formatter:on
- when(mockRestClient.getResource(Mockito.anyString(), Mockito.anyString(), Mockito.any(MediaType.class)))
+ when(mockRestClient.getResource(Mockito.anyString(), Mockito.anyString(), Mockito.any(MediaType.class), Mockito.any()))
.thenReturn(mockGetResp);
mockPutOperations();
// Example VNF Catalog XML
- VnfCatalogArtifactHandler handler = new VnfCatalogArtifactHandler(createConfig());
- assertThat(handler.pushArtifacts(createVnfCatalogArtifact(), "test", new ArrayList<Artifact>(), mockRestClient),
- is(true));
+ VnfCatalogArtifactHandler handler = new VnfCatalogArtifactHandler(aaiProperties);
+ assertTrue(handler.pushArtifacts(createVnfCatalogArtifact(), "test", new ArrayList<Artifact>(), mockRestClient));
assertPutOperationsSucceeded();
}
- private ModelLoaderConfig createConfig() {
- Properties configProperties = new Properties();
- try {
- configProperties.load(this.getClass().getClassLoader().getResourceAsStream(CONFIG_FILE));
- } catch (IOException e) {
- fail();
- }
- ModelLoaderConfig config = new ModelLoaderConfig(configProperties, null);
- return config;
+ @Test
+ public void testUpdateVnfImagesFromXml() throws Exception {
+ // GET operation
+ ResponseEntity mockGetResp = mock(ResponseEntity.class);
+
+ // @formatter:off
+ when(mockGetResp.getStatusCodeValue())
+ .thenReturn(HttpStatus.OK.value())
+ .thenReturn(HttpStatus.NOT_FOUND.value())
+ .thenReturn(HttpStatus.NOT_FOUND.value())
+ .thenReturn(HttpStatus.OK.value());
+ // @formatter:on
+
+ when(mockRestClient.getResource(Mockito.anyString(), Mockito.anyString(), Mockito.any(MediaType.class), Mockito.any()))
+ .thenReturn(mockGetResp);
+ mockPutOperations();
+
+ // Example VNF Catalog XML
+ VnfCatalogArtifactHandler handler = new VnfCatalogArtifactHandler(aaiProperties);
+ assertThat(
+ handler.pushArtifacts(createVnfCatalogXmlArtifact(), "test", new ArrayList<Artifact>(), mockRestClient),
+ is(true));
+
+ // Only two of the VNF images should be pushed
+ ArgumentCaptor<String> argument = ArgumentCaptor.forClass(String.class);
+ AaiRestClient client = Mockito.verify(mockRestClient, Mockito.times(2));
+ client.putResource(Mockito.anyString(), argument.capture(), Mockito.anyString(), Mockito.any(MediaType.class), Mockito.any());
+ assertThat(argument.getAllValues().size(), is(2));
+ assertThat(argument.getAllValues().get(0), containsString("5.2.5"));
+ assertThat(argument.getAllValues().get(0), containsString("VM00"));
+ assertThat(argument.getAllValues().get(1), containsString("5.2.4"));
+ assertThat(argument.getAllValues().get(1), containsString("VM00"));
}
/**
* Example VNF Catalog based on JSON data (returned by Babel)
- *
+ *
* @return test Artifacts
* @throws IOException
* @throws UnsupportedEncodingException
return artifacts;
}
+ /**
+ * Example VNF Catalog based on VNF_CATALOG XML
+ *
+ * @return test Artifacts
+ * @throws IOException
+ * @throws UnsupportedEncodingException
+ */
+ private List<Artifact> createVnfCatalogXmlArtifact() throws IOException, UnsupportedEncodingException {
+ byte[] encoded = Files.readAllBytes(Paths.get("src/test/resources/xmlFiles/fortigate.xml"));
+ List<Artifact> artifacts = new ArrayList<Artifact>();
+ artifacts.add(new VnfCatalogArtifact(ArtifactType.VNF_CATALOG_XML, new String(encoded, "utf-8")));
+ return artifacts;
+ }
+
/**
* Always return CREATED (success) for a PUT operation.
*/
private void mockPutOperations() {
- OperationResult mockPutResp = mock(OperationResult.class);
- when(mockPutResp.getResultCode()).thenReturn(Response.Status.CREATED.getStatusCode());
+ ResponseEntity mockPutResp = mock(ResponseEntity.class);
+ when(mockPutResp.getStatusCode()).thenReturn(HttpStatus.CREATED);
when(mockRestClient.putResource(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(),
- Mockito.any(MediaType.class))).thenReturn(mockPutResp);
+ Mockito.any(MediaType.class), Mockito.any())).thenReturn(mockPutResp);
}
private void assertPutOperationsSucceeded() {
ArgumentCaptor<String> argument = ArgumentCaptor.forClass(String.class);
AaiRestClient mockedClient = Mockito.verify(mockRestClient, Mockito.times(2));
mockedClient.putResource(Mockito.anyString(), argument.capture(), Mockito.anyString(),
- Mockito.any(MediaType.class));
+ Mockito.any(MediaType.class), Mockito.any());
assertThat(argument.getAllValues().get(0), containsString("3.16.9"));
assertThat(argument.getAllValues().get(0), containsString("VM00"));
assertThat(argument.getAllValues().get(1), containsString("3.16.1"));
Code Review / aai / model-loader.git / blobdiff