diff options
Diffstat (limited to 'catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine')
14 files changed, 446 insertions, 298 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/ArtifactInfoImplTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/ArtifactInfoImplTest.java index 409cdb6eea..0b9542c269 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/ArtifactInfoImplTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/ArtifactInfoImplTest.java @@ -29,7 +29,11 @@ import org.openecomp.sdc.be.model.ComponentInstance; import org.openecomp.sdc.be.model.Service; import org.openecomp.sdc.common.api.ArtifactTypeEnum; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; public class ArtifactInfoImplTest extends BeConfDependentTest { @@ -315,12 +319,4 @@ public class ArtifactInfoImplTest extends BeConfDependentTest { testSubject.setGeneratedFromUUID(generatedFromUUID); } - @Test - public void testUpdateArtifactTimeout() throws Exception { - ArtifactInfoImpl testSubject; - - // default test - testSubject = createTestSubject(); - testSubject.updateArtifactTimeout(); - } } diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/AuditDistributionNotificationBuilderTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/AuditDistributionNotificationBuilderTest.java index f3d901c456..c1cf520c8f 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/AuditDistributionNotificationBuilderTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/AuditDistributionNotificationBuilderTest.java @@ -19,15 +19,16 @@ */ package org.openecomp.sdc.be.components.distribution.engine; -import static org.mockito.Mockito.RETURNS_DEFAULTS; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.openecomp.sdc.be.model.Service; import org.openecomp.sdc.be.model.User; +import static org.mockito.Mockito.RETURNS_DEFAULTS; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class AuditDistributionNotificationBuilderTest { diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/CambriaHandlerTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/CambriaHandlerTest.java index 516c0962cd..980bb8369a 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/CambriaHandlerTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/CambriaHandlerTest.java @@ -48,7 +48,11 @@ import org.openecomp.sdc.common.impl.FSConfigurationSource; import java.io.IOException; import java.net.MalformedURLException; import java.security.GeneralSecurityException; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineHealthCheckTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineHealthCheckTest.java index 3c88ce96ae..1fa0fc60b7 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineHealthCheckTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineHealthCheckTest.java @@ -40,9 +40,41 @@ public class DistributionEngineHealthCheckTest extends BeConfDependentTest { @Mock private CambriaHandler cambriaHandler = Mockito.mock(CambriaHandler.class); + DistributionEngineClusterHealth distributionEngineClusterHealth = new DistributionEngineClusterHealth(); + + Gson gson = new Gson(); + + Gson prettyGson = new GsonBuilder().setPrettyPrinting().create(); + + // + // @Test + // public void validateDownWhenEnvAreDown() { + // + // Map<String, AtomicBoolean> envNamePerStatus = new HashMap<>(); + // envNamePerStatus.put("PROD1", new AtomicBoolean(false)); + // envNamePerStatus.put("PROD2", new AtomicBoolean(false)); + // + // distributionEngineClusterHealth.startHealthCheckTask(envNamePerStatus); + // + // HealthCheckInfo healthCheckInfo = + // distributionEngineClusterHealth.getHealthCheckInfo(); + // assertEquals("verify down", HealthCheckStatus.DOWN, + // healthCheckInfo.getHealthCheckStatus()); + // assertEquals("verify DE component", HealthCheckComponent.DE, + // healthCheckInfo.getHealthCheckComponent()); + // + // } + @Test public void validateUpWhenQuerySucceed() { + // Map<String, AtomicBoolean> envNamePerStatus = new HashMap<>(); + // envNamePerStatus.put("PROD1", new AtomicBoolean(true)); + // envNamePerStatus.put("PROD2", new AtomicBoolean(false)); + // + // distributionEngineClusterHealth.startHealthCheckTask(envNamePerStatus, + // false); + CambriaErrorResponse cambriaOkResponse = new CambriaErrorResponse(CambriaOperationStatus.OK, 200); CambriaErrorResponse cambriaErrorResponse = new CambriaErrorResponse(CambriaOperationStatus.INTERNAL_SERVER_ERROR, 500); CambriaErrorResponse cambriaNotErrorResponse = new CambriaErrorResponse(CambriaOperationStatus.AUTHENTICATION_ERROR, 403); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineInitTaskTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineInitTaskTest.java index 4a9c8e4d81..5643cd07bf 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineInitTaskTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineInitTaskTest.java @@ -43,7 +43,9 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Mockito.when; diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEnginePollingTaskTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEnginePollingTaskTest.java index 84c5ff1891..be450c493b 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEnginePollingTaskTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEnginePollingTaskTest.java @@ -29,6 +29,11 @@ import org.openecomp.sdc.be.components.distribution.engine.report.DistributionCo import org.openecomp.sdc.be.config.DistributionEngineConfiguration; import org.openecomp.sdc.be.impl.ComponentsUtils; import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry; +import org.openecomp.sdc.common.log.wrappers.LoggerSdcAudit; + +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; public class DistributionEnginePollingTaskTest extends BeConfDependentTest { @@ -39,16 +44,25 @@ public class DistributionEnginePollingTaskTest extends BeConfDependentTest { componentsUtils = Mockito.mock(ComponentsUtils.class); DistributionEngineConfiguration distributionEngineConfiguration = configurationManager .getDistributionEngineConfiguration(); - + distributionEngineConfiguration.setDistributionNotifTopicName("StamName"); + distributionEngineConfiguration.setDistributionStatusTopicName("StamName"); + List uebList = new LinkedList<>(); + uebList.add("FirstUEBserver.com"); + distributionEngineConfiguration.setUebServers(uebList); + + OperationalEnvironmentEntry environmentEntry = new OperationalEnvironmentEntry(); + HashSet<String> dmaapUebAddress = new HashSet<>(); + dmaapUebAddress.add("STAM"); + environmentEntry.setDmaapUebAddress(dmaapUebAddress); return new DistributionEnginePollingTask(distributionEngineConfiguration, new DistributionCompleteReporterMock(), componentsUtils, new DistributionEngineClusterHealth(), - new OperationalEnvironmentEntry()); + environmentEntry); } @Test public void testStartTask() throws Exception { DistributionEnginePollingTask testSubject; - String topicName = ""; + String topicName = "UEBTopic"; // default test testSubject = createTestSubject(); @@ -99,9 +113,9 @@ public class DistributionEnginePollingTaskTest extends BeConfDependentTest { testSubject = createTestSubject(); Mockito.doNothing().when(componentsUtils).auditDistributionStatusNotification( Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), - Mockito.anyString(), Mockito.anyString()); + Mockito.anyString(), Mockito.anyString(), Mockito.isNull()); Deencapsulation.invoke(testSubject, "handleDistributionNotificationMsg", - notification); + notification, new LoggerSdcAudit(DistributionEnginePollingTask.class)); } @Test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineTest.java index 9e7930d7e0..8473bb2cb7 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineTest.java @@ -21,19 +21,16 @@ package org.openecomp.sdc.be.components.distribution.engine; import mockit.Deencapsulation; -import java.util.LinkedList; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.openecomp.sdc.be.components.BeConfDependentTest; import org.openecomp.sdc.be.components.utils.OperationalEnvironmentBuilder; +import org.openecomp.sdc.be.config.Configuration; import org.openecomp.sdc.be.config.DistributionEngineConfiguration; -import org.openecomp.sdc.be.config.DistributionEngineConfiguration.CreateTopicConfig; import org.openecomp.sdc.be.config.DistributionEngineConfiguration.DistributionStatusTopicConfig; import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.model.Service; @@ -52,10 +49,11 @@ import java.util.stream.Stream; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -public class DistributionEngineTest extends BeConfDependentTest{ +public class DistributionEngineTest{ public static final String DISTRIBUTION_ID = "distId"; public static final String ENV_ID = "envId"; @@ -70,19 +68,18 @@ public class DistributionEngineTest extends BeConfDependentTest{ @Mock private DistributionNotificationSender distributionNotificationSender; - + @Mock private ServiceDistributionArtifactsBuilder serviceDistributionArtifactsBuilder; - - @Mock - private DistributionEngineClusterHealth distributionEngineClusterHealth; - + private DummyDistributionConfigurationManager distributionEngineConfigurationMock; private Map<String, OperationalEnvironmentEntry> envs; private User modifier = new User(); + private Configuration.EnvironmentContext environmentContext = mock(Configuration.EnvironmentContext.class); + @Before public void setUpMock() throws Exception { MockitoAnnotations.initMocks(this); @@ -91,6 +88,9 @@ public class DistributionEngineTest extends BeConfDependentTest{ modifier.setUserId(USER_ID); modifier.setFirstName(MODIFIER); modifier.setLastName(MODIFIER); + when(environmentContext.getDefaultValue()).thenReturn("General_Revenue-Bearing"); + when(distributionEngineConfigurationMock.getConfiguration().getEnvironmentContext()) + .thenReturn(environmentContext); } @Test @@ -135,58 +135,17 @@ public class DistributionEngineTest extends BeConfDependentTest{ .collect(Collectors.toMap(OperationalEnvironmentEntry::getEnvironmentId, Function.identity())); } - @Test - public void testIsActive() throws Exception { - // default test - testInstance.isActive(); + private DistributionEngine createTestSubject() { + return new DistributionEngine(); } - - @Test - public void testInitDisabled() throws Exception { - // default test - Deencapsulation.invoke(testInstance, "init"); - } - - @Test - public void testInitNotValidConfig() throws Exception { - DistributionEngine testSubject; - // default test - Mockito.when(distributionEngineConfigurationMock.getConfigurationMock().isStartDistributionEngine()) - .thenReturn(true); - Mockito.when(distributionEngineConfigurationMock.configurationMock.getDistributionStatusTopic()) - .thenReturn(new DistributionStatusTopicConfig()); - Deencapsulation.invoke(testInstance, "init"); - } - - @Test + @Test(expected=NullPointerException.class) public void testInit() throws Exception { DistributionEngine testSubject; // default test - Mockito.when(distributionEngineConfigurationMock.getConfigurationMock().isStartDistributionEngine()) - .thenReturn(true); - DistributionStatusTopicConfig value = new DistributionStatusTopicConfig(); - value.setConsumerId("mock"); - value.setConsumerGroup("mock"); - value.setFetchTimeSec(0); - value.setPollingIntervalSec(0); - LinkedList<String> value2 = new LinkedList<>(); - value2.add("uebsb91kcdc.it.att.com:3904"); - value2.add("uebsb92kcdc.it.att.com:3904"); - Mockito.when(distributionEngineConfigurationMock.configurationMock.getUebServers()).thenReturn(value2); - Mockito.when(distributionEngineConfigurationMock.configurationMock.getEnvironments()).thenReturn(value2); - Mockito.when(distributionEngineConfigurationMock.configurationMock.getUebPublicKey()).thenReturn("mock"); - Mockito.when(distributionEngineConfigurationMock.configurationMock.getUebSecretKey()).thenReturn("mock"); - Mockito.when(distributionEngineConfigurationMock.configurationMock.getDistributionNotifTopicName()) - .thenReturn("mock"); - Mockito.when(distributionEngineConfigurationMock.configurationMock.getDistributionStatusTopicName()) - .thenReturn("mock"); - Mockito.when(distributionEngineConfigurationMock.configurationMock.getCreateTopic()) - .thenReturn(new CreateTopicConfig()); - Mockito.when(distributionEngineConfigurationMock.configurationMock.getDistributionStatusTopic()) - .thenReturn(value); - Deencapsulation.invoke(testInstance, "init"); + testSubject = createTestSubject(); + Deencapsulation.invoke(testSubject, "init"); } @Test @@ -194,94 +153,109 @@ public class DistributionEngineTest extends BeConfDependentTest{ DistributionEngine testSubject; // default test - testInstance.shutdown(); + testSubject = createTestSubject(); + testSubject.shutdown(); } @Test public void testValidateConfiguration() throws Exception { + DistributionEngine testSubject; DistributionEngineConfiguration deConfiguration = new DistributionEngineConfiguration(); deConfiguration.setDistributionStatusTopic((new DistributionStatusTopicConfig())); boolean result; // default test - result = Deencapsulation.invoke(testInstance, "validateConfiguration", deConfiguration); + testSubject = createTestSubject(); + result = Deencapsulation.invoke(testSubject, "validateConfiguration", deConfiguration); } @Test public void testIsValidServers() throws Exception { + DistributionEngine testSubject; List<String> uebServers = null; String methodName = ""; String paramName = ""; boolean result; // test 1 + testSubject = createTestSubject(); uebServers = null; - result = Deencapsulation.invoke(testInstance, "isValidServers", + result = Deencapsulation.invoke(testSubject, "isValidServers", new Object[] { List.class, methodName, paramName }); Assert.assertEquals(false, result); } @Test public void testIsValidFqdn() throws Exception { + DistributionEngine testSubject; String serverFqdn = ""; boolean result; // default test - result = Deencapsulation.invoke(testInstance, "isValidFqdn", new Object[] { serverFqdn }); + testSubject = createTestSubject(); + result = Deencapsulation.invoke(testSubject, "isValidFqdn", new Object[] { serverFqdn }); } @Test public void testIsValidParam() throws Exception { + DistributionEngine testSubject; String paramValue = ""; String methodName = ""; String paramName = ""; boolean result; // default test - result = Deencapsulation.invoke(testInstance, "isValidParam", + testSubject = createTestSubject(); + result = Deencapsulation.invoke(testSubject, "isValidParam", new Object[] { paramValue, methodName, paramName }); } @Test public void testIsValidParam_1() throws Exception { + DistributionEngine testSubject; List<String> paramValue = null; String methodName = ""; String paramName = ""; boolean result; // default test - result = Deencapsulation.invoke(testInstance, "isValidParam", + testSubject = createTestSubject(); + result = Deencapsulation.invoke(testSubject, "isValidParam", new Object[] { List.class, methodName, paramName }); } @Test public void testIsValidObject() throws Exception { + DistributionEngine testSubject; Object paramValue = null; String methodName = ""; String paramName = ""; boolean result; // test 1 + testSubject = createTestSubject(); paramValue = null; - result = Deencapsulation.invoke(testInstance, "isValidObject", + result = Deencapsulation.invoke(testSubject, "isValidObject", new Object[] { Object.class, methodName, paramName }); Assert.assertEquals(false, result); } @Test public void testGetEnvironmentErrorDescription() throws Exception { + DistributionEngine testSubject; StorageOperationStatus status = null; String result; // default test - result = Deencapsulation.invoke(testInstance, "getEnvironmentErrorDescription", - StorageOperationStatus.DISTR_ENVIRONMENT_NOT_AVAILABLE); - result = Deencapsulation.invoke(testInstance, "getEnvironmentErrorDescription", - StorageOperationStatus.DISTR_ENVIRONMENT_NOT_FOUND); - result = Deencapsulation.invoke(testInstance, "getEnvironmentErrorDescription", - StorageOperationStatus.DISTR_ENVIRONMENT_SENT_IS_INVALID); - result = Deencapsulation.invoke(testInstance, "getEnvironmentErrorDescription", - StorageOperationStatus.ARTIFACT_NOT_FOUND); + testSubject = createTestSubject(); + result = Deencapsulation.invoke(testSubject, "getEnvironmentErrorDescription", + StorageOperationStatus.DISTR_ENVIRONMENT_NOT_AVAILABLE); + result = Deencapsulation.invoke(testSubject, "getEnvironmentErrorDescription", + StorageOperationStatus.DISTR_ENVIRONMENT_NOT_FOUND); + result = Deencapsulation.invoke(testSubject, "getEnvironmentErrorDescription", + StorageOperationStatus.DISTR_ENVIRONMENT_SENT_IS_INVALID); + result = Deencapsulation.invoke(testSubject, "getEnvironmentErrorDescription", + StorageOperationStatus.ARTIFACT_NOT_FOUND); } @Test @@ -291,36 +265,61 @@ public class DistributionEngineTest extends BeConfDependentTest{ StorageOperationStatus result; // test 1 + testSubject = createTestSubject(); envName = null; - result = testInstance.isEnvironmentAvailable(envName); + result = testSubject.isEnvironmentAvailable(envName); Assert.assertEquals(StorageOperationStatus.DISTR_ENVIRONMENT_SENT_IS_INVALID, result); // test 2 + testSubject = createTestSubject(); envName = "mock"; - result = testInstance.isEnvironmentAvailable(envName); + result = testSubject.isEnvironmentAvailable(envName); Assert.assertEquals(StorageOperationStatus.DISTR_ENVIRONMENT_NOT_FOUND, result); } - @Test + //TODO Create test coverage for this method + /*@Test public void testIsEnvironmentAvailable_1() throws Exception { DistributionEngine testSubject; StorageOperationStatus result; - LinkedList<String> value = new LinkedList<>(); - value.add("mock"); - Mockito.when(distributionEngineConfigurationMock.configurationMock.getEnvironments()).thenReturn(value); - testInstance.isEnvironmentAvailable(); + // default test + testSubject = createTestSubject(); + result = testInstance.isEnvironmentAvailable(); + }*/ + + @Test(expected=NullPointerException.class) + public void testDisableEnvironment() throws Exception { + DistributionEngine testSubject; + String envName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.disableEnvironment(envName); } @Test public void testBuildTopicName() throws Exception { + DistributionEngine testSubject; String envName = ""; String result; // default test - result = Deencapsulation.invoke(testInstance, "buildTopicName", new Object[] { envName }); + testSubject = createTestSubject(); + result = Deencapsulation.invoke(testSubject, "buildTopicName", new Object[] { envName }); } + @Test + public void testIsReadyForDistribution() throws Exception { + DistributionEngine testSubject; + Service service = null; + String envName = ""; + StorageOperationStatus result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isReadyForDistribution(envName); + } @Test @@ -330,8 +329,7 @@ public class DistributionEngineTest extends BeConfDependentTest{ OperationalEnvironmentEntry result; // default test - when(environmentsEngine.getEnvironmentById(ArgumentMatchers.anyString())) - .thenReturn(new OperationalEnvironmentEntry()); + when(environmentsEngine.getEnvironmentById(ArgumentMatchers.anyString())).thenReturn(new OperationalEnvironmentEntry()); result = testInstance.getEnvironmentById(opEnvId); } @@ -343,9 +341,8 @@ public class DistributionEngineTest extends BeConfDependentTest{ INotificationData result; // default test - // testSubject = createTestSubject(); - when(serviceDistributionArtifactsBuilder.buildResourceInstanceForDistribution(ArgumentMatchers.any(), - ArgumentMatchers.any(), ArgumentMatchers.any())).thenReturn(new NotificationDataImpl()); + //testSubject = createTestSubject(); + when(serviceDistributionArtifactsBuilder.buildResourceInstanceForDistribution(ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any())).thenReturn(new NotificationDataImpl()); result = testInstance.buildServiceForDistribution(service, distributionId, workloadContext); } } diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactoryTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactoryTest.java index bb4c315580..64fa02f238 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactoryTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactoryTest.java @@ -69,6 +69,11 @@ public class DmaapClientFactoryTest { parameters.setAftDme2RoundtripTimeoutMs(435345); parameters.setAftDme2ReadTimeoutMs(5645); parameters.setDme2preferredRouterFilePath(filePath); + parameters.setAftDme2ClientIgnoreSslConfig(false); + parameters.setAftDme2SslEnable(true); + parameters.setAftDme2ClientKeystore("mock"); + parameters.setAftDme2ClientKeystorePassword("mock"); + parameters.setAftDme2ClientSslCertAlias("mock"); // default test testSubject = createTestSubject(); @@ -111,6 +116,11 @@ public class DmaapClientFactoryTest { parameters.setAftDme2RoundtripTimeoutMs(435345); parameters.setAftDme2ReadTimeoutMs(5645); parameters.setDme2preferredRouterFilePath(filePath); + parameters.setAftDme2ClientIgnoreSslConfig(false); + parameters.setAftDme2SslEnable(true); + parameters.setAftDme2ClientKeystore("mock"); + parameters.setAftDme2ClientKeystorePassword("mock"); + parameters.setAftDme2ClientSslCertAlias("mock"); // default test testSubject = createTestSubject(); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DummyDistributionConfigurationManager.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DummyDistributionConfigurationManager.java index b810175295..0d19db9ba7 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DummyDistributionConfigurationManager.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DummyDistributionConfigurationManager.java @@ -21,6 +21,7 @@ package org.openecomp.sdc.be.components.distribution.engine; import org.mockito.Mockito; +import org.openecomp.sdc.be.config.Configuration; import org.openecomp.sdc.be.config.ConfigurationManager; import org.openecomp.sdc.be.config.DistributionEngineConfiguration; import org.openecomp.sdc.common.api.ConfigurationListener; @@ -28,7 +29,8 @@ import org.openecomp.sdc.common.api.ConfigurationSource; public class DummyDistributionConfigurationManager { - DistributionEngineConfiguration configurationMock = Mockito.mock(DistributionEngineConfiguration.class); + private DistributionEngineConfiguration configurationMock = Mockito.mock(DistributionEngineConfiguration.class); + private Configuration configuration = Mockito.mock(Configuration.class); public DummyDistributionConfigurationManager() { new ConfigurationManager(new DummyConfigurationSource()); @@ -42,6 +44,9 @@ public class DummyDistributionConfigurationManager { if (className.equals(DistributionEngineConfiguration.class)) { return (T)configurationMock; } + if (className.equals(Configuration.class)) { + return (T)configuration; + } return null; } @@ -54,4 +59,7 @@ public class DummyDistributionConfigurationManager { public DistributionEngineConfiguration getConfigurationMock() { return configurationMock; } + public Configuration getConfiguration() { + return configuration; + } } diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/EnvironmentsEngineTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/EnvironmentsEngineTest.java index da2b3e387c..f73442cd8a 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/EnvironmentsEngineTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/EnvironmentsEngineTest.java @@ -20,7 +20,6 @@ package org.openecomp.sdc.be.components.distribution.engine; -import com.att.nsa.apiClient.credentials.ApiCredential; import fj.data.Either; import mockit.Deencapsulation; import org.apache.http.HttpStatus; @@ -30,6 +29,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.openecomp.sdc.be.components.impl.exceptions.ComponentException; import org.openecomp.sdc.be.config.Configuration; import org.openecomp.sdc.be.config.ConfigurationManager; import org.openecomp.sdc.be.config.DistributionEngineConfiguration; @@ -43,9 +43,15 @@ import org.openecomp.sdc.common.datastructure.Wrapper; import org.openecomp.sdc.common.http.client.api.HttpResponse; import java.io.IOException; -import java.util.*; -import java.util.concurrent.atomic.AtomicBoolean; - +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; @@ -77,7 +83,7 @@ public class EnvironmentsEngineTest { Either<List<OperationalEnvironmentEntry>, CassandraOperationStatus> successEither = Either.left(entryList); when(operationalEnvironmentDao.getByEnvironmentsStatus(EnvironmentStatusEnum.COMPLETED)).thenReturn(successEither); when(configurationManager.getDistributionEngineConfiguration()).thenReturn(distributionEngineConfiguration); - when(distributionEngineConfiguration.getEnvironments()).thenReturn(Arrays.asList("Env Loaded From Configuration")); + when(distributionEngineConfiguration.getEnvironments()).thenReturn(Collections.singletonList("Env Loaded From Configuration")); when(distributionEngineConfiguration.getUebPublicKey()).thenReturn("Dummy Public Key"); when(distributionEngineConfiguration.getUebSecretKey()).thenReturn("Dummy Private Key"); when(distributionEngineConfiguration.getUebServers()).thenReturn( @@ -95,13 +101,13 @@ public class EnvironmentsEngineTest { @Test public void testGetFullOperationalEnvByIdSuccess() { String json = getFullOperationalEnvJson(); - + HttpResponse restResponse = new HttpResponse(json, HttpStatus.SC_OK, "Successfully completed"); when(aaiRequestHandler.getOperationalEnvById(Mockito.anyString())).thenReturn(restResponse); - + Either<OperationalEnvInfo, Integer> response = envEngine.getOperationalEnvById("DummyId"); assertTrue("The operational environment request ran as not expected", response.isLeft()); - + OperationalEnvInfo operationalEnvInfo = response.left().value(); assertEquals("The operational environment json is not as expected", operationalEnvInfo.toString(), json); @@ -110,26 +116,26 @@ public class EnvironmentsEngineTest { @Test public void testGetPartialOperationalEnvByIdSuccess() { String json = getPartialOperationalEnvJson(); - + HttpResponse<String> restResponse = new HttpResponse<String>(json, HttpStatus.SC_OK, "Successfully completed"); when(aaiRequestHandler.getOperationalEnvById(Mockito.anyString())).thenReturn(restResponse); - + Either<OperationalEnvInfo, Integer> response = envEngine.getOperationalEnvById("DummyId"); assertTrue("The operational environment request ran as not expected", response.isLeft()); - + OperationalEnvInfo operationalEnvInfo = response.left().value(); assertEquals("The operational environment json is not as expected", operationalEnvInfo.toString(), json); } - + @Test public void testGetOperationalEnvByIdFailedByJsonConvert() { String jsonCorrupted = getCorruptedOperationalEnvJson(); - + HttpResponse<String> restResponse = new HttpResponse<String>(jsonCorrupted, HttpStatus.SC_OK, "Successfully Completed"); when(aaiRequestHandler.getOperationalEnvById(Mockito.anyString())).thenReturn(restResponse); - + Either<OperationalEnvInfo, Integer> response = envEngine.getOperationalEnvById("DummyId"); assertTrue("The operational environment request ran as not expected", response.isRight()); assertEquals("The operational environment request status code is not as expected", (Integer)HttpStatus.SC_INTERNAL_SERVER_ERROR, response.right().value()); @@ -140,7 +146,7 @@ public class EnvironmentsEngineTest { String json = getFullOperationalEnvJson(); HttpResponse<String> restResponse = new HttpResponse<String>(json, HttpStatus.SC_NOT_FOUND, "Not Found"); when(aaiRequestHandler.getOperationalEnvById(Mockito.anyString())).thenReturn(restResponse); - + Either<OperationalEnvInfo, Integer> response = envEngine.getOperationalEnvById("DummyId"); assertTrue("The operational environment request ran as not expected", response.isRight()); assertEquals("The operational environment request status code is not as expected", (Integer)HttpStatus.SC_NOT_FOUND, response.right().value()); @@ -164,6 +170,50 @@ public class EnvironmentsEngineTest { assertTrue(oe == returnedOe); } + @Test + public void getEnvironmentByDmaapUebAddressNoProperEnvironment() { + OperationalEnvironmentEntry opEnvEntry = createOpEnvEntry("1"); + opEnvEntry.setDmaapUebAddress(new HashSet<>()); + envEngine.addToMap(opEnvEntry); + assertThatThrownBy(() -> { + envEngine.getEnvironmentByDmaapUebAddress(Arrays.asList("11", "22"));}) + .isInstanceOf(ComponentException.class); + } + + @Test + public void getEnvironmentByDmaapUebAddressListWithEmptyList() { + OperationalEnvironmentEntry opEnvEntry = createOpEnvEntry("1"); + opEnvEntry.setDmaapUebAddress(new HashSet<>(Arrays.asList("11","22"))); + OperationalEnvironmentEntry opEnvEntry2 = createOpEnvEntry("2"); + opEnvEntry2.setDmaapUebAddress(new HashSet<>(Arrays.asList("33","44","55"))); + envEngine.addToMap(opEnvEntry); + envEngine.addToMap(opEnvEntry2); + assertThatThrownBy(() -> { + envEngine.getEnvironmentByDmaapUebAddress(new ArrayList<>());}) + .isInstanceOf(ComponentException.class); + } + + @Test + public void getEnvironmentByDmaapUebAddressList() { + OperationalEnvironmentEntry opEnvEntry = createOpEnvEntry("1"); + opEnvEntry.setDmaapUebAddress(new HashSet<>(Arrays.asList("11","22"))); + OperationalEnvironmentEntry opEnvEntry2 = createOpEnvEntry("2"); + opEnvEntry2.setDmaapUebAddress(new HashSet<>(Arrays.asList("33","44","55"))); + envEngine.addToMap(opEnvEntry); + envEngine.addToMap(opEnvEntry2); + assertThat(envEngine.getEnvironmentByDmaapUebAddress(Arrays.asList("77","22")) + .getEnvironmentId()).isEqualTo("1"); + + assertThat(envEngine.getEnvironmentByDmaapUebAddress(Arrays.asList("77","55")) + .getEnvironmentId()).isEqualTo("2"); + + assertThat(envEngine.getEnvironmentByDmaapUebAddress(Arrays.asList("11","44")) + .getEnvironmentId()).isEqualTo("1"); + } + + + + private String getCorruptedOperationalEnvJson() { return "{\"OPERATIONAL-environment-name\":\"Op Env Name\"," + "\"OPERATIONAL-environment-type\":\"VNF\"," @@ -183,7 +233,7 @@ public class EnvironmentsEngineTest { "\"relationship-list\":{" + "\"relationship\":[]" + "}" + - "}"; + "}"; } private String getFullOperationalEnvJson() { @@ -213,7 +263,7 @@ public class EnvironmentsEngineTest { "\"property-value\":\"OEname3\"" + "}]}]}}"; } - + private OperationalEnvironmentEntry createOpEnvEntry(String name) { OperationalEnvironmentEntry entry = new OperationalEnvironmentEntry(); entry.setEnvironmentId(name); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/NotificationExecutorServiceTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/NotificationExecutorServiceTest.java index 05f220a8b2..c5b9ff1ae1 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/NotificationExecutorServiceTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/NotificationExecutorServiceTest.java @@ -25,7 +25,12 @@ import org.openecomp.sdc.be.config.DistributionEngineConfiguration.DistributionN import java.util.Collection; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; public class NotificationExecutorServiceTest { diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilderTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilderTest.java index ff0a59075d..c1cd5f3181 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilderTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilderTest.java @@ -39,80 +39,141 @@ import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade import org.openecomp.sdc.be.model.operations.impl.InterfaceLifecycleOperation; import org.openecomp.sdc.common.api.ArtifactTypeEnum; +import java.util.Arrays; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + public class ServiceDistributionArtifactsBuilderTest extends BeConfDependentTest { @InjectMocks - ServiceDistributionArtifactsBuilder testSubject; - + private ServiceDistributionArtifactsBuilder testInstance; + @Mock - ToscaOperationFacade toscaOperationFacade; + ToscaOperationFacade toscaOperationFacade; + + private ServiceDistributionArtifactsBuilder createTestSubject() { + return testInstance; + } @Before - public void setUpMocks() throws Exception { + public void setUpMock() throws Exception { MockitoAnnotations.initMocks(this); } - @Test public void testGetInterfaceLifecycleOperation() throws Exception { + ServiceDistributionArtifactsBuilder testSubject; InterfaceLifecycleOperation result; // default test + testSubject = createTestSubject(); result = testSubject.getInterfaceLifecycleOperation(); } @Test public void testSetInterfaceLifecycleOperation() throws Exception { + ServiceDistributionArtifactsBuilder testSubject; InterfaceLifecycleOperation interfaceLifecycleOperation = null; // default test + testSubject = createTestSubject(); testSubject.setInterfaceLifecycleOperation(interfaceLifecycleOperation); } @Test public void testResolveWorkloadContext() throws Exception { + ServiceDistributionArtifactsBuilder testSubject; String workloadContext = ""; String result; // default test + testSubject = createTestSubject(); result = Deencapsulation.invoke(testSubject, "resolveWorkloadContext", new Object[] { workloadContext }); } @Test public void testBuildResourceInstanceForDistribution() throws Exception { + ServiceDistributionArtifactsBuilder testSubject; Service service = new Service(); String distributionId = ""; String workloadContext = ""; INotificationData result; // test 1 + testSubject = createTestSubject(); workloadContext = "mock"; result = testSubject.buildResourceInstanceForDistribution(service, distributionId, workloadContext); // test 2 + testSubject = createTestSubject(); workloadContext = null; result = testSubject.buildResourceInstanceForDistribution(service, distributionId, workloadContext); } @Test + public void testBuildResourceInstanceForDistributionArtifactsTimeout() throws Exception { + Service service = new Service(); + int deploymentArtifactTimeout = 60; + ComponentInstance ci = createComponentInstance("ci"); + ci.setDeploymentArtifacts(createDeploymentArtifactList(deploymentArtifactTimeout)); + service.setComponentInstances(Arrays.asList(ci)); + + when(toscaOperationFacade.getToscaElement(Mockito.eq(ci.getComponentUid()), Mockito.any(ComponentParametersView.class))) + .thenReturn(Either.left(createDefaultResource())); + + INotificationData notificationData = testInstance.buildResourceInstanceForDistribution(service, "did", "workload"); + assertThat(notificationData.getResources().get(0).getArtifacts().get(0).getArtifactTimeout()) + .isEqualTo(deploymentArtifactTimeout); + } + + private Map<String, ArtifactDefinition> createDeploymentArtifactList(int timeout) { + Map<String, ArtifactDefinition> deploymentArtifacts = new HashMap<>(); + deploymentArtifacts.put("label", createArtifactDefinition("1", timeout)); + return deploymentArtifacts; + } + + private Resource createDefaultResource() { + Resource ciResource = new Resource(); + ciResource.setInvariantUUID("res"); + return ciResource; + } + + private ComponentInstance createComponentInstance(String cuid) { + ComponentInstance ci = new ComponentInstance(); + ci.setComponentUid(cuid); + return ci; + } + + private ArtifactDefinition createArtifactDefinition(String id, int timeout) { + ArtifactDefinition artifactDefinition = new ArtifactDefinition(); + artifactDefinition.setTimeout(60); + artifactDefinition.setUniqueId(id); + artifactDefinition.setEsId(id); + return artifactDefinition; + } + + @Test public void testBuildServiceForDistribution() throws Exception { - INotificationData notificationData = Mockito.mock(INotificationData.class); + ServiceDistributionArtifactsBuilder testSubject; + INotificationData notificationData = new INotificationDataMock(); Service service = new Service(); service.setDeploymentArtifacts(new HashMap<>()); service.setToscaArtifacts(new HashMap<>()); INotificationData result; // default test + testSubject = createTestSubject(); result = testSubject.buildServiceForDistribution(notificationData, service); } @Test(expected = NullPointerException.class) public void testConvertServiceArtifactsToArtifactInfo() throws Exception { + ServiceDistributionArtifactsBuilder testSubject; Service service = new Service(); service.setDeploymentArtifacts(new HashMap<>()); Map<String, ArtifactDefinition> toscaArtifacts = new HashMap<>(); @@ -126,19 +187,21 @@ public class ServiceDistributionArtifactsBuilderTest extends BeConfDependentTest List<ArtifactInfoImpl> result; // default test + testSubject = createTestSubject(); result = Deencapsulation.invoke(testSubject, "convertServiceArtifactsToArtifactInfo", service); service.setToscaArtifacts(toscaArtifacts); result = Deencapsulation.invoke(testSubject, "convertServiceArtifactsToArtifactInfo", service); } - @Test + @Test(expected=NullPointerException.class) public void testConvertRIsToJsonContanier() throws Exception { + ServiceDistributionArtifactsBuilder testSubject; Service service = new Service(); List<ComponentInstance> resourceInstances = new LinkedList<>(); List<JsonContainerResourceInstance> result; - Mockito.when(toscaOperationFacade.getToscaElement(Mockito.nullable(String.class), Mockito.any(ComponentParametersView.class))).thenReturn(Either.left(new Resource())); // default test + testSubject = createTestSubject(); result = Deencapsulation.invoke(testSubject, "convertRIsToJsonContanier", service); resourceInstances.add(new ComponentInstance()); @@ -148,46 +211,51 @@ public class ServiceDistributionArtifactsBuilderTest extends BeConfDependentTest @Test public void testFillJsonContainer() throws Exception { + ServiceDistributionArtifactsBuilder testSubject; JsonContainerResourceInstance jsonContainer = new JsonContainerResourceInstance(new ComponentInstance(), new LinkedList<>()); Resource resource = new Resource(); // default test + testSubject = createTestSubject(); Deencapsulation.invoke(testSubject, "fillJsonContainer", jsonContainer, resource); } @Test public void testConvertToArtifactsInfoImpl() throws Exception { + ServiceDistributionArtifactsBuilder testSubject; Service service = new Service(); ComponentInstance resourceInstance = new ComponentInstance(); List<ArtifactInfoImpl> result; // default test + testSubject = createTestSubject(); result = Deencapsulation.invoke(testSubject, "convertToArtifactsInfoImpl", service, resourceInstance); } @Test public void testSetCategories() throws Exception { + ServiceDistributionArtifactsBuilder testSubject; JsonContainerResourceInstance jsonContainer = null; List<CategoryDefinition> categories = null; // test 1 + testSubject = createTestSubject(); categories = null; - LinkedList<CategoryDefinition> linkedList = new LinkedList<>(); - linkedList.add(new CategoryDefinition()); - LinkedList<ArtifactInfoImpl> artifacts = new LinkedList<>(); Deencapsulation.invoke(testSubject, "setCategories", - new JsonContainerResourceInstance(new ComponentInstance(), artifacts), linkedList); + new Object[] { JsonContainerResourceInstance.class, List.class }); } @Test public void testGetArtifactsWithPayload() throws Exception { + ServiceDistributionArtifactsBuilder testSubject; ComponentInstance resourceInstance = new ComponentInstance(); Map<String, ArtifactDefinition> deploymentArtifacts = new HashMap<>(); resourceInstance.setDeploymentArtifacts(deploymentArtifacts); List<ArtifactDefinition> result; // default test + testSubject = createTestSubject(); result = Deencapsulation.invoke(testSubject, "getArtifactsWithPayload", resourceInstance); deploymentArtifacts.put("mock", new ArtifactDefinition()); result = Deencapsulation.invoke(testSubject, "getArtifactsWithPayload", resourceInstance); @@ -220,10 +288,12 @@ public class ServiceDistributionArtifactsBuilderTest extends BeConfDependentTest @Test public void testVerifyServiceContainsDeploymentArtifacts() throws Exception { + ServiceDistributionArtifactsBuilder testSubject; Service service = new Service(); boolean result; // default test + testSubject = createTestSubject(); result = testSubject.verifyServiceContainsDeploymentArtifacts(service); Map<String, ArtifactDefinition> deploymentArtifacts = new HashMap<>(); deploymentArtifacts.put("mock", new ArtifactDefinition()); @@ -238,10 +308,124 @@ public class ServiceDistributionArtifactsBuilderTest extends BeConfDependentTest @Test public void testIsContainsPayload() throws Exception { + ServiceDistributionArtifactsBuilder testSubject; Map<String, ArtifactDefinition> deploymentArtifacts = null; boolean result; // default test + testSubject = createTestSubject(); result = Deencapsulation.invoke(testSubject, "isContainsPayload", new Object[] { Map.class }); } + + private class INotificationDataMock implements INotificationData { + + @Override + public String getDistributionID() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getServiceName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getServiceVersion() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getServiceUUID() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getServiceDescription() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getServiceInvariantUUID() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List<JsonContainerResourceInstance> getResources() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List<ArtifactInfoImpl> getServiceArtifacts() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getWorkloadContext() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setDistributionID(String distributionId) { + // TODO Auto-generated method stub + + } + + @Override + public void setServiceName(String serviceName) { + // TODO Auto-generated method stub + + } + + @Override + public void setServiceVersion(String serviceVersion) { + // TODO Auto-generated method stub + + } + + @Override + public void setServiceUUID(String serviceUUID) { + // TODO Auto-generated method stub + + } + + @Override + public void setServiceDescription(String serviceDescription) { + // TODO Auto-generated method stub + + } + + @Override + public void setServiceInvariantUUID(String serviceInvariantUuid) { + // TODO Auto-generated method stub + + } + + @Override + public void setResources(List<JsonContainerResourceInstance> resource) { + // TODO Auto-generated method stub + + } + + @Override + public void setServiceArtifacts(List<ArtifactInfoImpl> artifacts) { + // TODO Auto-generated method stub + + } + + @Override + public void setWorkloadContext(String workloadContext) { + // TODO Auto-generated method stub + + } + + } } diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/StepsTenantIsolation.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/StepsTenantIsolation.java index b76804f673..ecd239664e 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/StepsTenantIsolation.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/StepsTenantIsolation.java @@ -34,7 +34,11 @@ import org.apache.commons.lang.NotImplementedException; import org.apache.commons.lang.math.NumberUtils; import org.apache.http.HttpStatus; import org.junit.Assert; -import org.mockito.*; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.mockito.Spy; import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus; import org.openecomp.sdc.be.dao.cassandra.OperationalEnvironmentDao; import org.openecomp.sdc.be.datatypes.enums.EnvironmentStatusEnum; @@ -46,7 +50,9 @@ import org.openecomp.sdc.common.http.client.api.HttpResponse; import static java.util.Objects.isNull; import static org.apache.commons.lang3.StringUtils.isEmpty; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class StepsTenantIsolation { @@ -282,7 +288,7 @@ public class StepsTenantIsolation { @Then("^trying to retrieve Ueb Addresses From AftDme (.*)$") public void trying_to_retrieve_ueb_addresses_from_AftDme(boolean isActivated) throws Throwable { verify(envEngine, Mockito.times(getNumberOfCallsToValidate(isActivated))).discoverUebHosts( - Mockito.anyString(), Mockito.anyString()); + Mockito.anyString()); } diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/rest/MsoRestClientTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/rest/MsoRestClientTest.java deleted file mode 100644 index ef594af274..0000000000 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/rest/MsoRestClientTest.java +++ /dev/null @@ -1,161 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. 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.openecomp.sdc.be.components.distribution.engine.rest; - -import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder; -import com.github.tomakehurst.wiremock.junit.WireMockRule; -import com.github.tomakehurst.wiremock.matching.AnythingPattern; -import com.github.tomakehurst.wiremock.matching.UrlPattern; -import fj.data.Either; -import org.apache.http.HttpHeaders; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.openecomp.sdc.be.components.distribution.engine.DistributionStatusNotificationEnum; -import org.openecomp.sdc.be.components.distribution.engine.DummyDistributionConfigurationManager; -import org.openecomp.sdc.be.config.ConfigurationManager; -import org.openecomp.sdc.common.api.ConfigurationSource; -import org.openecomp.sdc.common.http.client.api.HttpResponse; -import org.openecomp.sdc.common.http.config.*; -import org.openecomp.sdc.common.impl.ExternalConfiguration; -import org.openecomp.sdc.common.impl.FSConfigurationSource; -import org.openecomp.sdc.security.SecurityUtil; - -import static com.github.tomakehurst.wiremock.client.WireMock.*; -import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - -public class MsoRestClientTest { - - private static final String MSO_HOST = "127.0.0.1"; - private static final String MSO_API_URL = "onap/mso/infra/modelDistributions/v1"; - private static final String DISTRIBUTION_ID = "1000"; - - private MSORestClient msoRestClient; - static ConfigurationSource configurationSource = new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be"); - static ConfigurationManager configurationManager = new ConfigurationManager(configurationSource); - - - @ClassRule - public static WireMockRule msoRestServer = new WireMockRule(options() - .dynamicPort() - .bindAddress(MSO_HOST)); - - @Before - public void setupMsoServer() throws Exception { - String encodedPw = ""; - Either<String, String> passkey = SecurityUtil.INSTANCE.decrypt(getPwd()); - if(passkey.isLeft()) { - encodedPw = passkey.left().value(); - } - else { - throw new IllegalArgumentException(passkey.right().value()); - } - - msoRestServer.resetToDefaultMappings(); - msoRestServer.stubFor(patch(urlMatching(String.format("/%s%s/(.*)", MSO_API_URL, getDistributionsUrl()))) - .withBasicAuth(getUserName(), encodedPw) - .withHeader(HttpHeaders.CONTENT_TYPE, containing("application/json")) - .withRequestBody(matchingJsonPath("$.status")) - .withRequestBody(matchingJsonPath("$.errorReason", new AnythingPattern()))//error reason is not mandatory - .willReturn(aResponse().withStatus(200))); - } - - @Before - public void setUp() throws Exception { - DummyDistributionConfigurationManager distributionEngineConfigurationMock = new DummyDistributionConfigurationManager(); - when(distributionEngineConfigurationMock.getConfigurationMock().getMsoConfig()).thenReturn(new MsoDummyConfig(msoRestServer.port())); - msoRestClient = new MSORestClient(); - } - - @Test - public void notifyDistributionComplete_emptyErrReason() throws Exception { - HttpResponse<String> response = msoRestClient.notifyDistributionComplete(DISTRIBUTION_ID, DistributionStatusNotificationEnum.DISTRIBUTION_COMPLETE_OK, ""); - assertThat(response.getStatusCode()).isEqualTo(200); - } - - private int getNumOfRetries() { - return ConfigurationManager.getConfigurationManager().getDistributionEngineConfiguration().getMsoConfig().getHttpClientConfig().getNumOfRetries(); - } - - @Test - public void notifyDistributionComplete_noErrReason() throws Exception { - HttpResponse<String> response = msoRestClient.notifyDistributionComplete(DISTRIBUTION_ID, DistributionStatusNotificationEnum.DISTRIBUTION_COMPLETE_OK, null); - assertThat(response.getStatusCode()).isEqualTo(200); - } - - @Test - public void notifyDistributionComplete_completeWithError() throws Exception { - HttpResponse<String> response = msoRestClient.notifyDistributionComplete(DISTRIBUTION_ID, DistributionStatusNotificationEnum.DISTRIBUTION_COMPLETE_ERROR, "my reason"); - assertThat(response.getStatusCode()).isEqualTo(200); - } - - @Test - public void testRetries() throws Exception { - int readTimeout = ConfigurationManager.getConfigurationManager().getDistributionEngineConfiguration().getMsoConfig().getHttpClientConfig().getTimeouts().getReadTimeoutMs(); - int expectedNumOfRetries = getNumOfRetries(); - - UrlPattern msoReqUrlPattern = urlMatching(String.format("/%s%s/(.*)", MSO_API_URL, getDistributionsUrl())); - msoRestServer.stubFor(patch(msoReqUrlPattern) - .willReturn(new ResponseDefinitionBuilder().withFixedDelay(readTimeout + 1))); - HttpResponse<String> response = msoRestClient.notifyDistributionComplete(DISTRIBUTION_ID, DistributionStatusNotificationEnum.DISTRIBUTION_COMPLETE_ERROR, "my reason"); - verify(expectedNumOfRetries + 1, patchRequestedFor(msoReqUrlPattern)); - assertThat(response.getStatusCode()).isEqualTo(500); - } - - private static String getDistributionsUrl() { - return "/distributions"; - } - - private static String getUserName() { - return "asdc"; - } - - private static String getPwd() { - return "OTLEp5lfVhYdyw5EAtTUBQ=="; - } - - private static class MsoDummyConfig extends ExternalServiceConfig { - int port; - - MsoDummyConfig(int port) { - this.port = port; - - BasicAuthorization basicAuthorization = new BasicAuthorization(); - basicAuthorization.setUserName(MsoRestClientTest.getUserName()); - basicAuthorization.setPassword(getPwd()); - HttpClientConfig httpClientConfig = new HttpClientConfig(new Timeouts(500, 2000), basicAuthorization); - httpClientConfig.setNumOfRetries(getNumOfRetries()); - super.setHttpClientConfig(httpClientConfig); - - HttpRequestConfig httpRequestConfig = new HttpRequestConfig(); - httpRequestConfig.setServerRootUrl(String.format("http://%s:%s/%s", MSO_HOST, this.port, MSO_API_URL)); - httpRequestConfig.getResourceNamespaces().put(MSORestClient.DISTRIBUTIONS_RESOURCE_CONFIG_PARAM, getDistributionsUrl()); - super.setHttpRequestConfig(httpRequestConfig); - } - - int getNumOfRetries() { - return 1; - } - } - -} |