diff options
Diffstat (limited to 'asdc-controller/src/test')
8 files changed, 24 insertions, 173 deletions
diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/EmbeddedCatalogDbConfig.java b/asdc-controller/src/test/java/org/onap/so/asdc/EmbeddedCatalogDbConfig.java index f7e678731e..27b6c0ab53 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/EmbeddedCatalogDbConfig.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/EmbeddedCatalogDbConfig.java @@ -25,7 +25,7 @@ import ch.vorburger.mariadb4j.springframework.MariaDB4jSpringService; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; +import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/EmbeddedRequestDbConfig.java b/asdc-controller/src/test/java/org/onap/so/asdc/EmbeddedRequestDbConfig.java index 6d1bfcdb8f..2827f8721e 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/EmbeddedRequestDbConfig.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/EmbeddedRequestDbConfig.java @@ -25,7 +25,7 @@ import ch.vorburger.mariadb4j.springframework.MariaDB4jSpringService; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; +import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; import org.springframework.context.annotation.Bean; diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCStatusCallBackTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCStatusCallBackTest.java index 97fa773fd5..ba95a6ea24 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCStatusCallBackTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCStatusCallBackTest.java @@ -20,7 +20,7 @@ package org.onap.so.asdc.client; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/ASDCRestInterfaceTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/ASDCRestInterfaceTest.java index 1944c3af73..4eabcdd946 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/ASDCRestInterfaceTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/ASDCRestInterfaceTest.java @@ -75,7 +75,7 @@ import org.onap.so.db.catalog.data.repository.ServiceProxyResourceRepository; import org.onap.so.db.catalog.data.repository.ServiceRepository; import org.onap.so.db.catalog.data.repository.VnfcInstanceGroupCustomizationRepository; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.embedded.LocalServerPort; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/HealthCheckTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/HealthCheckTest.java index f5f7445771..cd2c3ee7e6 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/HealthCheckTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/HealthCheckTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.onap.so.asdc.Application; import org.onap.so.asdc.BaseTest; -import org.springframework.boot.context.embedded.LocalServerPort; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.http.HttpEntity; diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java index 89bfe07374..9ab4c5ecb2 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java @@ -25,7 +25,7 @@ import static com.shazam.shazamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; @@ -221,161 +221,6 @@ public class ToscaResourceInstallerTest extends BaseTest { } @Test - @Ignore - @Transactional - public void installTheResourceTest() throws Exception { - notificationData.setDistributionID("testStatusSuccessTosca"); - notificationData.setServiceVersion("123456"); - notificationData.setServiceUUID("5df8b6de-2083-11e7-93ae-92361f002671"); - notificationData.setWorkloadContext("workloadContext"); - - HashMap<String, VfModuleArtifact> vfModuleArtifacts = mock(HashMap.class); - CapabilityAssignments capabilityAssignments = mock(CapabilityAssignments.class); - CapabilityAssignment capabilityAssignment = mock(CapabilityAssignment.class); - - vfResourceStructure = spy(new VfResourceStructure(notificationData, resourceInstance)); - - VnfResource vnfResource = new VnfResource(); - vnfResource.setModelName("modelName"); - vnfResource.setModelVersion("1.1"); - vnfResource.setModelUUID("modelUUID"); - vnfResource.setOrchestrationMode("orchestrationMode"); - - VnfResourceCustomization vnfResourceCustomization = new VnfResourceCustomization(); - vnfResourceCustomization.setVnfResources(vnfResource); - vnfResourceCustomization.setModelCustomizationUUID("vnfResCustModelCustomizationUUID"); - vnfResourceCustomization.setModelInstanceName("modelInstanceName"); - - AllottedResource allottedResource = new AllottedResource(); - allottedResource.setModelUUID("serviceMetadataValue"); - allottedResource.setModelInvariantUUID("modelInvariantUUID"); - allottedResource.setModelName("modelName"); - allottedResource.setModelVersion("1.1"); - - AllottedResourceCustomization allottedResourceCustomization = new AllottedResourceCustomization(); - allottedResourceCustomization.setAllottedResource(allottedResource); - allottedResourceCustomization.setModelCustomizationUUID("modelCustomizationUUID"); - allottedResourceCustomization.setModelInstanceName("modelInstanceName"); - - Service catalogService = new Service(); - catalogService.setServiceType("serviceType"); - catalogService.setModelUUID("5df8b6de-2083-11e7-93ae-92361f002672"); - catalogService.setModelInvariantUUID("modelInvariantUUID"); - catalogService.setModelName("modelName"); - catalogService.setModelVersion("modelVersion"); - catalogService.getVnfCustomizations().add(vnfResourceCustomization); - - Iterator artifactIterator = mock(Iterator.class); - Iterator nodeTemplateIterator = mock(Iterator.class); - IDistributionClientDownloadResult clientResult = mock(IDistributionClientDownloadResult.class); - doReturn(IOUtils.toByteArray( - new FileInputStream( - new File( - getClass().getClassLoader().getResource("resource-examples/simpleTest.yaml").getFile()) - ))).when(clientResult).getArtifactPayload(); - VfModuleArtifact vfModuleArtifact = new VfModuleArtifact(artifactInfo, clientResult); - Collection<VfModuleArtifact> vfModuleArtifactsValues = mock(Collection.class); - - NodeTemplate nodeTemplate = mock(NodeTemplate.class); - List<NodeTemplate> nodeTemplateList = new ArrayList<>(); - nodeTemplateList.add(nodeTemplate); - - HeatTemplate heatTemplate = new HeatTemplate(); - heatTemplate.setArtifactUuid("ff874603-4222-11e7-9252-005056850d2e"); - heatTemplate.setArtifactChecksum("MANUAL RECORD"); - heatTemplate.setTemplateBody("templateBody"); - heatTemplate.setTemplateName("module_mns_zrdm3frwl01exn_01_rgvm_1.yml"); - heatTemplate.setVersion("1"); - - NetworkResource networkResource = new NetworkResource(); - networkResource.setAicVersionMin("aicVersionMin"); - networkResource.setModelUUID("modelUUID"); - networkResource.setOrchestrationMode("orchestrationMode"); - networkResource.setModelVersion("modelVersion"); - networkResource.setNeutronNetworkType("neutronNetworkType"); - networkResource.setAicVersionMax("aicVersionMax"); - networkResource.setModelName("CONTRAIL30_GNDIRECT"); - networkResource.setModelInvariantUUID("modelInvariantUUID"); - networkResource.setHeatTemplate(heatTemplate); - - NetworkResourceCustomization networkResourceCustomization = new NetworkResourceCustomization(); - networkResourceCustomization.setModelCustomizationUUID("modelCustomizationUUID"); - networkResourceCustomization.setModelInstanceName("modelInstanceName"); - networkResourceCustomization.setNetworkResource(networkResource); - - WatchdogServiceModVerIdLookup expectedModVerIdLookup = new WatchdogServiceModVerIdLookup(notificationData.getDistributionID(), notificationData.getServiceUUID()); - WatchdogDistributionStatus expectedDistributionStatus = new WatchdogDistributionStatus(notificationData.getDistributionID()); - WatchdogComponentDistributionStatus expectedComponentDistributionStatus = new WatchdogComponentDistributionStatus(notificationData.getDistributionID(), MSO); - expectedComponentDistributionStatus.setComponentDistributionStatus(DistributionStatusEnum.COMPONENT_DONE_OK.name()); - - doReturn(sdcCsarHelper).when(toscaResourceStruct).getSdcCsarHelper(); - doReturn("metadataPropertyValue").when(sdcCsarHelper).getMetadataPropertyValue(any(Metadata.class), any(String.class)); - doReturn("ntPropertyLeafValue").when(sdcCsarHelper).getNodeTemplatePropertyLeafValue(any(NodeTemplate.class), any(String.class)); - doReturn("true").when(sdcCsarHelper).getNodeTemplatePropertyLeafValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_PROVIDERNETWORK_ISPROVIDERNETWORK); - doReturn("1").when(sdcCsarHelper).getCapabilityPropertyLeafValue(any(CapabilityAssignment.class), any(String.class)); - doReturn(vfGroups).when(sdcCsarHelper).getVfModulesByVf(any(String.class)); - doReturn(capabilityAssignments).when(sdcCsarHelper).getCapabilitiesOf(any(NodeTemplate.class)); - doReturn(capabilityAssignment).when(capabilityAssignments).getCapabilityByName(any(String.class)); - - doReturn(catalogService).when(toscaResourceStruct).getCatalogService(); - - doReturn(artifactInfo).when(toscaResourceStruct).getToscaArtifact(); - doReturn("artifactChecksum").when(artifactInfo).getArtifactChecksum(); - doReturn("artifactUUID").when(artifactInfo).getArtifactUUID(); - doReturn("artifactName").when(artifactInfo).getArtifactName(); - doReturn("1.0").when(artifactInfo).getArtifactVersion(); - doReturn("artifactDescription").when(artifactInfo).getArtifactDescription(); - doReturn("artifactURL").when(artifactInfo).getArtifactURL(); - - doReturn(metadata).when(toscaResourceStruct).getServiceMetadata(); - doReturn("serviceMetadataValue").when(metadata).getValue(any(String.class)); - doReturn("CONTRAIL30_GNDIRECT").when(metadata).getValue(SdcPropertyNames.PROPERTY_NAME_NAME); - - doReturn("serviceVersion").when(toscaResourceStruct).getServiceVersion(); - doReturn(nodeTemplateList).when(sdcCsarHelper).getServiceVfList(); - doReturn(nodeTemplateList).when(sdcCsarHelper).getServiceVlList(); - doReturn(nodeTemplateList).when(sdcCsarHelper).getAllottedResources(); - doReturn(metadata).when(nodeTemplate).getMetaData(); - doReturn("model_instance_name").when(nodeTemplate).getName(); - doReturn(vnfResourceCustomization).when(toscaResourceStruct).getCatalogVnfResourceCustomization(); - doReturn(allottedResource).when(toscaResourceStruct).getAllottedResource(); - doReturn(allottedResourceCustomization).when(toscaResourceStruct).getCatalogAllottedResourceCustomization(); - - doReturn(vfModuleArtifacts).when(vfResourceStructure).getArtifactsMapByUUID(); - when(vfModuleArtifacts.values()).thenReturn(vfModuleArtifactsValues); - when(vfModuleArtifactsValues.iterator()).thenReturn(artifactIterator); - when(artifactIterator.hasNext()).thenReturn(true, false); - when(artifactIterator.next()).thenReturn(vfModuleArtifact); - when(artifactInfo.getArtifactType()).thenReturn(ASDCConfiguration.OTHER); - when(nodeTemplateIterator.hasNext()).thenReturn(true, false); - - doReturn(networkResource).when(toscaResourceStruct).getCatalogNetworkResource(); - doReturn(networkResourceCustomization).when(toscaResourceStruct).getCatalogNetworkResourceCustomization(); - - doNothing().when(toscaResourceStruct).setSuccessfulDeployment(); - - toscaInstaller.installTheResource(toscaResourceStruct, vfResourceStructure); - - AllottedResource actualAllottedResource = allottedRepo.findResourceByModelUUID(allottedResource.getModelUUID()); - AllottedResourceCustomization actualAllottedResourceCustomization = allottedCustomizationRepo.findOne(allottedResourceCustomization.getModelCustomizationUUID()); - Service actualService = serviceRepo.findByServiceType(catalogService.getServiceType()); - WatchdogComponentDistributionStatus actualWatchdogComponentDistributionStatus = getWatchdogCDStatusWithName(watchdogCDStatusRepository.findByDistributionId(notificationData.getDistributionID()), MSO); - - verify(toscaResourceStruct, times(1)).setSuccessfulDeployment(); - assertThat(actualAllottedResource, - sameBeanAs(allottedResource)); - assertThat(actualAllottedResourceCustomization, sameBeanAs(allottedResourceCustomization) - .ignoring("created")); - assertThat(actualService, sameBeanAs(catalogService) - .ignoring("created") - .ignoring("networkCustomizations.0x1.created") - .ignoring("networkCustomizations.0x1.networkResource.created")); - assertThat(actualWatchdogComponentDistributionStatus, sameBeanAs(expectedComponentDistributionStatus) - .ignoring("createTime") - .ignoring("modifyTime")); - } - - @Test public void installTheResourceExceptionTest() throws Exception { expectedException.expect(ArtifactInstallerException.class); diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/tenantIsolation/WatchdogDistributionTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/tenantIsolation/WatchdogDistributionTest.java index b72e079e9e..cfce0f6a17 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/tenantIsolation/WatchdogDistributionTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/tenantIsolation/WatchdogDistributionTest.java @@ -21,8 +21,8 @@ package org.onap.so.asdc.tenantIsolation; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; diff --git a/asdc-controller/src/test/resources/application-test.yaml b/asdc-controller/src/test/resources/application-test.yaml index 9cfc500618..119e677246 100644 --- a/asdc-controller/src/test/resources/application-test.yaml +++ b/asdc-controller/src/test/resources/application-test.yaml @@ -7,12 +7,11 @@ ssl-enable: false spring: datasource: - url: jdbc:mariadb://localhost:3307/catalogdb + jdbc-url: jdbc:mariadb://localhost:3307/catalogdb username: root password: password driver-class-name: org.mariadb.jdbc.Driver - initialize: true - initialization-mode: never + initialization-mode: always jpa: generate-ddl: false show-sql: false @@ -36,19 +35,26 @@ mariaDB4j: request: datasource: - url: jdbc:mariadb://localhost:3307/requestdb + jdbc-url: jdbc:mariadb://localhost:3307/requestdb username: root password: password driver-class-name: org.mariadb.jdbc.Driver #Actuator -management: +management: endpoints: - enabled-by-default: false - endpoint: - info: - enabled: true + web: + base-path: /manage + server: + servlet: + context-path: /manage + metrics: + se-global-registry: false + export: + prometheus: + enabled: true # Whether exporting of metrics to Prometheus is enabled. + step: 1m # Step size (i.e. reporting frequency) to use. mso: adapters: @@ -70,7 +76,7 @@ mso: consumerId: msoasdc-id-local environmentName: Pre-IST asdcAddress: localhost:8443 - password: 658D6E9E0C087547284339181615C358 + password: CB655C3C236F1F0370A347E3A0E0E133BE10ADCF4D16377E7378D3FE46A4BF60C27DF1FFB4 pollingInterval: 30 pollingTimeout: 30 relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL |