summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/test/java
diff options
context:
space:
mode:
authorandre.schmid <andre.schmid@est.tech>2020-01-29 17:25:21 +0000
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-04-19 16:35:32 +0000
commitcd6f933375c412c2f79a12e909821322d58a8499 (patch)
tree758ff2e742b514169bbc84a8433d68fe221ef5c9 /catalog-be/src/test/java
parentdc56692a4a307f378c827f017d2efbf754c223e0 (diff)
Configure a new Artifact Type
Centralizes artifact configuration in one yaml entry. Allow the configuration of a new artifact type without the need of code changes. The configuration file now is used as a source of artifacts types instead the artifact type enum. The enum will be used as a source of base artifact types and also in hard coded business rules. Change-Id: Id0383d9fca9bce0519a4d52a4ecb3a68c8713f0f Issue-ID: SDC-2754 Signed-off-by: andre.schmid <andre.schmid@est.tech>
Diffstat (limited to 'catalog-be/src/test/java')
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/ElementOperationMock.java8
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/ArtifactInfoImplTest.java25
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactBusinessLogicTest.java31
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogicTest.java496
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogicTest.java12
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceArtifactsMergeTest.java2
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/impl/aaf/RoleAuthorizationHandlerTest.java3
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ElementServletTest.java5
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/tosca/CsarUtilsTest.java10
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtilTest.java4
10 files changed, 411 insertions, 185 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/ElementOperationMock.java b/catalog-be/src/test/java/org/openecomp/sdc/ElementOperationMock.java
index b1c0330d4f..48a317bcf0 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/ElementOperationMock.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/ElementOperationMock.java
@@ -110,13 +110,7 @@ public class ElementOperationMock implements IElementOperation {
}
@Override
- public Either<List<ArtifactType>, ActionStatus> getAllArtifactTypes() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Either<Map<String, Object>, ActionStatus> getAllDeploymentArtifactTypes() {
+ public List<ArtifactType> getAllArtifactTypes() {
// TODO Auto-generated method stub
return null;
}
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 0b9542c269..bbe453e755 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
@@ -20,6 +20,9 @@
package org.openecomp.sdc.be.components.distribution.engine;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
import mockit.Deencapsulation;
import org.junit.Assert;
import org.junit.Test;
@@ -130,23 +133,11 @@ public class ArtifactInfoImplTest extends BeConfDependentTest {
}
@Test
- public void testGetArtifactType() throws Exception {
- ArtifactInfoImpl testSubject;
- ArtifactTypeEnum result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getArtifactType();
- }
-
- @Test
- public void testSetArtifactType() throws Exception {
- ArtifactInfoImpl testSubject;
- ArtifactTypeEnum artifactType = null;
-
- // default test
- testSubject = createTestSubject();
- testSubject.setArtifactType(ArtifactTypeEnum.AAI_SERVICE_MODEL);
+ public void testSetArtifactType() {
+ final ArtifactInfoImpl testSubject = createTestSubject();
+ final String expectedType = ArtifactTypeEnum.AAI_SERVICE_MODEL.getType();
+ testSubject.setArtifactType(expectedType);
+ assertThat("Artifact type should be the same", testSubject.getArtifactType(), is(expectedType));
}
@Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactBusinessLogicTest.java
index e401df3920..3fb25dfc77 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactBusinessLogicTest.java
@@ -28,6 +28,7 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import fj.data.Either;
+import java.util.Optional;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,11 +38,12 @@ import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.mockito.junit.MockitoJUnitRunner;
import org.openecomp.sdc.be.components.ArtifactsResolver;
+import org.openecomp.sdc.be.config.ArtifactConfigManager;
import org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic;
import org.openecomp.sdc.be.components.utils.ArtifactBuilder;
import org.openecomp.sdc.be.components.utils.ObjectGenerator;
-import org.openecomp.sdc.be.config.Configuration.ArtifactTypeConfig;
-import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.be.config.ArtifactConfiguration;
+import org.openecomp.sdc.be.config.ComponentType;
import org.openecomp.sdc.be.dao.api.ActionStatus;
import org.openecomp.sdc.be.dao.cassandra.ArtifactCassandraDao;
import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus;
@@ -432,15 +434,22 @@ public class ArtifactBusinessLogicTest extends BaseBusinessLogicMock{
}
@Test
- public void testValidMibAritactsConfiguration() {
- Map<String, ArtifactTypeConfig> componentDeploymentArtifacts =
- ConfigurationManager.getConfigurationManager().getConfiguration().getResourceDeploymentArtifacts();
- Map<String, ArtifactTypeConfig> componentInstanceDeploymentArtifacts =
- ConfigurationManager.getConfigurationManager().getConfiguration().getResourceInstanceDeploymentArtifacts();
- assertThat(componentDeploymentArtifacts.containsKey(ArtifactTypeEnum.SNMP_POLL.getType())).isTrue();
- assertThat(componentDeploymentArtifacts.containsKey(ArtifactTypeEnum.SNMP_TRAP.getType())).isTrue();
- assertThat(componentInstanceDeploymentArtifacts.containsKey(ArtifactTypeEnum.SNMP_POLL.getType())).isTrue();
- assertThat(componentInstanceDeploymentArtifacts.containsKey(ArtifactTypeEnum.SNMP_TRAP.getType())).isTrue();
+ public void testValidMibArtifactsConfiguration() {
+ final ArtifactConfigManager artifactConfigManager = ArtifactConfigManager.getInstance();
+ Optional<ArtifactConfiguration> artifactConfiguration = artifactConfigManager
+ .find(ArtifactTypeEnum.SNMP_POLL.getType(), ArtifactGroupTypeEnum.DEPLOYMENT, ComponentType.RESOURCE);
+ assertThat(artifactConfiguration.isPresent()).isTrue();
+
+ artifactConfiguration = artifactConfigManager
+ .find(ArtifactTypeEnum.SNMP_TRAP.getType(), ArtifactGroupTypeEnum.DEPLOYMENT, ComponentType.RESOURCE);
+ assertThat(artifactConfiguration.isPresent()).isTrue();
+
+ artifactConfiguration = artifactConfigManager
+ .find(ArtifactTypeEnum.SNMP_POLL.getType(), ArtifactGroupTypeEnum.DEPLOYMENT, ComponentType.RESOURCE_INSTANCE);
+ assertThat(artifactConfiguration.isPresent()).isTrue();
+ artifactConfiguration = artifactConfigManager
+ .find(ArtifactTypeEnum.SNMP_TRAP.getType(), ArtifactGroupTypeEnum.DEPLOYMENT, ComponentType.RESOURCE_INSTANCE);
+ assertThat(artifactConfiguration.isPresent()).isTrue();
}
@Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogicTest.java
index edf561b717..cd7d9d556a 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogicTest.java
@@ -22,6 +22,28 @@
package org.openecomp.sdc.be.components.impl;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.HEAT_ENV_NAME;
+import static org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.HEAT_VF_ENV_NAME;
+
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -30,6 +52,15 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import fj.data.Either;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
import mockit.Deencapsulation;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.collections.CollectionUtils;
@@ -48,11 +79,15 @@ import org.openecomp.sdc.be.MockGenerator;
import org.openecomp.sdc.be.components.ArtifactsResolver;
import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.ArtifactOperationEnum;
import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.ArtifactOperationInfo;
+import org.openecomp.sdc.be.components.impl.exceptions.ByActionStatusComponentException;
import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
import org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic;
import org.openecomp.sdc.be.components.utils.ArtifactBuilder;
import org.openecomp.sdc.be.components.utils.ObjectGenerator;
import org.openecomp.sdc.be.components.validation.UserValidations;
+import org.openecomp.sdc.be.config.ArtifactConfigManager;
+import org.openecomp.sdc.be.config.ArtifactConfiguration;
+import org.openecomp.sdc.be.config.ComponentType;
import org.openecomp.sdc.be.config.Configuration.ArtifactTypeConfig;
import org.openecomp.sdc.be.config.ConfigurationManager;
import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -107,42 +142,13 @@ import org.openecomp.sdc.common.datastructure.Wrapper;
import org.openecomp.sdc.common.util.GeneralUtility;
import org.openecomp.sdc.exception.ResponseFormat;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.HEAT_ENV_NAME;
-import static org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.HEAT_VF_ENV_NAME;
-
@RunWith(MockitoJUnitRunner.Silent.class)
-public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
+public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock {
private static final User USER = new User("John", "Doh", "jh0003", "jh0003@gmail.com", "ADMIN",
System.currentTimeMillis());
private static final String RESOURCE_INSTANCE_NAME = "Service-111";
private static final String INSTANCE_ID = "S-123-444-ghghghg";
-
private static final String ARTIFACT_NAME = "service-Myservice-template.yml";
private static final String ARTIFACT_LABEL = "assettoscatemplate";
private static final String ES_ARTIFACT_ID = "123123dfgdfgd0";
@@ -150,7 +156,6 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
private static final String RESOURCE_NAME = "My-Resource_Name with space";
private static final String RESOURCE_CATEGORY1 = "Network Layer 2-3";
private static final String RESOURCE_SUBCATEGORY = "Router";
- public static final String RESOURCE_CATEGORY = "Network Layer 2-3/Router";
private static final String ARTIFACT_PLACEHOLDER_FILE_EXTENSION = "fileExtension";
public static final Resource resource = Mockito.mock(Resource.class);
@@ -158,7 +163,6 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
private ArtifactsBusinessLogic artifactBL;
private static User user = null;
private static Resource resourceResponse = null;
- private static ResponseFormatManager responseManager = null;
final ApplicationDataTypeCache applicationDataTypeCache = Mockito.mock(ApplicationDataTypeCache.class);
@Mock
public ComponentsUtils componentsUtils;
@@ -196,15 +200,13 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
private Gson gson = new GsonBuilder().setPrettyPrinting().create();
private static List<ArtifactType> getAllTypes() {
- List<ArtifactType> artifactTypes = new ArrayList<ArtifactType>();
- List<String> artifactTypesList = ConfigurationManager.getConfigurationManager().getConfiguration()
- .getArtifactTypes();
- for (String artifactType : artifactTypesList) {
- ArtifactType artifactT = new ArtifactType();
- artifactT.setName(artifactType);
- artifactTypes.add(artifactT);
- }
- return artifactTypes;
+ final List<ArtifactConfiguration> artifactConfigurationList = ConfigurationManager.getConfigurationManager()
+ .getConfiguration().getArtifacts();
+ return artifactConfigurationList.stream().map(artifactConfiguration -> {
+ final ArtifactType artifactType = new ArtifactType();
+ artifactType.setName(artifactConfiguration.getType());
+ return artifactType;
+ }).collect(Collectors.toList());
}
@Before
@@ -227,8 +229,7 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
when(userOperation.getUserData("jh0003", false)).thenReturn(Either.left(USER));
- Either<List<ArtifactType>, ActionStatus> getType = Either.left(getAllTypes());
- when(elementOperation.getAllArtifactTypes()).thenReturn(getType);
+ when(elementOperation.getAllArtifactTypes()).thenReturn(getAllTypes());
when(resource.getResourceType()).thenReturn(ResourceTypeEnum.VFC);
@@ -665,15 +666,22 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
}
@Test
- public void testValidMibAritactsConfiguration() {
- Map<String, ArtifactTypeConfig> componentDeploymentArtifacts = ConfigurationManager.getConfigurationManager()
- .getConfiguration().getResourceDeploymentArtifacts();
- Map<String, ArtifactTypeConfig> componentInstanceDeploymentArtifacts = ConfigurationManager
- .getConfigurationManager().getConfiguration().getResourceInstanceDeploymentArtifacts();
- assertThat(componentDeploymentArtifacts.containsKey(ArtifactTypeEnum.SNMP_POLL.getType())).isTrue();
- assertThat(componentDeploymentArtifacts.containsKey(ArtifactTypeEnum.SNMP_TRAP.getType())).isTrue();
- assertThat(componentInstanceDeploymentArtifacts.containsKey(ArtifactTypeEnum.SNMP_POLL.getType())).isTrue();
- assertThat(componentInstanceDeploymentArtifacts.containsKey(ArtifactTypeEnum.SNMP_TRAP.getType())).isTrue();
+ public void testValidMibArtifactsConfiguration() {
+ final ArtifactConfigManager artifactConfigManager = ArtifactConfigManager.getInstance();
+ Optional<ArtifactConfiguration> artifactConfiguration = artifactConfigManager
+ .find(ArtifactTypeEnum.SNMP_POLL.getType(), ArtifactGroupTypeEnum.DEPLOYMENT, ComponentType.RESOURCE);
+ assertThat(artifactConfiguration.isPresent()).isTrue();
+
+ artifactConfiguration = artifactConfigManager
+ .find(ArtifactTypeEnum.SNMP_TRAP.getType(), ArtifactGroupTypeEnum.DEPLOYMENT, ComponentType.RESOURCE);
+ assertThat(artifactConfiguration.isPresent()).isTrue();
+
+ artifactConfiguration = artifactConfigManager
+ .find(ArtifactTypeEnum.SNMP_POLL.getType(), ArtifactGroupTypeEnum.DEPLOYMENT, ComponentType.RESOURCE_INSTANCE);
+ assertThat(artifactConfiguration.isPresent()).isTrue();
+ artifactConfiguration = artifactConfigManager
+ .find(ArtifactTypeEnum.SNMP_TRAP.getType(), ArtifactGroupTypeEnum.DEPLOYMENT, ComponentType.RESOURCE_INSTANCE);
+ assertThat(artifactConfiguration.isPresent()).isTrue();
}
@Test
@@ -1051,7 +1059,7 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
}
@Test
- public void testFindArtifactOnParentComponent() throws Exception {
+ public void testFindArtifactOnParentComponent() {
ArtifactsBusinessLogic testSubject;
Component component = createResourceObject(true);
ComponentTypeEnum componentType = ComponentTypeEnum.RESOURCE;
@@ -1063,7 +1071,7 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
// default test
testSubject = createTestSubject();
- result = Deencapsulation.invoke(testSubject, "findArtifactOnParentComponent", new Object[]{component,
+ result = Deencapsulation.invoke(testSubject, "findArtifact", new Object[]{component,
componentType, parentId, operation, artifactId});
}
@@ -1154,9 +1162,8 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
new Object[]{componentId, instanceId, componentType});
}
-
@Test
- public void testFindComponentInstance() throws Exception {
+ public void testFindComponentInstance() {
ArtifactsBusinessLogic testSubject;
String componentInstanceId = "";
Component component = createResourceObject(true);
@@ -1168,9 +1175,8 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
new Object[]{componentInstanceId, component});
}
-
- @Test(expected= ComponentException.class)
- public void testDeploymentArtifactTypeIsLegalForParent_shouldThrowException() throws Exception {
+ @Test(expected = ComponentException.class)
+ public void testDeploymentArtifactTypeIsLegalForParent_shouldThrowException() {
ArtifactsBusinessLogic testSubject;
ArtifactDefinition artifactInfo = buildArtifactPayload();
ArtifactTypeEnum artifactType = ArtifactTypeEnum.AAI_SERVICE_MODEL;
@@ -1180,56 +1186,83 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
testSubject.validateDeploymentArtifactTypeIsLegalForParent(artifactInfo, artifactType, resourceDeploymentArtifacts);
}
-
@Test
- public void testFillDeploymentArtifactTypeConf() throws Exception {
- ArtifactsBusinessLogic testSubject;
- NodeTypeEnum parentType = NodeTypeEnum.AdditionalInfoParameters;
- Map<String, ArtifactTypeConfig> result;
+ public void testLoadArtifactTypeConfig() {
+ final ArtifactsBusinessLogic artifactsBusinessLogic = getTestSubject();
+ //null artifactType
+ Optional<ArtifactConfiguration> artifactConfiguration = artifactsBusinessLogic.loadArtifactTypeConfig(null);
+ assertThat(artifactConfiguration.isPresent()).isFalse();
+ //not configured artifactType
+ artifactConfiguration = artifactsBusinessLogic.loadArtifactTypeConfig("NotConfiguredArtifactType");
+ assertThat(artifactConfiguration.isPresent()).isFalse();
- // default test
- testSubject = createTestSubject();
- result = Deencapsulation.invoke(testSubject, "fillDeploymentArtifactTypeConf",
- new Object[]{parentType});
+ //valid artifactType
+ final String artifactType = ArtifactTypeEnum.YANG.getType();
+ artifactConfiguration = artifactsBusinessLogic.loadArtifactTypeConfig(artifactType);
+ assertThat(artifactConfiguration.isPresent()).isTrue();
+ final ArtifactConfiguration artifactConfiguration1 = artifactConfiguration.get();
+ assertThat(artifactConfiguration1.getType()).isEqualTo(artifactType);
+ assertThat(artifactConfiguration1.getCategories()).hasSize(1);
+ assertThat(artifactConfiguration1.getCategories()).contains(ArtifactGroupTypeEnum.INFORMATIONAL);
+ assertThat(artifactConfiguration1.getComponentTypes()).hasSize(1);
+ assertThat(artifactConfiguration1.getComponentTypes()).contains(ComponentType.RESOURCE);
+ assertThat(artifactConfiguration1.getResourceTypes()).hasSize(7);
+ assertThat(artifactConfiguration1.getResourceTypes())
+ .contains(ResourceTypeEnum.VFC.getValue(), ResourceTypeEnum.CP.getValue(), ResourceTypeEnum.VL.getValue(),
+ ResourceTypeEnum.VF.getValue(), ResourceTypeEnum.VFCMT.getValue(), "Abstract",
+ ResourceTypeEnum.CVFC.getValue());
}
-
@Test
- public void testValidateArtifactTypeExists() throws Exception {
- ArtifactsBusinessLogic testSubject;
- Wrapper<ResponseFormat> responseWrapper = null;
- ArtifactDefinition artifactInfo = buildArtifactPayload();
+ public void testValidateArtifactExtension_acceptedExtension() {
+ final ArtifactDefinition artifactInfo = new ArtifactDefinition();
+ artifactInfo.setArtifactName("artifact.yml");
+ final ArtifactsBusinessLogic artifactsBusinessLogic = getTestSubject();
+ //empty accepted types
+ assertThatCode(() -> artifactsBusinessLogic.validateArtifactExtension(new ArtifactConfiguration(), artifactInfo))
+ .doesNotThrowAnyException();
- // default test
- testSubject = createTestSubject();
- testSubject.getValidArtifactType(artifactInfo);
+ final ArtifactConfiguration artifactConfiguration = new ArtifactConfiguration();
+ artifactConfiguration.setAcceptedTypes(Arrays.asList("yml", "yaml"));
+ assertThatCode(() -> artifactsBusinessLogic.validateArtifactExtension(artifactConfiguration, artifactInfo))
+ .doesNotThrowAnyException();
}
+ @Test(expected = ComponentException.class)
+ public void testValidateArtifactExtension_notAcceptedExtension() {
+ final ArtifactConfiguration artifactConfiguration = new ArtifactConfiguration();
+ artifactConfiguration.setAcceptedTypes(Arrays.asList("yml", "yaml"));
+ final ArtifactDefinition artifactInfo = new ArtifactDefinition();
+ //not accepted extension
+ artifactInfo.setArtifactName("artifact.xml");
- @Test
- public void testGetDeploymentArtifactTypeConfig() throws Exception {
- ArtifactsBusinessLogic testSubject;
- NodeTypeEnum parentType = NodeTypeEnum.AdditionalInfoParameters;
- ArtifactTypeEnum artifactType = ArtifactTypeEnum.AAI_SERVICE_MODEL;
- ArtifactTypeConfig result;
+ final ArtifactsBusinessLogic artifactsBusinessLogic = getTestSubject();
- // default test
- testSubject = createTestSubject();
- result = Deencapsulation.invoke(testSubject, "getDeploymentArtifactTypeConfig",
- new Object[]{parentType, artifactType});
+ artifactsBusinessLogic.validateArtifactExtension(artifactConfiguration, artifactInfo);
}
+ @Test(expected = ComponentException.class)
+ public void testValidateArtifactExtension_noExtension() {
+ final ArtifactConfiguration artifactConfiguration = new ArtifactConfiguration();
+ artifactConfiguration.setAcceptedTypes(Arrays.asList("yml", "yaml"));
+ final ArtifactDefinition artifactInfo = new ArtifactDefinition();
+ //no extension in the artifact name
+ artifactInfo.setArtifactName("artifact");
+
+ final ArtifactsBusinessLogic artifactsBusinessLogic = getTestSubject();
- @Test(expected= ComponentException.class)
- public void testValidateHeatEnvDeploymentArtifact_shouldThrowException() throws Exception {
+ artifactsBusinessLogic.validateArtifactExtension(artifactConfiguration, artifactInfo);
+ }
+
+ @Test(expected = ComponentException.class)
+ public void testValidateHeatEnvDeploymentArtifact_shouldThrowException() {
ArtifactsBusinessLogic testSubject;
Component component = createResourceObject(true);
String parentId = "";
ArtifactDefinition artifactInfo = buildArtifactPayload();
- NodeTypeEnum parentType = NodeTypeEnum.AdditionalInfoParameters;
// default test
testSubject = createTestSubject();
- testSubject.validateHeatEnvDeploymentArtifact(component, parentId, artifactInfo, parentType);
+ testSubject.validateHeatEnvDeploymentArtifact(component, parentId, artifactInfo);
}
@Test
@@ -1257,47 +1290,46 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
result = Deencapsulation.invoke(testSubject, "isValidXml", new Object[]{xmlToParse});
}
- @Test
- public void testHeatTimeoutValue() throws Exception {
- ArtifactsBusinessLogic testSubject;
- boolean isCreate = false;
- ArtifactDefinition artifactInfo = buildArtifactPayload();
- ArtifactDefinition currentArtifact = null;
- Either<Boolean, ResponseFormat> result;
-
- // default test
- testSubject = createTestSubject();
- testSubject.validateHeatTimeoutValue(isCreate, artifactInfo, artifactInfo);
+ @Test(expected = ByActionStatusComponentException.class)
+ public void testHeatTimeoutValue() {
+ final ArtifactsBusinessLogic artifactsBusinessLogic = createTestSubject();
+ final ArtifactDefinition artifactInfo = buildArtifactPayload();
+ artifactInfo.setTimeout(1);
+ artifactsBusinessLogic.validateHeatTimeoutValue(artifactInfo);
+ artifactInfo.setTimeout(0);
+ artifactsBusinessLogic.validateHeatTimeoutValue(artifactInfo);
}
@Test
- public void testValidateHeatDeploymentArtifact() throws Exception {
- ArtifactsBusinessLogic testSubject;
- boolean isCreate = false;
- ArtifactDefinition artifactInfo = buildArtifactPayload();
- ArtifactDefinition currentArtifact = null;
- Either<Boolean, ResponseFormat> result;
-
- // default test
- testSubject = createTestSubject();
- testSubject.validateHeatTimeoutValue(isCreate, artifactInfo, artifactInfo);
+ public void testValidateResourceType_resourceTypeIsAccepted() {
+ final ArtifactsBusinessLogic artifactsBusinessLogic = createTestSubject();
+ final ArtifactDefinition artifactInfo = buildArtifactPayload();
+ final List<String> typeList = Arrays
+ .asList(ResourceTypeEnum.VF.getValue(), ResourceTypeEnum.PNF.getValue(), ResourceTypeEnum.VFC.getValue());
+ assertThatCode(() -> {
+ artifactsBusinessLogic.validateResourceType(ResourceTypeEnum.VF, artifactInfo, typeList);
+ }).doesNotThrowAnyException();
}
-
- @Test(expected= ComponentException.class)
- public void testValidateResourceType_shouldThrowException() throws Exception {
- ArtifactsBusinessLogic testSubject;
- ResourceTypeEnum resourceType = ResourceTypeEnum.VF;
- ArtifactDefinition artifactInfo = buildArtifactPayload();
- List<String> typeList = new ArrayList<>();
- Either<Boolean, ResponseFormat> result;
-
- // test 1
- testSubject = createTestSubject();
- testSubject.validateResourceType(resourceType, artifactInfo, typeList);
- result = Deencapsulation.invoke(testSubject, "validateResourceType", new Object[]{resourceType, artifactInfo, typeList});
+ @Test(expected=ComponentException.class)
+ public void testValidateResourceType_invalidResourceType() {
+ final ArtifactsBusinessLogic artifactsBusinessLogic = createTestSubject();
+ final ArtifactDefinition artifactInfo = buildArtifactPayload();
+ final List<String> typeList = Collections.singletonList(ResourceTypeEnum.PNF.getValue());
+ artifactsBusinessLogic.validateResourceType(ResourceTypeEnum.VF, artifactInfo, typeList);
}
+ @Test
+ public void testValidateResourceType_emptyResourceTypeConfig_resourceTypeIsAccepted() {
+ final ArtifactsBusinessLogic artifactsBusinessLogic = createTestSubject();
+ final ArtifactDefinition artifactInfo = buildArtifactPayload();
+ assertThatCode(() -> {
+ artifactsBusinessLogic.validateResourceType(ResourceTypeEnum.VF, artifactInfo, null);
+ }).doesNotThrowAnyException();
+ assertThatCode(() -> {
+ artifactsBusinessLogic.validateResourceType(ResourceTypeEnum.VF, artifactInfo, new ArrayList<>());
+ }).doesNotThrowAnyException();
+ }
@Test
public void testValidateAndConvertHeatParameters() throws Exception {
@@ -1321,7 +1353,7 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
// default test
testSubject = createTestSubject();
- result = testSubject.getDeploymentArtifacts(component, parentType, ciId);
+ result = testSubject.getDeploymentArtifacts(component, ciId);
}
@@ -1349,6 +1381,36 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
testSubject.validateAndSetArtifactName(artifactInfo);
}
+ @Test(expected = ComponentException.class)
+ public void testValidateArtifactType_notConfiguredArtifactType() {
+ final ArtifactsBusinessLogic artifactsBusinessLogic = createTestSubject();
+ final ArtifactDefinition artifactInfo = buildArtifactPayload();
+ artifactInfo.setArtifactType("notConfiguredType");
+ Deencapsulation
+ .invoke(artifactsBusinessLogic, "validateArtifactType", artifactInfo, ComponentTypeEnum.RESOURCE);
+ }
+
+ @Test(expected = ComponentException.class)
+ public void testValidateArtifactType_componentTypeNotSupportedByArtifactType() {
+ final ArtifactsBusinessLogic artifactsBusinessLogic = createTestSubject();
+ final ArtifactDefinition artifactInfo = buildArtifactPayload();
+ artifactInfo.setArtifactType(ArtifactTypeEnum.WORKFLOW.getType());
+
+ Deencapsulation
+ .invoke(artifactsBusinessLogic, "validateArtifactType", artifactInfo, ComponentTypeEnum.RESOURCE);
+ }
+
+ @Test(expected = ComponentException.class)
+ public void testValidateArtifactType_groupTypeNotSupportedByArtifactType() {
+ final ArtifactsBusinessLogic artifactsBusinessLogic = createTestSubject();
+ final ArtifactDefinition artifactInfo = buildArtifactPayload();
+ artifactInfo.setArtifactType(ArtifactTypeEnum.WORKFLOW.getType());
+ artifactInfo.setArtifactGroupType(ArtifactGroupTypeEnum.INFORMATIONAL);
+
+ Deencapsulation
+ .invoke(artifactsBusinessLogic, "validateArtifactType", artifactInfo, ComponentTypeEnum.SERVICE);
+ }
+
@Test
public void testValidateArtifactTypeNotChanged() throws Exception {
ArtifactsBusinessLogic testSubject;
@@ -1883,6 +1945,172 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
assertEquals(Deencapsulation.getField(testSubject, "nodeTemplateOperation"), nodeTemplateOperation);
}
+
+ @Test(expected = ComponentException.class)
+ public void validateDeploymentArtifact_invalidComponentType() {
+ ArtifactDefinition artifactDefinition = new ArtifactDefinition();
+ Component component = new Resource();
+ component.setComponentType(ComponentTypeEnum.PRODUCT);
+ final ArtifactsBusinessLogic artifactsBusinessLogic = getTestSubject();
+ Deencapsulation
+ .invoke(artifactsBusinessLogic, "validateDeploymentArtifact", artifactDefinition, component);
+ }
+
+ @Test(expected = ComponentException.class)
+ public void validateDeploymentArtifact_notConfiguredArtifactType() {
+ ArtifactDefinition artifactDefinition = new ArtifactDefinition();
+ Component component = new Resource();
+ component.setComponentType(ComponentTypeEnum.RESOURCE);
+ artifactDefinition.setArtifactType("NotConfiguredType");
+ final ArtifactsBusinessLogic artifactsBusinessLogic = getTestSubject();
+ Deencapsulation
+ .invoke(artifactsBusinessLogic, "validateDeploymentArtifact", artifactDefinition, component);
+ }
+
+ @Test(expected = ComponentException.class)
+ public void validateDeploymentArtifact_unsupportedResourceType() {
+ final ArtifactDefinition artifactDefinition = new ArtifactDefinition();
+ artifactDefinition.setArtifactType(ArtifactTypeEnum.YANG.getType());
+ artifactDefinition.setArtifactGroupType(ArtifactGroupTypeEnum.INFORMATIONAL);
+ final Resource resourceComponent = new Resource();
+ resourceComponent.setComponentType(ComponentTypeEnum.RESOURCE);
+ resourceComponent.setResourceType(ResourceTypeEnum.ServiceProxy);
+ final ArtifactsBusinessLogic artifactsBusinessLogic = getTestSubject();
+ Deencapsulation
+ .invoke(artifactsBusinessLogic, "validateDeploymentArtifact", artifactDefinition, resourceComponent);
+ }
+
+ @Test
+ public void validateDeploymentArtifact_validArtifact() {
+ final ArtifactDefinition artifactDefinition = new ArtifactDefinition();
+ artifactDefinition.setArtifactType(ArtifactTypeEnum.YANG.getType());
+ artifactDefinition.setArtifactGroupType(ArtifactGroupTypeEnum.INFORMATIONAL);
+ final Resource resourceComponent = new Resource();
+ resourceComponent.setComponentType(ComponentTypeEnum.RESOURCE);
+ resourceComponent.setResourceType(ResourceTypeEnum.VF);
+ final ArtifactsBusinessLogic artifactsBusinessLogic = getTestSubject();
+ assertThatCode(() -> {
+ Deencapsulation
+ .invoke(artifactsBusinessLogic, "validateDeploymentArtifact", artifactDefinition, resourceComponent);
+ }).doesNotThrowAnyException();
+
+ }
+
+ @Test
+ public void validateHeatArtifact_validArtifact() {
+ final ArtifactDefinition artifactDefinition = new ArtifactDefinition();
+ artifactDefinition.setArtifactType(ArtifactTypeEnum.HEAT.getType());
+ artifactDefinition.setTimeout(1);
+ final ArtifactsBusinessLogic artifactsBusinessLogic = getTestSubject();
+ assertThatCode(() -> {
+ Deencapsulation
+ .invoke(artifactsBusinessLogic, "validateHeatArtifact", new Resource(), "componentId", artifactDefinition);
+ }).doesNotThrowAnyException();
+ }
+
+ @Test
+ public void validateInputForResourceInstance() {
+ final String artifactId = "artifactId";
+ ArtifactDefinition artifactDefinition = new ArtifactDefinition();
+ artifactDefinition.setUniqueId(artifactId);
+ artifactDefinition.setArtifactName(ARTIFACT_NAME);
+ artifactDefinition.setArtifactType(ArtifactTypeEnum.SNMP_POLL.getType());
+ artifactDefinition.setArtifactLabel(ARTIFACT_LABEL);
+ artifactDefinition.setEsId(ES_ARTIFACT_ID);
+ artifactDefinition.setPayload(PAYLOAD);
+ artifactDefinition.setArtifactGroupType(ArtifactGroupTypeEnum.INFORMATIONAL);
+ artifactDefinition.setDescription("artifact description");
+ artifactDefinition.setServiceApi(true);
+ artifactDefinition.setApiUrl("dumbUrl");
+
+ final User user = new User();
+ user.setUserId("userId");
+ user.setRole(Role.ADMIN.name());
+
+ final String parentId = "parentId";
+ final Service service = new Service();
+ service.setComponentType(ComponentTypeEnum.SERVICE);
+ service.setUniqueId(parentId);
+ service.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
+ service.setLastUpdaterUserId(user.getUserId());
+
+ final ArtifactOperationInfo operationInfo =
+ artifactBL.new ArtifactOperationInfo(false, false, ArtifactOperationEnum.CREATE);
+
+ final String componentId = "componentId";
+ final ComponentInstance componentInstance = new ComponentInstance();
+ componentInstance.setUniqueId(componentId);
+ componentInstance.setComponentUid(componentId);
+ service.setComponentInstances(Collections.singletonList(componentInstance));
+
+ final Resource resource = new Resource();
+ when(toscaOperationFacade.getToscaFullElement(componentId)).thenReturn(Either.left(resource));
+ when(artifactToscaOperation.getAllInstanceArtifacts(parentId, componentId)).thenReturn(Either.left(new HashMap<>()));
+
+ final ArtifactsBusinessLogic artifactsBusinessLogic = getTestSubject();
+ artifactsBusinessLogic.setToscaOperationFacade(toscaOperationFacade);
+ Object result = Deencapsulation
+ .invoke(artifactsBusinessLogic, "validateInput", componentId, artifactDefinition, operationInfo, artifactId,
+ user, "interfaceName", ARTIFACT_LABEL, ComponentTypeEnum.RESOURCE_INSTANCE, service);
+ assertTrue(result instanceof Either<?, ?>);
+ assertTrue(((Either<?, ?>) result).isLeft());
+
+ artifactDefinition.setArtifactGroupType(ArtifactGroupTypeEnum.DEPLOYMENT);
+
+ result = Deencapsulation
+ .invoke(artifactsBusinessLogic, "validateInput", componentId, artifactDefinition, operationInfo, artifactId,
+ user, "interfaceName", ARTIFACT_LABEL, ComponentTypeEnum.RESOURCE_INSTANCE, service);
+ assertTrue(result instanceof Either<?, ?>);
+ assertTrue(((Either<?, ?>) result).isLeft());
+ }
+
+ @Test
+ public void validateInputForResourceInstanceDeploymentArtifact() {
+ final String artifactId = "artifactId";
+ ArtifactDefinition artifactDefinition = new ArtifactDefinition();
+ artifactDefinition.setUniqueId(artifactId);
+ artifactDefinition.setArtifactName(ARTIFACT_NAME);
+ artifactDefinition.setArtifactType(ArtifactTypeEnum.SNMP_POLL.getType());
+ artifactDefinition.setArtifactLabel(ARTIFACT_LABEL);
+ artifactDefinition.setEsId(ES_ARTIFACT_ID);
+ artifactDefinition.setPayload(PAYLOAD);
+ artifactDefinition.setArtifactGroupType(ArtifactGroupTypeEnum.DEPLOYMENT);
+ artifactDefinition.setDescription("artifact description");
+
+ final User user = new User();
+ user.setUserId("userId");
+ user.setRole(Role.ADMIN.name());
+
+ final String parentId = "parentId";
+ final Service service = new Service();
+ service.setComponentType(ComponentTypeEnum.SERVICE);
+ service.setUniqueId(parentId);
+ service.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
+ service.setLastUpdaterUserId(user.getUserId());
+
+ final ArtifactOperationInfo operationInfo =
+ artifactBL.new ArtifactOperationInfo(false, false, ArtifactOperationEnum.CREATE);
+
+ final String componentId = "componentId";
+ final ComponentInstance componentInstance = new ComponentInstance();
+ componentInstance.setUniqueId(componentId);
+ componentInstance.setComponentUid(componentId);
+ service.setComponentInstances(Collections.singletonList(componentInstance));
+
+ final Resource resource = new Resource();
+ when(toscaOperationFacade.getToscaFullElement(componentId)).thenReturn(Either.left(resource));
+ when(artifactToscaOperation.getAllInstanceArtifacts(parentId, componentId)).thenReturn(Either.left(new HashMap<>()));
+
+ final ArtifactsBusinessLogic artifactsBusinessLogic = getTestSubject();
+ artifactsBusinessLogic.setToscaOperationFacade(toscaOperationFacade);
+ final Object result = Deencapsulation
+ .invoke(artifactsBusinessLogic, "validateInput", componentId, artifactDefinition, operationInfo, artifactId,
+ user, "interfaceName", ARTIFACT_LABEL, ComponentTypeEnum.RESOURCE_INSTANCE, service);
+ assertTrue(result instanceof Either<?, ?>);
+ assertTrue(((Either<?, ?>) result).isLeft());
+ }
+
+
@Test
public void testHandleArtifactRequest() {
@@ -1894,7 +2122,7 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
artifactDefinition.setPayload("Test".getBytes());
artifactDefinition.setArtifactLabel("other");
artifactDefinition.setDescription("Test artifact");
- artifactDefinition.setArtifactType(ArtifactTypeEnum.OTHER.name());
+ artifactDefinition.setArtifactType(ArtifactTypeEnum.OTHER.getType());
artifactDefinition.setArtifactUUID("artifactUId");
artifactDefinition.setArtifactLabel("test");
artifactDefinition.setArtifactDisplayName("Test");
@@ -1979,7 +2207,7 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
ArtifactDefinition artifactDefinition = new ArtifactDefinition();
artifactDefinition.setUniqueId("artifactId");
- artifactDefinition.setArtifactType(ArtifactTypeEnum.TOSCA_CSAR.name());
+ artifactDefinition.setArtifactType(ArtifactTypeEnum.TOSCA_CSAR.getType());
User user = new User();
boolean inCertificationRequest = false;
boolean fetchTemplatesFromDB = false;
@@ -2013,7 +2241,7 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
ArtifactDefinition csarArtifact = new ArtifactDefinition();
csarArtifact.setArtifactName("csarArtifact");
- csarArtifact.setArtifactType(ArtifactTypeEnum.HEAT_ENV.name());
+ csarArtifact.setArtifactType(ArtifactTypeEnum.HEAT_ENV.getType());
csarArtifact.setArtifactGroupType(ArtifactGroupTypeEnum.TOSCA);
when(csarUtils.createCsar(any(Component.class), anyBoolean(), anyBoolean()))
@@ -2039,7 +2267,7 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
artifactDefinition.setArtifactName("test.csar");
artifactDefinition.setArtifactType(ComponentTypeEnum.RESOURCE.name());
- artifactDefinition.setArtifactType(ArtifactTypeEnum.HEAT.name());
+ artifactDefinition.setArtifactType(ArtifactTypeEnum.HEAT.getType());
artifactDefinition.setUniqueId(artifactId);
artifactDefinition.setArtifactGroupType(ArtifactGroupTypeEnum.TOSCA);
@@ -2143,7 +2371,7 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
resource.setComponentInstances(componentInstanceList);
componentInstance.setDeploymentArtifacts(deploymentArtifacts);
- List<ArtifactDefinition> result = artifactBL.getDeploymentArtifacts(resource, parentType, ciId);
+ List<ArtifactDefinition> result = artifactBL.getDeploymentArtifacts(resource, ciId);
assertThat(result.size() == 1).isTrue();
Assert.assertEquals(artifactDefinition.getArtifactName(), result.get(0).getArtifactName());
}
@@ -2249,8 +2477,12 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock{
}
private ArtifactsBusinessLogic getTestSubject() {
- return new ArtifactsBusinessLogic(artifactCassandraDao, toscaExportHandler, csarUtils, lifecycleBusinessLogic,
- userBusinessLogic, artifactsResolver, elementDao, groupOperation, groupInstanceOperation, groupTypeOperation,
+ final ArtifactsBusinessLogic artifactsBusinessLogic = new ArtifactsBusinessLogic(artifactCassandraDao,
+ toscaExportHandler, csarUtils, lifecycleBusinessLogic,
+ userBusinessLogic, artifactsResolver, elementDao, groupOperation, groupInstanceOperation,
+ groupTypeOperation,
interfaceOperation, interfaceLifecycleTypeOperation, artifactToscaOperation);
+ artifactsBusinessLogic.setComponentsUtils(componentsUtils);
+ return artifactsBusinessLogic;
}
} \ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogicTest.java
index 9e563fc34c..c19d997d73 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogicTest.java
@@ -1842,27 +1842,27 @@ public class ResourceBusinessLogicTest {
List<NonMetaArtifactInfo> artifactPathAndNameList = new ArrayList<>();
NonMetaArtifactInfo deploymentArtifactInfoToUpdate = new NonMetaArtifactInfo(
deploymentArtifactToUpdate.getArtifactName(), null,
- ArtifactTypeEnum.findType(deploymentArtifactToUpdate.getArtifactType()),
+ deploymentArtifactToUpdate.getArtifactType(),
ArtifactGroupTypeEnum.DEPLOYMENT, newPayloadData, deploymentArtifactToUpdate.getArtifactName(), false);
NonMetaArtifactInfo informationalArtifactInfoToUpdate = new NonMetaArtifactInfo(
- artifactToUpdate.getArtifactName(), null, ArtifactTypeEnum.findType(artifactToUpdate.getArtifactType()),
+ artifactToUpdate.getArtifactName(), null, artifactToUpdate.getArtifactType(),
ArtifactGroupTypeEnum.DEPLOYMENT, newPayloadData, artifactToUpdate.getArtifactName(), false);
NonMetaArtifactInfo informationalArtifactInfoToUpdateFromCsar = new NonMetaArtifactInfo(
- artifactToUpdate.getArtifactName(), null, ArtifactTypeEnum.findType(artifactToUpdate.getArtifactType()),
+ artifactToUpdate.getArtifactName(), null, artifactToUpdate.getArtifactType(),
ArtifactGroupTypeEnum.INFORMATIONAL, newPayloadData, artifactToUpdate.getArtifactName(), true);
NonMetaArtifactInfo deploymentArtifactInfoToUpdateFromCsar = new NonMetaArtifactInfo(
- artifactToUpdate.getArtifactName(), null, ArtifactTypeEnum.findType(artifactToUpdate.getArtifactType()),
+ artifactToUpdate.getArtifactName(), null, artifactToUpdate.getArtifactType(),
ArtifactGroupTypeEnum.DEPLOYMENT, newPayloadData, artifactToUpdate.getArtifactName(), true);
NonMetaArtifactInfo deploymentArtifactInfoToCreate = new NonMetaArtifactInfo(deploymentArtifactToCreateFileName,
- null, ArtifactTypeEnum.OTHER, ArtifactGroupTypeEnum.DEPLOYMENT, newPayloadData,
+ null, ArtifactTypeEnum.OTHER.getType(), ArtifactGroupTypeEnum.DEPLOYMENT, newPayloadData,
deploymentArtifactToCreateFileName, false);
NonMetaArtifactInfo informationalArtifactInfoToCreate = new NonMetaArtifactInfo(artifactInfoToCreateFileName,
- null, ArtifactTypeEnum.OTHER, ArtifactGroupTypeEnum.INFORMATIONAL, newPayloadData,
+ null, ArtifactTypeEnum.OTHER.getType(), ArtifactGroupTypeEnum.INFORMATIONAL, newPayloadData,
artifactInfoToCreateFileName, false);
artifactPathAndNameList.add(deploymentArtifactInfoToUpdate);
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceArtifactsMergeTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceArtifactsMergeTest.java
index 06b06b08ad..160f595e95 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceArtifactsMergeTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceArtifactsMergeTest.java
@@ -154,7 +154,7 @@ public class ComponentInstanceArtifactsMergeTest {
artifactCreatedOnTheInstance.setTimeout(30);
ArtifactDefinition artifactGeneratedBySubmitForTesting = new ArtifactDefinition();
artifactGeneratedBySubmitForTesting.setArtifactLabel("artifactThree");
- artifactGeneratedBySubmitForTesting.setArtifactType(ArtifactTypeEnum.VF_MODULES_METADATA.name());
+ artifactGeneratedBySubmitForTesting.setArtifactType(ArtifactTypeEnum.VF_MODULES_METADATA.getType());
artifactGeneratedBySubmitForTesting.setTimeout(30);
Map<String, ArtifactDefinition> componentInstanceArtifacts = new HashMap<>();
componentInstanceArtifacts.put(artifactFromTheOriginalResource.getArtifactLabel(), artifactFromTheOriginalResource);
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/impl/aaf/RoleAuthorizationHandlerTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/impl/aaf/RoleAuthorizationHandlerTest.java
index 71513c36bd..c488a9a6ca 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/impl/aaf/RoleAuthorizationHandlerTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/impl/aaf/RoleAuthorizationHandlerTest.java
@@ -53,7 +53,7 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.Silent.class)
public class RoleAuthorizationHandlerTest {
- private RoleAuthorizationHandler roleAuthorizationHandler = new RoleAuthorizationHandler();
+ private RoleAuthorizationHandler roleAuthorizationHandler;
@Mock
JoinPoint joinPoint;
@Mock
@@ -72,6 +72,7 @@ public class RoleAuthorizationHandlerTest {
when(beGenericServlet.getServletRequest()).thenReturn(httpServletRequest);
ThreadLocalsHolder.setApiType(FilterDecisionEnum.EXTERNAL);
new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be/auth"));
+ roleAuthorizationHandler = new RoleAuthorizationHandler();
}
@Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ElementServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ElementServletTest.java
index f90ef19293..974f286098 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ElementServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ElementServletTest.java
@@ -305,7 +305,6 @@ public class ElementServletTest extends JerseyTest {
Either<UiCategories, ResponseFormat> getAllCategoriesEither = Either.left(new UiCategories());
Either<List<ArtifactType>, ActionStatus> otherEither = Either.left(new ArrayList<>());
when(elementBusinessLogic.getDefaultHeatTimeout()).thenReturn(Either.left(configurationManager.getConfiguration().getHeatArtifactDeploymentTimeout()));
- when(elementBusinessLogic.getAllDeploymentArtifactTypes()).thenReturn(Either.left(new HashMap<String, Object>()));
when(elementBusinessLogic.getResourceTypesMap()).thenReturn(Either.left(new HashMap<String, String>()));
when(elementBusinessLogic.getAllArtifactTypes(designerUser.getUserId()))
.thenReturn(otherEither);
@@ -961,15 +960,12 @@ public class ElementServletTest extends JerseyTest {
Configuration.HeatDeploymentArtifactTimeout heatDeploymentArtifactTimeout = new Configuration.HeatDeploymentArtifactTimeout();
heatDeploymentArtifactTimeout.setDefaultMinutes(1);
Either<Configuration.HeatDeploymentArtifactTimeout, ActionStatus> defaultHeatTimeoutEither = Either.left(heatDeploymentArtifactTimeout);
- Either<Map<String, Object>, ActionStatus> deploymentEither = Either.left(new HashMap<>());
Either<Map<String, String>, ActionStatus> resourceTypesMapEither = Either.left(new HashMap<>());
when(elementBusinessLogic.getAllArtifactTypes(designerUser.getUserId()))
.thenReturn(otherEither);
when(elementBusinessLogic.getDefaultHeatTimeout())
.thenReturn(defaultHeatTimeoutEither);
- when(elementBusinessLogic.getAllDeploymentArtifactTypes())
- .thenReturn(deploymentEither);
when(elementBusinessLogic.getResourceTypesMap())
.thenReturn(resourceTypesMapEither);
@@ -1065,6 +1061,7 @@ public class ElementServletTest extends JerseyTest {
bind(componentUtils).to(ComponentsUtils.class);
bind(componentsCleanBusinessLogic).to(ComponentsCleanBusinessLogic.class);
bind(elementBusinessLogic).to(ElementBusinessLogic.class);
+ bind(artifactsBusinessLogic).to(ArtifactsBusinessLogic.class);
}
})
.property("contextConfig", context);
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/CsarUtilsTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/CsarUtilsTest.java
index cdea369fe8..c7dced79c5 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/CsarUtilsTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/CsarUtilsTest.java
@@ -20,6 +20,8 @@
package org.openecomp.sdc.be.tosca;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -115,7 +117,7 @@ public class CsarUtilsTest extends BeConfDependentTest {
private final List<String> nodesFromPackage = Arrays.asList("tosca.nodes.Root", "tosca.nodes.Container.Application");
private NonMetaArtifactInfo createNonMetaArtifactInfoTestSubject() {
- return new CsarUtils.NonMetaArtifactInfo("mock", "mock", ArtifactTypeEnum.AAI_SERVICE_MODEL,
+ return new CsarUtils.NonMetaArtifactInfo("mock", "mock", ArtifactTypeEnum.AAI_SERVICE_MODEL.getType(),
ArtifactGroupTypeEnum.DEPLOYMENT, new byte[0], "mock", true);
}
@@ -706,9 +708,9 @@ public class CsarUtilsTest extends BeConfDependentTest {
@Test
public void testNonMetaArtifactInfoGetArtifactType() {
- NonMetaArtifactInfo testSubject = createNonMetaArtifactInfoTestSubject();
-
- testSubject.getArtifactType();
+ final NonMetaArtifactInfo testSubject = createNonMetaArtifactInfoTestSubject();
+ assertThat("The artifact type should be as expected",
+ testSubject.getArtifactType(), is(ArtifactTypeEnum.AAI_SERVICE_MODEL.getType()));
}
@Test
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtilTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtilTest.java
index 23288582ca..c9f21e41b7 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtilTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtilTest.java
@@ -62,7 +62,7 @@ public class OperationArtifactUtilTest {
final String actualArtifactPath = OperationArtifactUtil.createOperationArtifactPath(component, null, op, false);
String expectedArtifactPath = CsarUtils.ARTIFACTS + File.separator +
WordUtils.capitalizeFully(ArtifactGroupTypeEnum.DEPLOYMENT.name()) + File.separator +
- ArtifactTypeEnum.WORKFLOW.name() + File.separator + BPMN_ARTIFACT_PATH + File.separator +
+ ArtifactTypeEnum.WORKFLOW.getType() + File.separator + BPMN_ARTIFACT_PATH + File.separator +
"createBPMN.bpmn";
@@ -84,7 +84,7 @@ public class OperationArtifactUtilTest {
String expectedArtifactPath = CsarUtils.ARTIFACTS + File.separator +
"org.openecomp.resource.vf.TestResource_v1.0" + File.separator +
WordUtils.capitalizeFully(ArtifactGroupTypeEnum.DEPLOYMENT.name()) + File.separator +
- ArtifactTypeEnum.WORKFLOW.name() +
+ ArtifactTypeEnum.WORKFLOW.getType() +
File.separator + BPMN_ARTIFACT_PATH + File.separator + "createBPMN.bpmn";