diff options
author | Ittay Stern <ittay.stern@att.com> | 2018-12-31 17:21:27 +0200 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2019-01-09 20:19:55 +0200 |
commit | 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 (patch) | |
tree | 3bd672dff83e3218232cd8665680416b7fc26a5d /vid-app-common/src/test/java/org/onap/vid/services/CloudOwnerServiceTest.java | |
parent | 5ec29ff5e3864f1ba6ecac71f8bffbefa400cf27 (diff) |
Merge from ECOMP's repository
Main Features
--------------
- Async-Instantiation jobs mechanism major update; still WIP (package
`org.onap.vid.job`)
- New features in View/Edit: Activate fabric configuration; show
related networks; soft delete
- Support AAI service-tree traversal (`AAIServiceTree`)
- In-memory cache for SDC models and certain A&AI queries
(`CacheProviderWithLoadingCache`)
- Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
models
- Resolve Cloud-Owner values for MSO
- Pass X-ONAP headers to MSO
Infrastructure
--------------
- Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
- Surefire invokes both TestNG and JUnit tests
- Support Kotlin source files
- AaiController2 which handles errors in a "Spring manner"
- Inline generated-sources and remove jsonschema2pojo
Quality
--------
- Cumulative bug fixes (A&AI API, UI timeouts, and many more)
- Many Sonar issues cleaned-up
- Some unused classes removed
- Minor changes in vid-automation project, allowing some API
verification to run
Hard Merges
------------
- HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
- Moved `package org.onap.vid.controllers` to `controller`, without
plural -- just to keep semantic sync with ECOMP.
Reference commit in ECOMP: 3d1141625
Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-app-common/src/test/java/org/onap/vid/services/CloudOwnerServiceTest.java')
-rw-r--r-- | vid-app-common/src/test/java/org/onap/vid/services/CloudOwnerServiceTest.java | 125 |
1 files changed, 125 insertions, 0 deletions
diff --git a/vid-app-common/src/test/java/org/onap/vid/services/CloudOwnerServiceTest.java b/vid-app-common/src/test/java/org/onap/vid/services/CloudOwnerServiceTest.java new file mode 100644 index 000000000..d6148bf28 --- /dev/null +++ b/vid-app-common/src/test/java/org/onap/vid/services/CloudOwnerServiceTest.java @@ -0,0 +1,125 @@ +package org.onap.vid.services; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.onap.vid.aai.AaiClientInterface; +import org.onap.vid.exceptions.GenericUncheckedException; +import org.onap.vid.mso.model.CloudConfiguration; +import org.onap.vid.mso.rest.RequestDetails; +import org.onap.vid.properties.Features; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import org.togglz.core.manager.FeatureManager; + +import java.util.HashMap; +import java.util.Map; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasKey; +import static org.hamcrest.Matchers.not; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; + +public class CloudOwnerServiceTest { + + @Mock + private AaiClientInterface aaiClient; + + @Mock + private FeatureManager featureManager; + + @InjectMocks + private CloudOwnerServiceImpl cloudOwnerService; + + @BeforeClass + public void initMocks() { + MockitoAnnotations.initMocks(this); + } + + @AfterMethod + public void resetMocks() { + Mockito.reset(aaiClient); + Mockito.reset(featureManager); + } + + @DataProvider + public static Object[][] testEnrichRequestDataProvider() { + return new Object[][]{{true}, {false}}; + } + + @Test(dataProvider = "testEnrichRequestDataProvider") + public void whenCloudConfigurationInAdditionalProperties_cloudConfigurationIsEnrichedWithCloudOwner(boolean isFeatureActive) { + when(featureManager.isActive(Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST)).thenReturn(isFeatureActive); + String lcpCloudRegionId = "lcp1"; + RequestDetails requestDetails = createRequestDetailsWithCloudConfigurationInAdditionalProperties(lcpCloudRegionId); + String aaiCloudOwner = "myCloudOwner"; + when(aaiClient.getCloudOwnerByCloudRegionId(lcpCloudRegionId)).thenReturn(aaiCloudOwner); + cloudOwnerService.enrichRequestWithCloudOwner(requestDetails); + if (isFeatureActive) { + assertEquals(aaiCloudOwner, requestDetails.extractValueByPathUsingAdditionalProperties( + ImmutableList.of("requestDetails", "cloudConfiguration", "cloudOwner"), String.class)); + } + else { + Map<String,Object> cloudConfiguration = requestDetails.extractValueByPathUsingAdditionalProperties( + ImmutableList.of("requestDetails", "cloudConfiguration"), Map.class); + assertThat(cloudConfiguration, not(hasKey("cloudOwner"))); + } + } + + @Test(dataProvider = "testEnrichRequestDataProvider") + public void whenCloudConfigurationInRequestDetailsField_cloudConfigurationIsEnrichedWithCloudOwner(boolean isFeatureActive) { + when(featureManager.isActive(Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST)).thenReturn(isFeatureActive); + String lcpCloudRegionId = "lcp1"; + RequestDetails requestDetails = createRequestDetailsWithCloudField(lcpCloudRegionId); + String aaiCloudOwner = "myCloudOwner"; + when(aaiClient.getCloudOwnerByCloudRegionId(lcpCloudRegionId)).thenReturn(aaiCloudOwner); + cloudOwnerService.enrichRequestWithCloudOwner(requestDetails); + if (isFeatureActive) { + assertEquals(aaiCloudOwner, requestDetails.getCloudConfiguration().getCloudOwner()); + } + else { + assertNull(requestDetails.getCloudConfiguration().getCloudOwner()); + } + } + + private RequestDetails createRequestDetailsWithCloudConfigurationInAdditionalProperties(String lcpCloudRegionId) { + RequestDetails requestDetails = new RequestDetails(); + Map<String, Object> cloudConfiguration = new HashMap<>(); + cloudConfiguration.put("lcpCloudRegionId", lcpCloudRegionId); + requestDetails.setAdditionalProperty("requestDetails", + ImmutableMap.of("cloudConfiguration", cloudConfiguration)); + return requestDetails; + } + + private RequestDetails createRequestDetailsWithCloudField(String lcpCloudRegionId) { + CloudConfiguration cloudConfiguration = new CloudConfiguration(); + cloudConfiguration.setLcpCloudRegionId(lcpCloudRegionId); + RequestDetails requestDetails = new RequestDetails(); + requestDetails.setCloudConfiguration(cloudConfiguration); + return requestDetails; + } + + @Test(expectedExceptions= GenericUncheckedException.class) + public void whenAaiClientThrowException_thenExceptionIsPopulatedByEnrichMethod() { + when(featureManager.isActive(Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST)).thenReturn(true); + String lcpCloudRegionId = "lcp1"; + RequestDetails requestDetails = createRequestDetailsWithCloudConfigurationInAdditionalProperties(lcpCloudRegionId); + when(aaiClient.getCloudOwnerByCloudRegionId(lcpCloudRegionId)).thenThrow(new RuntimeException()); + cloudOwnerService.enrichRequestWithCloudOwner(requestDetails); + } + + @Test + public void whenThereIsNoCloudConfiguration_enrichmentMethodNotFailed() { + when(featureManager.isActive(Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST)).thenReturn(true); + RequestDetails requestDetails = new RequestDetails(); + cloudOwnerService.enrichRequestWithCloudOwner(requestDetails); + //if no exception was thrown test success + } +} |