diff options
29 files changed, 1859 insertions, 53 deletions
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnumTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnumTest.java index 43fac12509..d5fcff5cfb 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnumTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/LifeCycleTransitionEnumTest.java @@ -1,7 +1,5 @@ package org.openecomp.sdc.be.model; -import javax.annotation.Generated; - import org.junit.Test; public class LifeCycleTransitionEnumTest { @@ -10,7 +8,6 @@ public class LifeCycleTransitionEnumTest { return LifeCycleTransitionEnum.CERTIFY; } - @Test public void testGetDisplayName() throws Exception { LifeCycleTransitionEnum testSubject; @@ -21,17 +18,31 @@ public class LifeCycleTransitionEnumTest { result = testSubject.getDisplayName(); } - @Test public void testGetFromDisplayName() throws Exception { - String name = LifeCycleTransitionEnum.CHECKIN.getDisplayName() ; + String name = LifeCycleTransitionEnum.CHECKIN.getDisplayName(); + LifeCycleTransitionEnum result; + + // default test + for (LifeCycleTransitionEnum iterable_element : LifeCycleTransitionEnum.values()) { + result = LifeCycleTransitionEnum.getFromDisplayName(iterable_element.getDisplayName()); + } + } + + @Test + public void testGetFromDisplayNameException() throws Exception { + String name = LifeCycleTransitionEnum.CHECKIN.getDisplayName(); LifeCycleTransitionEnum result; // default test - result = LifeCycleTransitionEnum.getFromDisplayName(name); + try { + result = LifeCycleTransitionEnum.getFromDisplayName("mock"); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } - @Test public void testValuesAsString() throws Exception { String result; diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/OperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/OperationTest.java new file mode 100644 index 0000000000..8ff412960e --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/OperationTest.java @@ -0,0 +1,61 @@ +package org.openecomp.sdc.be.model; + +import org.junit.Test; +import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition; +import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition; +import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition; + +public class OperationTest { + + private Operation createTestSubject() { + return new Operation(); + } + + @Test + public void testCtor() throws Exception { + new Operation(new OperationDataDefinition()); + new Operation(new ArtifactDataDefinition(), "mock", new ListDataDefinition<>()); + } + + @Test + public void testIsDefinition() throws Exception { + Operation testSubject; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isDefinition(); + } + + @Test + public void testSetDefinition() throws Exception { + Operation testSubject; + boolean definition = false; + + // default test + testSubject = createTestSubject(); + testSubject.setDefinition(definition); + } + + @Test + public void testToString() throws Exception { + Operation testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + @Test + public void testGetImplementationArtifact() throws Exception { + Operation testSubject; + ArtifactDefinition result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getImplementationArtifact(); + testSubject.setImplementation(new ArtifactDataDefinition()); + result = testSubject.getImplementationArtifact(); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ParsedToscaYamlInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ParsedToscaYamlInfoTest.java new file mode 100644 index 0000000000..cec44b402e --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ParsedToscaYamlInfoTest.java @@ -0,0 +1,82 @@ +package org.openecomp.sdc.be.model; + +import java.util.Map; + +import org.junit.Test; + +public class ParsedToscaYamlInfoTest { + + private ParsedToscaYamlInfo createTestSubject() { + return new ParsedToscaYamlInfo(); + } + + @Test + public void testGetInstances() throws Exception { + ParsedToscaYamlInfo testSubject; + Map<String, UploadComponentInstanceInfo> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInstances(); + } + + @Test + public void testSetInstances() throws Exception { + ParsedToscaYamlInfo testSubject; + Map<String, UploadComponentInstanceInfo> instances = null; + + // default test + testSubject = createTestSubject(); + testSubject.setInstances(instances); + } + + @Test + public void testGetGroups() throws Exception { + ParsedToscaYamlInfo testSubject; + Map<String, GroupDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGroups(); + } + + @Test + public void testSetGroups() throws Exception { + ParsedToscaYamlInfo testSubject; + Map<String, GroupDefinition> groups = null; + + // default test + testSubject = createTestSubject(); + testSubject.setGroups(groups); + } + + @Test + public void testGetInputs() throws Exception { + ParsedToscaYamlInfo testSubject; + Map<String, InputDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInputs(); + } + + @Test + public void testSetInputs() throws Exception { + ParsedToscaYamlInfo testSubject; + Map<String, InputDefinition> inputs = null; + + // default test + testSubject = createTestSubject(); + testSubject.setInputs(inputs); + } + + @Test + public void testToString() throws Exception { + ParsedToscaYamlInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/PointTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PointTest.java index f528375b33..edf7f52fe0 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/PointTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PointTest.java @@ -9,6 +9,10 @@ public class PointTest { return new Point(); } + @Test + public void testCtor() throws Exception { + new Point("mock", "mock"); + } @Test public void testGetX() throws Exception { diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/PolicyDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PolicyDefinitionTest.java new file mode 100644 index 0000000000..c7a21b844a --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PolicyDefinitionTest.java @@ -0,0 +1,33 @@ +package org.openecomp.sdc.be.model; + +import java.util.HashMap; +import java.util.LinkedList; + +import org.junit.Test; +import org.openecomp.sdc.be.datatypes.elements.PolicyDataDefinition; + +public class PolicyDefinitionTest { + + private PolicyDefinition createTestSubject() { + return new PolicyDefinition(); + } + + @Test + public void testCtor() throws Exception { + new PolicyDefinition(new HashMap<>()); + new PolicyDefinition(new PolicyDataDefinition()); + PolicyTypeDefinition policyType = new PolicyTypeDefinition(); + policyType.setProperties(new LinkedList<>()); + new PolicyDefinition(policyType); + } + + @Test + public void testGetNormalizedName() throws Exception { + PolicyDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getNormalizedName(); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ProductTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ProductTest.java index 23f1ca48b3..021e044f34 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ProductTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ProductTest.java @@ -11,6 +11,10 @@ public class ProductTest { return new Product(); } + @Test + public void testCtor() throws Exception { + new Product(new ProductMetadataDefinition()); + } @Test public void testGetFullName() throws Exception { diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/PropertyScopeTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PropertyScopeTest.java new file mode 100644 index 0000000000..825473d8ef --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PropertyScopeTest.java @@ -0,0 +1,67 @@ +package org.openecomp.sdc.be.model; + +import org.junit.Assert; +import org.junit.Test; + +public class PropertyScopeTest { + + private PropertyScope createTestSubject() { + return new PropertyScope(); + } + + @Test + public void testGetName() throws Exception { + PropertyScope testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + @Test + public void testSetName() throws Exception { + PropertyScope testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + @Test + public void testHashCode() throws Exception { + PropertyScope testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + @Test + public void testEquals() throws Exception { + PropertyScope testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + obj = new Object(); + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + result = testSubject.equals(testSubject); + Assert.assertEquals(true, result); + result = testSubject.equals(createTestSubject()); + Assert.assertEquals(false, result); + testSubject.setName("mock"); + PropertyScope createTestSubject2 = createTestSubject(); + result = testSubject.equals(createTestSubject2); + Assert.assertEquals(false, result); + createTestSubject2.setName("mock"); + result = testSubject.equals(createTestSubject2); + Assert.assertEquals(true, result); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/RelationshipInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RelationshipInfoTest.java new file mode 100644 index 0000000000..1a606f5bb7 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RelationshipInfoTest.java @@ -0,0 +1,232 @@ +package org.openecomp.sdc.be.model; + +import org.junit.Assert; +import org.junit.Test; +import org.openecomp.sdc.be.datatypes.elements.RelationshipInstDataDefinition; + +public class RelationshipInfoTest { + + private RelationshipInfo createTestSubject() { + return new RelationshipInfo(); + } + + @Test + public void testCtor() throws Exception { + new RelationshipInfo("mock", new RelationshipImpl()); + new RelationshipInfo("mock", new RelationshipImpl(), "mock"); + } + + @Test + public void testGetRequirement() throws Exception { + RelationshipInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getRequirement(); + } + + @Test + public void testSetRequirement() throws Exception { + RelationshipInfo testSubject; + String requirement = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setRequirement(requirement); + } + + @Test + public void testGetCapabilityOwnerId() throws Exception { + RelationshipInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCapabilityOwnerId(); + } + + @Test + public void testSetCapabilityOwnerId() throws Exception { + RelationshipInfo testSubject; + String capabilityOwnerId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setCapabilityOwnerId(capabilityOwnerId); + } + + @Test + public void testGetRequirementOwnerId() throws Exception { + RelationshipInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getRequirementOwnerId(); + } + + @Test + public void testSetRequirementOwnerId() throws Exception { + RelationshipInfo testSubject; + String requirementOwnerId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setRequirementOwnerId(requirementOwnerId); + } + + @Test + public void testGetRelationship() throws Exception { + RelationshipInfo testSubject; + RelationshipImpl result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getRelationship(); + } + + @Test + public void testSetRelationships() throws Exception { + RelationshipInfo testSubject; + RelationshipImpl relationship = null; + + // default test + testSubject = createTestSubject(); + testSubject.setRelationships(relationship); + } + + @Test + public void testGetCapability() throws Exception { + RelationshipInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCapability(); + } + + @Test + public void testSetCapability() throws Exception { + RelationshipInfo testSubject; + String capability = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setCapability(capability); + } + + @Test + public void testGetCapabilityUid() throws Exception { + RelationshipInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCapabilityUid(); + } + + @Test + public void testSetCapabilityUid() throws Exception { + RelationshipInfo testSubject; + String capabilityUid = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setCapabilityUid(capabilityUid); + } + + @Test + public void testGetRequirementUid() throws Exception { + RelationshipInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getRequirementUid(); + } + + @Test + public void testSetRequirementUid() throws Exception { + RelationshipInfo testSubject; + String requirementUid = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setRequirementUid(requirementUid); + } + + @Test + public void testGetId() throws Exception { + RelationshipInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getId(); + } + + @Test + public void testSetId() throws Exception { + RelationshipInfo testSubject; + String id = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setId(id); + } + + @Test + public void testToString() throws Exception { + RelationshipInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + @Test + public void testEqualsTo() throws Exception { + RelationshipInfo testSubject; + RelationshipInstDataDefinition savedRelation = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + result = testSubject.equalsTo(savedRelation); + Assert.assertEquals(false, result); + savedRelation = new RelationshipInstDataDefinition(); + RelationshipImpl relationship = new RelationshipImpl(); + savedRelation.setType("mock"); + testSubject.setRelationships(relationship); + result = testSubject.equalsTo(savedRelation); + Assert.assertEquals(false, result); + relationship.setType("mock"); + savedRelation.setCapabilityOwnerId("mock"); + result = testSubject.equalsTo(savedRelation); + Assert.assertEquals(false, result); + testSubject.setCapabilityOwnerId("mock"); + savedRelation.setRequirementOwnerId("mock"); + result = testSubject.equalsTo(savedRelation); + Assert.assertEquals(false, result); + savedRelation.setRequirementOwnerId("mock"); + result = testSubject.equalsTo(savedRelation); + Assert.assertEquals(false, result); + testSubject.setRequirementOwnerId("mock"); + savedRelation.setRequirementId("mock"); + result = testSubject.equalsTo(savedRelation); + Assert.assertEquals(false, result); + testSubject.setRequirementUid("mock"); + savedRelation.setCapabilityId("mock"); + result = testSubject.equalsTo(savedRelation); + Assert.assertEquals(false, result); + testSubject.setCapabilityUid("mock"); + savedRelation.setRequirement("mock"); + result = testSubject.equalsTo(savedRelation); + Assert.assertEquals(false, result); + testSubject.setRequirement("mock"); + result = testSubject.equalsTo(savedRelation); + Assert.assertEquals(true, result); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceInstanceHeatParameterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceInstanceHeatParameterTest.java index 95b314604a..d1882cc372 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceInstanceHeatParameterTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceInstanceHeatParameterTest.java @@ -9,6 +9,10 @@ public class ResourceInstanceHeatParameterTest { return new ResourceInstanceHeatParameter(); } + @Test + public void testCtor() throws Exception { + new ResourceInstanceHeatParameter(new HeatParameterDefinition(), "mock"); + } @Test public void testGetValueUniqueId() throws Exception { diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceTest.java index c2623ebda5..e9976834b8 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceTest.java @@ -7,13 +7,19 @@ import org.junit.Assert; import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.InterfaceOperationDataDefinition; import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; +import org.openecomp.sdc.be.unittests.utils.ModelConfDependentTest; -public class ResourceTest { +public class ResourceTest extends ModelConfDependentTest{ private Resource createTestSubject() { return new Resource(); } + @Test + public void testCtor() throws Exception { + ComponentMetadataDefinition componentMetadataDefinition = new ComponentMetadataDefinition(); + new Resource(componentMetadataDefinition); + } @Test public void testGetDerivedFrom() throws Exception { @@ -254,9 +260,17 @@ public class ResourceTest { // test 1 testSubject = createTestSubject(); - obj = null; result = testSubject.equals(obj); Assert.assertEquals(false, result); + obj = new Object(); + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + result = testSubject.equals(testSubject); + Assert.assertEquals(true, result); + + Resource testSubject2 = createTestSubject(); + result = testSubject.equals(testSubject2); + Assert.assertEquals(true, result); } diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ServiceTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ServiceTest.java index 3d0c8a1d28..7dafe7d1dc 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ServiceTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ServiceTest.java @@ -12,6 +12,11 @@ public class ServiceTest { } @Test + public void testCtor() throws Exception { + new Service(new ComponentMetadataDefinition()); + } + + @Test public void testGetServiceApiArtifacts() throws Exception { Service testSubject; Map<String, ArtifactDefinition> result; @@ -109,6 +114,7 @@ public class ServiceTest { testSubject = createTestSubject(); distributionStatus = null; testSubject.setDistributionStatus(distributionStatus); + testSubject.setDistributionStatus(DistributionStatusEnum.DISTRIBUTED); } diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/TagTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/TagTest.java new file mode 100644 index 0000000000..ac4475e8ae --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/TagTest.java @@ -0,0 +1,68 @@ +package org.openecomp.sdc.be.model; + +import org.junit.Assert; +import org.junit.Test; + +public class TagTest { + + private Tag createTestSubject() { + return new Tag(); + } + + @Test + public void testGetName() throws Exception { + Tag testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + @Test + public void testSetName() throws Exception { + Tag testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + @Test + public void testHashCode() throws Exception { + Tag testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + @Test + public void testEquals() throws Exception { + Tag testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + obj = new Object(); + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + result = testSubject.equals(testSubject); + Assert.assertEquals(true, result); + + Tag createTestSubject = createTestSubject(); + result = testSubject.equals(createTestSubject); + Assert.assertEquals(false, result); + testSubject.setName("mock"); + result = testSubject.equals(createTestSubject); + Assert.assertEquals(false, result); + createTestSubject.setName("mock"); + result = testSubject.equals(createTestSubject); + Assert.assertEquals(true, result); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/TargetCapabilityRelDefTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/TargetCapabilityRelDefTest.java new file mode 100644 index 0000000000..ab610116f1 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/TargetCapabilityRelDefTest.java @@ -0,0 +1,98 @@ +package org.openecomp.sdc.be.model; + +import java.util.LinkedList; +import java.util.List; + +import org.junit.Test; + +public class TargetCapabilityRelDefTest { + + private TargetCapabilityRelDef createTestSubject() { + return new TargetCapabilityRelDef(); + } + + @Test + public void testCtor() throws Exception { + new TargetCapabilityRelDef("mock", new LinkedList<>()); + } + + @Test + public void testGetToNode() throws Exception { + TargetCapabilityRelDef testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getToNode(); + } + + @Test + public void testSetToNode() throws Exception { + TargetCapabilityRelDef testSubject; + String toNode = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setToNode(toNode); + } + + @Test + public void testGetRelationships() throws Exception { + TargetCapabilityRelDef testSubject; + List<CapabilityRequirementRelationship> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getRelationships(); + } + + @Test + public void testResolveSingleRelationship() throws Exception { + TargetCapabilityRelDef testSubject; + CapabilityRequirementRelationship result; + + // default test + testSubject = createTestSubject(); + result = testSubject.resolveSingleRelationship(); + } + + @Test + public void testGetUid() throws Exception { + TargetCapabilityRelDef testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUid(); + } + + @Test + public void testSetUid() throws Exception { + TargetCapabilityRelDef testSubject; + String uid = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUid(uid); + } + + @Test + public void testSetRelationships() throws Exception { + TargetCapabilityRelDef testSubject; + List<CapabilityRequirementRelationship> relationships = null; + + // default test + testSubject = createTestSubject(); + testSubject.setRelationships(relationships); + } + + @Test + public void testToString() throws Exception { + TargetCapabilityRelDef testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadComponentInstanceInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadComponentInstanceInfoTest.java new file mode 100644 index 0000000000..f23e04bfec --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadComponentInstanceInfoTest.java @@ -0,0 +1,153 @@ +package org.openecomp.sdc.be.model; + +import java.util.List; +import java.util.Map; + +import org.junit.Test; + +public class UploadComponentInstanceInfoTest { + + private UploadComponentInstanceInfo createTestSubject() { + return new UploadComponentInstanceInfo(); + } + + @Test + public void testGetProperties() throws Exception { + UploadComponentInstanceInfo testSubject; + Map<String, List<UploadPropInfo>> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getProperties(); + } + + @Test + public void testSetProperties() throws Exception { + UploadComponentInstanceInfo testSubject; + Map<String, List<UploadPropInfo>> properties = null; + + // default test + testSubject = createTestSubject(); + testSubject.setProperties(properties); + } + + @Test + public void testGetName() throws Exception { + UploadComponentInstanceInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + @Test + public void testSetName() throws Exception { + UploadComponentInstanceInfo testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + @Test + public void testGetType() throws Exception { + UploadComponentInstanceInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getType(); + } + + @Test + public void testSetType() throws Exception { + UploadComponentInstanceInfo testSubject; + String type = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setType(type); + } + + @Test + public void testGetCapabilities() throws Exception { + UploadComponentInstanceInfo testSubject; + Map<String, List<UploadCapInfo>> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCapabilities(); + } + + @Test + public void testSetCapabilities() throws Exception { + UploadComponentInstanceInfo testSubject; + Map<String, List<UploadCapInfo>> capabilities = null; + + // default test + testSubject = createTestSubject(); + testSubject.setCapabilities(capabilities); + } + + @Test + public void testGetRequirements() throws Exception { + UploadComponentInstanceInfo testSubject; + Map<String, List<UploadReqInfo>> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getRequirements(); + } + + @Test + public void testSetRequirements() throws Exception { + UploadComponentInstanceInfo testSubject; + Map<String, List<UploadReqInfo>> requirements = null; + + // default test + testSubject = createTestSubject(); + testSubject.setRequirements(requirements); + } + + @Test + public void testGetCapabilitiesNamesToUpdate() throws Exception { + UploadComponentInstanceInfo testSubject; + Map<String, String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCapabilitiesNamesToUpdate(); + } + + @Test + public void testSetCapabilitiesNamesToUpdate() throws Exception { + UploadComponentInstanceInfo testSubject; + Map<String, String> capabilitiesNamesToUpdate = null; + + // default test + testSubject = createTestSubject(); + testSubject.setCapabilitiesNamesToUpdate(capabilitiesNamesToUpdate); + } + + @Test + public void testGetRequirementsNamesToUpdate() throws Exception { + UploadComponentInstanceInfo testSubject; + Map<String, String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getRequirementsNamesToUpdate(); + } + + @Test + public void testSetRequirementsNamesToUpdate() throws Exception { + UploadComponentInstanceInfo testSubject; + Map<String, String> requirementsNamesToUpdate = null; + + // default test + testSubject = createTestSubject(); + testSubject.setRequirementsNamesToUpdate(requirementsNamesToUpdate); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/IdMapperTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/IdMapperTest.java index 3429f1ea49..39ea68c3fe 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/IdMapperTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/IdMapperTest.java @@ -1,7 +1,5 @@ package org.openecomp.sdc.be.model.jsontitan.utils; -import javax.annotation.Generated; - import org.junit.Test; import org.openecomp.sdc.be.dao.jsongraph.GraphVertex; diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/InterfaceUtilsTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/InterfaceUtilsTest.java index 64c4cd792b..9a7ccc7f26 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/InterfaceUtilsTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/InterfaceUtilsTest.java @@ -6,8 +6,6 @@ import java.util.Map; import java.util.Optional; import org.junit.Test; -import org.openecomp.sdc.be.datatypes.elements.OperationInputDefinition; -import org.openecomp.sdc.be.model.InputDefinition; import org.openecomp.sdc.be.model.InterfaceDefinition; import org.openecomp.sdc.be.model.Operation; import org.openecomp.sdc.be.model.Resource; diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperationTest.java index bfefd00994..40f692ca41 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperationTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperationTest.java @@ -1,19 +1,9 @@ package org.openecomp.sdc.be.model.operations.impl; -import static org.junit.Assert.*; -import java.util.*; -import org.junit.Assert; import org.junit.Test; -import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.dao.titan.TitanGenericDao; -import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import org.openecomp.sdc.be.model.ComponentInstance; import org.openecomp.sdc.be.model.ComponentInstanceInput; -import org.openecomp.sdc.be.model.ComponentInstanceProperty; import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus; -import org.openecomp.sdc.be.resources.data.AttributeData; -import org.openecomp.sdc.be.resources.data.AttributeValueData; -import org.openecomp.sdc.be.resources.data.ComponentInstanceData; import fj.data.Either; diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ConstraintUtilTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ConstraintUtilTest.java index 877c7c40eb..c6df4f726e 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ConstraintUtilTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ConstraintUtilTest.java @@ -1,10 +1,7 @@ package org.openecomp.sdc.be.model.tosca.constraints; -import javax.annotation.Generated; - import org.junit.Test; import org.openecomp.sdc.be.model.tosca.ToscaType; -import org.openecomp.sdc.be.model.tosca.constraints.ConstraintUtil.ConstraintInformation; public class ConstraintUtilTest { diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverterTest.java index 500ecfc497..d5425504e6 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverterTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverterTest.java @@ -1,18 +1,19 @@ package org.openecomp.sdc.be.model.tosca.converters; -import com.google.gson.JsonObject; -import org.junit.Before; -import org.junit.Test; -import org.openecomp.sdc.be.model.DataTypeDefinition; -import org.openecomp.sdc.be.model.PropertyDefinition; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import org.junit.Before; +import org.junit.Test; +import org.openecomp.sdc.be.model.DataTypeDefinition; +import org.openecomp.sdc.be.model.PropertyDefinition; + +import com.google.gson.JsonObject; public class DataTypePropertyConverterTest { diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/LowerCaseConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/LowerCaseConverterTest.java index d86f7f43f7..fe37d3e8c7 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/LowerCaseConverterTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/LowerCaseConverterTest.java @@ -2,9 +2,6 @@ package org.openecomp.sdc.be.model.tosca.converters; import java.util.Map; -import javax.annotation.Generated; - -import org.junit.Assert; import org.junit.Test; import org.openecomp.sdc.be.model.DataTypeDefinition; diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverterTest.java index 7e9388ee1b..00ac26312d 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverterTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverterTest.java @@ -1,13 +1,13 @@ package org.openecomp.sdc.be.model.tosca.converters; -import org.junit.Test; - -import java.util.Collections; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.junit.Assert.assertNull; +import java.util.Collections; + +import org.junit.Test; + public class ToscaFloatConverterTest { diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverterTest.java index 02d8ed6632..9819e3f6e8 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverterTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverterTest.java @@ -1,12 +1,6 @@ package org.openecomp.sdc.be.model.tosca.converters; -import static org.junit.Assert.*; -import java.util.*; -import org.junit.Assert; import org.junit.Test; -import org.openecomp.sdc.be.model.DataTypeDefinition; - -import com.google.gson.JsonElement; public class ToscaMapValueConverterTest { diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/validators/MapValidatorTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/validators/MapValidatorTest.java index 6f33b19de3..c82894fe5e 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/validators/MapValidatorTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/validators/MapValidatorTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.model.tosca.validators; -import org.junit.Test; +import static org.junit.Assert.assertFalse; import java.util.Collections; -import static org.junit.Assert.*; +import org.junit.Test; public class MapValidatorTest { diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/validators/ToscaBooleanValidatorTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/validators/ToscaBooleanValidatorTest.java index c1a99e754a..3070c3df4e 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/validators/ToscaBooleanValidatorTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/validators/ToscaBooleanValidatorTest.java @@ -2,9 +2,6 @@ package org.openecomp.sdc.be.model.tosca.validators; import java.util.Map; -import javax.annotation.Generated; - -import org.junit.Assert; import org.junit.Test; import org.openecomp.sdc.be.model.DataTypeDefinition; diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/unittests/utils/FactoryUtilsTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/unittests/utils/FactoryUtilsTest.java index 380111dc77..53ed77638c 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/unittests/utils/FactoryUtilsTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/unittests/utils/FactoryUtilsTest.java @@ -2,8 +2,6 @@ package org.openecomp.sdc.be.unittests.utils; import java.util.List; -import javax.annotation.Generated; - import org.junit.Test; import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge; import org.openecomp.sdc.be.model.CapabilityDefinition; diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/unittests/utils/ModelConfDependentTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/unittests/utils/ModelConfDependentTest.java new file mode 100644 index 0000000000..2135b668e6 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/unittests/utils/ModelConfDependentTest.java @@ -0,0 +1,13 @@ +package org.openecomp.sdc.be.unittests.utils; + +import org.junit.BeforeClass; +import org.openecomp.sdc.common.test.BaseConfDependent; + +public class ModelConfDependentTest extends BaseConfDependent { + @BeforeClass + public static void setupBeforeClass() { + componentName = "catalog-model"; + confPath = "src/test/resources/config"; + setUp(); + } +} diff --git a/catalog-model/src/test/resources/config/catalog-model/configuration.yaml b/catalog-model/src/test/resources/config/catalog-model/configuration.yaml new file mode 100644 index 0000000000..f948f6e3cc --- /dev/null +++ b/catalog-model/src/test/resources/config/catalog-model/configuration.yaml @@ -0,0 +1,677 @@ +identificationHeaderFields: + - HTTP_IV_USER + - HTTP_CSP_FIRSTNAME + - HTTP_CSP_LASTNAME + - HTTP_IV_REMOTE_ADDRESS + - HTTP_CSP_WSTYPE + +# catalog backend hostname +beFqdn: localhost +# sdccatalog.att.com + +# catalog backend http port +beHttpPort: 8080 + +# catalog backend http context +beContext: /sdc/rest/config/get + +# catalog backend protocol +beProtocol: http + +# catalog backend ssl port +beSslPort: 8443 + +version: 1.1.0 +released: 2012-11-30 +toscaConformanceLevel: 5.0 +minToscaConformanceLevel: 3.0 + +titanCfgFile: /home/vagrant/catalog-be/config/catalog-be/titan.properties +titanInMemoryGraph: false +titanLockTimeout: 1800 + +# The interval to try and reconnect to titan DB when it is down during ASDC startup: +titanReconnectIntervalInSeconds: 3 + +# The read timeout towards Titan DB when health check is invoked: +titanHealthCheckReadTimeout: 1 + +# The interval to try and reconnect to Elasticsearch when it is down during ASDC startup: +esReconnectIntervalInSeconds: 3 +uebHealthCheckReconnectIntervalInSeconds: 15 +uebHealthCheckReadTimeout: 4 + +# Protocols +protocols: + - http + - https + +# Default imports +defaultImports: + - nodes: + file: nodes.yml + - datatypes: + file: data.yml + - capabilities: + file: capabilities.yml + - relationships: + file: relationships.yml + - groups: + file: groups.yml + - policies: + file: policies.yml + +# Users +users: + tom: passwd + bob: passwd + +neo4j: + host: neo4jhost + port: 7474 + user: neo4j + password: "12345" + +cassandraConfig: + cassandraHosts: ['localhost'] + localDataCenter: datacenter1 + reconnectTimeout : 30000 + authenticate: false + username: koko + password: bobo + ssl: false + truststorePath : /path/path + truststorePassword : 123123 + keySpaces: + - { name: sdcaudit, replicationStrategy: SimpleStrategy, replicationInfo: ['1']} + - { name: sdcartifact, replicationStrategy: SimpleStrategy, replicationInfo: ['1']} + - { name: sdccomponent, replicationStrategy: SimpleStrategy, replicationInfo: ['1']} + - { name: sdcrepository, replicationStrategy: SimpleStrategy, replicationInfo: ['1']} + +#Application-specific settings of ES +elasticSearch: + # Mapping of index prefix to time-based frame. For example, if below is configured: + # + # - indexPrefix: auditingevents + # creationPeriod: minute + # + # then ES object of type which is mapped to "auditingevents-*" template, and created on 2015-12-23 13:24:54, will enter "auditingevents-2015-12-23-13-24" index. + # Another object created on 2015-12-23 13:25:54, will enter "auditingevents-2015-12-23-13-25" index. + # If creationPeriod: month, both of the above will enter "auditingevents-2015-12" index. + # + # PLEASE NOTE: the timestamps are created in UTC/GMT timezone! This is needed so that timestamps will be correctly presented in Kibana. + # + # Legal values for creationPeriod - year, month, day, hour, minute, none (meaning no time-based behaviour). + # + # If no creationPeriod is configured for indexPrefix, default behavour is creationPeriod: month. + + indicesTimeFrequency: + - indexPrefix: auditingevents + creationPeriod: month + - indexPrefix: monitoring_events + creationPeriod: month + +artifactTypes: + - CHEF + - PUPPET + - SHELL + - YANG + - YANG_XML + - HEAT + - BPEL + - DG_XML + - MURANO_PKG + - WORKFLOW + - NETWORK_CALL_FLOW + - TOSCA_TEMPLATE + - TOSCA_CSAR + - AAI_SERVICE_MODEL + - AAI_VF_MODEL + - AAI_VF_MODULE_MODEL + - AAI_VF_INSTANCE_MODEL + - OTHER + - SNMP_POLL + - SNMP_TRAP + - GUIDE + +licenseTypes: + - User + - Installation + - CPU + +#Deployment artifacts placeHolder +resourceTypes: &allResourceTypes + - VFC + - CP + - VL + - VF + - VFCMT + - Abstract + - CVFC + +# validForResourceTypes usage +# validForResourceTypes: +# - VF +# - VL +deploymentResourceArtifacts: +# heat: +# displayName: "Base HEAT Template" +# type: HEAT +# validForResourceTypes: *allResourceTypes +# heatVol: +# displayName: "Volume HEAT Template" +# type: HEAT_VOL +# validForResourceTypes: *allResourceTypes +# heatNet: +# displayName: "Network HEAT Template" +# type: HEAT_NET +# validForResourceTypes: *allResourceTypes + +deploymentResourceInstanceArtifacts: + heatEnv: + displayName: "HEAT ENV" + type: HEAT_ENV + description: "Auto-generated HEAT Environment deployment artifact" + fileExtension: "env" + VfHeatEnv: + displayName: "VF HEAT ENV" + type: HEAT_ENV + description: "VF Auto-generated HEAT Environment deployment artifact" + fileExtension: "env" + +#tosca artifacts placeholders +toscaArtifacts: + assetToscaTemplate: + artifactName: -template.yml + displayName: Tosca Template + type: TOSCA_TEMPLATE + description: TOSCA representation of the asset + assetToscaCsar: + artifactName: -csar.csar + displayName: Tosca Model + type: TOSCA_CSAR + description: TOSCA definition package of the asset + + +#Informational artifacts placeHolder +excludeResourceCategory: + - Generic +excludeResourceType: + - PNF +informationalResourceArtifacts: + features: + displayName: Features + type: OTHER + capacity: + displayName: Capacity + type: OTHER + vendorTestResult: + displayName: Vendor Test Result + type: OTHER + testScripts: + displayName: Test Scripts + type: OTHER + CloudQuestionnaire: + displayName: Cloud Questionnaire (completed) + type: OTHER + HEATTemplateFromVendor: + displayName: HEAT Template from Vendor + type: HEAT + resourceSecurityTemplate: + displayName: Resource Security Template + type: OTHER + +excludeServiceCategory: + +informationalServiceArtifacts: + serviceArtifactPlan: + displayName: Service Artifact Plan + type: OTHER + summaryOfImpactsToECOMPElements: + displayName: Summary of impacts to ECOMP elements,OSSs, BSSs + type: OTHER + controlLoopFunctions: + displayName: Control Loop Functions + type: OTHER + dimensioningInfo: + displayName: Dimensioning Info + type: OTHER + affinityRules: + displayName: Affinity Rules + type: OTHER + operationalPolicies: + displayName: Operational Policies + type: OTHER + serviceSpecificPolicies: + displayName: Service-specific Policies + type: OTHER + engineeringRules: + displayName: Engineering Rules (ERD) + type: OTHER + distributionInstructions: + displayName: Distribution Instructions + type: OTHER + certificationTestResults: + displayName: TD Certification Test Results + type: OTHER + deploymentVotingRecord: + displayName: Deployment Voting Record + type: OTHER + serviceQuestionnaire: + displayName: Service Questionnaire + type: OTHER + serviceSecurityTemplate: + displayName: Service Security Template + type: OTHER + +serviceApiArtifacts: + configuration: + displayName: Configuration + type: OTHER + instantiation: + displayName: Instantiation + type: OTHER + monitoring: + displayName: Monitoring + type: OTHER + reporting: + displayName: Reporting + type: OTHER + logging: + displayName: Logging + type: OTHER + testing: + displayName: Testing + type: OTHER + +additionalInformationMaxNumberOfKeys: 50 + +systemMonitoring: + enabled: false + isProxy: false + probeIntervalInSeconds: 15 + +defaultHeatArtifactTimeoutMinutes: 60 + +serviceDeploymentArtifacts: + YANG_XML: + acceptedTypes: + - xml + VNF_CATALOG: + acceptedTypes: + - xml + MODEL_INVENTORY_PROFILE: + acceptedTypes: + - xml + MODEL_QUERY_SPEC: + acceptedTypes: + - xml + UCPE_LAYER_2_CONFIGURATION: + acceptedTypes: + - xml + +#AAI Artifacts + AAI_SERVICE_MODEL: + acceptedTypes: + - xml + AAI_VF_MODULE_MODEL: + acceptedTypes: + - xml + AAI_VF_INSTANCE_MODEL: + acceptedTypes: + - xml + OTHER: + acceptedTypes: + +resourceDeploymentArtifacts: + HEAT: + acceptedTypes: + - yaml + - yml + validForResourceTypes: *allResourceTypes + HEAT_VOL: + acceptedTypes: + - yaml + - yml + validForResourceTypes: *allResourceTypes + HEAT_NET: + acceptedTypes: + - yaml + - yml + validForResourceTypes: *allResourceTypes + HEAT_NESTED: + acceptedTypes: + - yaml + - yml + validForResourceTypes: *allResourceTypes + HEAT_ARTIFACT: + acceptedTypes: + validForResourceTypes: *allResourceTypes + YANG_XML: + acceptedTypes: + - xml + validForResourceTypes: *allResourceTypes + VNF_CATALOG: + acceptedTypes: + - xml + validForResourceTypes: *allResourceTypes + VF_LICENSE: + acceptedTypes: + - xml + validForResourceTypes: *allResourceTypes + VENDOR_LICENSE: + acceptedTypes: + - xml + validForResourceTypes: *allResourceTypes + MODEL_INVENTORY_PROFILE: + acceptedTypes: + - xml + validForResourceTypes: *allResourceTypes + MODEL_QUERY_SPEC: + acceptedTypes: + - xml + validForResourceTypes: *allResourceTypes + LIFECYCLE_OPERATIONS: + acceptedTypes: + - yaml + - yml + validForResourceTypes: + - VF + - VFC + VES_EVENTS: + acceptedTypes: + - yaml + - yml + validForResourceTypes: *allResourceTypes + PERFORMANCE_COUNTER: + acceptedTypes: + - csv + validForResourceTypes: *allResourceTypes + APPC_CONFIG: + acceptedTypes: + validForResourceTypes: + - VF + DCAE_TOSCA: + acceptedTypes: + - yml + - yaml + validForResourceTypes: + - VF + - VFCMT + DCAE_JSON: + acceptedTypes: + - json + validForResourceTypes: + - VF + - VFCMT + DCAE_POLICY: + acceptedTypes: + - emf + validForResourceTypes: + - VF + - VFCMT + DCAE_DOC: + acceptedTypes: + validForResourceTypes: + - VF + - VFCMT + DCAE_EVENT: + acceptedTypes: + validForResourceTypes: + - VF + - VFCMT + AAI_VF_MODEL: + acceptedTypes: + - xml + validForResourceTypes: + - VF + AAI_VF_MODULE_MODEL: + acceptedTypes: + - xml + validForResourceTypes: + - VF + OTHER: + acceptedTypes: + validForResourceTypes: *allResourceTypes + SNMP_POLL: + acceptedTypes: + validForResourceTypes: *allResourceTypes + SNMP_TRAP: + acceptedTypes: + validForResourceTypes: *allResourceTypes + +resourceInstanceDeploymentArtifacts: + HEAT_ENV: + acceptedTypes: + - env + VF_MODULES_METADATA: + acceptedTypes: + - json + VES_EVENTS: + acceptedTypes: + - yaml + - yml + PERFORMANCE_COUNTER: + acceptedTypes: + - csv + DCAE_INVENTORY_TOSCA: + acceptedTypes: + - yml + - yaml + DCAE_INVENTORY_JSON: + acceptedTypes: + - json + DCAE_INVENTORY_POLICY: + acceptedTypes: + - emf + DCAE_INVENTORY_DOC: + acceptedTypes: + DCAE_INVENTORY_BLUEPRINT: + acceptedTypes: + DCAE_INVENTORY_EVENT: + acceptedTypes: + SNMP_POLL: + acceptedTypes: + validForResourceTypes: *allResourceTypes + SNMP_TRAP: + acceptedTypes: + validForResourceTypes: *allResourceTypes + +resourceInformationalArtifacts: + CHEF: + acceptedTypes: + validForResourceTypes: *allResourceTypes + PUPPET: + acceptedTypes: + validForResourceTypes: *allResourceTypes + SHELL: + acceptedTypes: + validForResourceTypes: *allResourceTypes + YANG: + acceptedTypes: + validForResourceTypes: *allResourceTypes + YANG_XML: + acceptedTypes: + validForResourceTypes: *allResourceTypes + HEAT: + acceptedTypes: + validForResourceTypes: *allResourceTypes + BPEL: + acceptedTypes: + validForResourceTypes: *allResourceTypes + DG_XML: + acceptedTypes: + validForResourceTypes: *allResourceTypes + MURANO_PKG: + acceptedTypes: + validForResourceTypes: *allResourceTypes + OTHER: + acceptedTypes: + validForResourceTypes: + - VFC + - CVFC + - CP + - VL + - VF + - VFCMT + - Abstract + - PNF + SNMP_POLL: + acceptedTypes: + validForResourceTypes: *allResourceTypes + SNMP_TRAP: + acceptedTypes: + validForResourceTypes: *allResourceTypes + GUIDE: + acceptedTypes: + validForResourceTypes: + - VF + - VFC + - CVFC + +resourceInformationalDeployedArtifacts: + +requirementsToFulfillBeforeCert: + +capabilitiesToConsumeBeforeCert: + +unLoggedUrls: + - /sdc2/rest/healthCheck + +cleanComponentsConfiguration: + cleanIntervalInMinutes: 1440 + componentsToClean: + - Resource + - Service + +artifactsIndex: resources + +heatEnvArtifactHeader: "" +heatEnvArtifactFooter: "" + +onboarding: + protocol: http + host: localhost + port: 8080 + downloadCsarUri: "/onboarding-api/v1.0/vendor-software-products/packages" + healthCheckUri: "/onboarding-api/v1.0/healthcheck" + +dcae: + protocol: http + host: 127.0.0.1 + port: 8080 + healthCheckUri: "/dcae/healthCheck" + +switchoverDetector: + gBeFqdn: AIO-BE.ecomp.idns.cip.com + gFeFqdn: AIO-FE.ecomp.idns.cip.com + beVip: 0.0.0.0 + feVip: 0.0.0.0 + beResolveAttempts: 3 + feResolveAttempts: 3 + enabled: false + interval: 60 + changePriorityUser: ecompasdc + changePriorityPassword: ecompasdc123 + publishNetworkUrl: "http://xxx.com/crt/CipDomain.ECOMP-ASDC-DEVST/config/update_network?user=root" + publishNetworkBody: '{"note":"publish network"}' + groups: + beSet: { changePriorityUrl: "http://xxx.com/crt/CipDomain.ECOMP-ASDC-DEVST/config/sites/AIO-BE.ecomp.idns.com?user=root", + changePriorityBody: '{"name":"AIO-BE.ecomp.idns.com","uri":"/crt/CipDomain.ECOMP-ASDC-DEVST/config/sites/AIO-BE.ecomp.idns.com","no_ad_redirection":false,"v4groups":{"failover_groups":["/crt/CipDomain.ECOMP-ASDC-DEVST/config/groups/group_mg_be","/crt/CipDomain.ECOMP-ASDC-DEVST/config/groups/group_bs_be"],"failover_policy":["FAILALL"]},"comment":"AIO BE G-fqdn","intended_app_proto":"DNS"}'} + feSet: { changePriorityUrl: "http://xxx.com/crt/CipDomain.ECOMP-ASDC-DEVST/config/sites/AIO-FE.ecomp.idns.com?user=root", + changePriorityBody: '{"comment":"AIO G-fqdn","name":"AIO-FE.ecomp.idns.com","v4groups":{"failover_groups":["/crt/CipDomain.ECOMP-ASDC-DEVST/config/groups/group_mg_fe","/crt/CipDomain.ECOMP-ASDC-DEVST/config/groups/group_bs_fe"],"failover_policy":["FAILALL"]},"no_ad_redirection":false,"intended_app_proto":"DNS","uri":"/crt/CipDomain.ECOMP-ASDC-DEVST/config/sites/AIO-FE.ecomp.idns.com"}'} + +applicationL1Cache: + datatypes: + enabled: true + firstRunDelay: 10 + pollIntervalInSec: 60 + +applicationL2Cache: + enabled: true + catalogL1Cache: + enabled: true + resourcesSizeInCache: 300 + servicesSizeInCache: 200 + productsSizeInCache: 100 + queue: + syncIntervalInSecondes: 43200 + waitOnShutDownInMinutes: 10 + numberOfCacheWorkers: 4 + +toscaValidators: + stringMaxLength: 2500 + +disableAudit: false + +vfModuleProperties: + min_vf_module_instances: + forBaseModule: 1 + forNonBaseModule: 0 + max_vf_module_instances: + forBaseModule: 1 + forNonBaseModule: + initial_count: + forBaseModule: 1 + forNonBaseModule: 0 + vf_module_type: + forBaseModule: Base + forNonBaseModule: Expansion + +genericAssetNodeTypes: + VFC: org.openecomp.resource.abstract.nodes.VFC + CVFC: org.openecomp.resource.abstract.nodes.VFC + VF : org.openecomp.resource.abstract.nodes.VF + PNF: org.openecomp.resource.abstract.nodes.PNF + Service: org.openecomp.resource.abstract.nodes.service + +workloadContext: Production +environmentContext: + defaultValue: General_Revenue-Bearing + validValues: + - Critical_Revenue-Bearing + - Vital_Revenue-Bearing + - Essential_Revenue-Bearing + - Important_Revenue-Bearing + - Needed_Revenue-Bearing + - Useful_Revenue-Bearing + - General_Revenue-Bearing + - Critical_Non-Revenue + - Vital_Non-Revenue + - Essential_Non-Revenue + - Important_Non-Revenue + - Needed_Non-Revenue + - Useful_Non-Revenue + - General_Non-Revenue + +dmaapConsumerConfiguration: + hosts: olsd004.wnsnet.attws.com:3905 + consumerGroup: asdc + consumerId: invalidMamaUser #mama - in Order To Consume Remove This String And Replace It With -> mama + timeoutMs: 15000 + limit: 1 + pollingInterval: 2 + topic: com.att.sdc.23911-SDCforTestDev-v001 + latitude: 32.109333 + longitude: 34.855499 + version: 1.0 + serviceName: dmaap-v1.dev.dmaap.dt.saat.acsi.att.com/events + environment: TEST + partner: BOT_R + routeOffer: MR1 + protocol: https + contenttype: application/json + dme2TraceOn: true + aftEnvironment: AFTUAT + aftDme2ConnectionTimeoutMs: 15000 + aftDme2RoundtripTimeoutMs: 240000 + aftDme2ReadTimeoutMs: 50000 + dme2preferredRouterFilePath: DME2preferredRouter.txt + timeLimitForNotificationHandleMs: 0 + credential: + username: m09875@sdc.att.com + password: hmXYcznAljMSisdy8zgcag== + +dmeConfiguration: + dme2Search: DME2SEARCH + dme2Resolve: DME2RESOLVE diff --git a/catalog-model/src/test/resources/config/catalog-model/ecomp-error-configuration.yaml b/catalog-model/src/test/resources/config/catalog-model/ecomp-error-configuration.yaml new file mode 100644 index 0000000000..f8639668ee --- /dev/null +++ b/catalog-model/src/test/resources/config/catalog-model/ecomp-error-configuration.yaml @@ -0,0 +1,308 @@ +########################################### +# Note the conventions of the field values: +# type can be one of: CONFIG_ERROR, SYSTEM_ERROR, DATA_ERROR, CONNECTION_PROBLEM, AUTHENTICATION_PROBLEM +# severity can be one of: WARN, ERROR, FATAL +# alarmSeverity can be one of: CRITICAL,MAJOR,MINOR,INFORMATIONAL,NONE +# code is a unique integer in range of 3003-9999 (3000-3002 are occupied for internal usage) +# The above enumeration values are out-of-the-box and can be changed in code. +# In case of config and code mismatch, the appropriate error will be printed to log +# +## Range of BE codes - 3010-7999 + +errors: + + BeRestApiGeneralError: { + type: SYSTEM_ERROR, + code: ASDC_4000, + severity: ERROR, + description: "Unexpected error during BE REST API execution", + alarmSeverity: CRITICAL + } + + BeHealthCheckError: { + type: SYSTEM_ERROR, + code: ASDC_3010, + severity: WARN, + description: "Error during BE Health Check", + alarmSeverity: INFORMATIONAL + } + + BeInitializationError: { + type: SYSTEM_ERROR, + code: ASDC_4019, + severity: ERROR, + description: "Catalog-BE was not initialized properly", + alarmSeverity: CRITICAL + } + + BeResourceMissingError: { + type: SYSTEM_ERROR, + code: ASDC_3011, + severity: ERROR, + description: "Mandatory resource %s cannot be found in repository", + alarmSeverity: MAJOR + } + + BeServiceMissingError: { + type: SYSTEM_ERROR, + code: ASDC_3012, + severity: ERROR, + description: "Mandatory service %s cannot be found in repository", + alarmSeverity: MAJOR + } + + BeFailedAddingResourceInstanceError: { + type: SYSTEM_ERROR, + code: ASDC_3013, + severity: ERROR, + description: "Failed to add resource instance of resource %s to service %s", + alarmSeverity: MAJOR + } + + BeIncorrectServiceError: { + type: SYSTEM_ERROR, + code: ASDC_3014, + severity: ERROR, + description: "Service %s is not valid", + alarmSeverity: MAJOR + } + + BeRepositoryDeleteError: { + type: SYSTEM_ERROR, + code: ASDC_3015, + severity: ERROR, + description: "Failed to delete object %s from repository", + alarmSeverity: CRITICAL + } + + BeRepositoryQueryError: { + type: SYSTEM_ERROR, + code: ASDC_3016, + severity: ERROR, + description: "Failed to fetch from repository %s", + alarmSeverity: MAJOR + } + + BeInvalidConfigurationError: { + type: CONFIG_ERROR, + code: ASDC_3017, + severity: FATAL, + description: "Configuration parameter %s is invalid. Value configured is %s", + alarmSeverity: MAJOR + } + + BeUebConnectionError: { + type: CONNECTION_PROBLEM, + code: ASDC_4001, + severity: ERROR, + description: "Connection problem towards U-EB server. Reason: %s", + alarmSeverity: MAJOR + } + + BeUebSystemError: { + type: SYSTEM_ERROR, + code: ASDC_3019, + severity: ERROR, + description: "Error occured during access to U-EB Server. Operation: %s", + alarmSeverity: MAJOR + } + + BeUebObjectNotFoundError: { + type: DATA_ERROR, + code: ASDC_4005, + severity: ERROR, + description: "Error occured during access to U-EB Server. Data not found: %s", + alarmSeverity: MAJOR + } + + BeDistributionEngineSystemError: { + type: SYSTEM_ERROR, + code: ASDC_3021, + severity: ERROR, + description: "Error occured in Distribution Engine. Failed operation: %s", + alarmSeverity: MAJOR + } + + BeUebAuthenticationError: { + type: AUTHENTICATION_PROBLEM, + code: ASDC_4003, + severity: ERROR, + description: "Authentication problem towards U-EB server. Reason: %s", + alarmSeverity: MAJOR + } + + BeUebUnkownHostError: { + type: CONNECTION_PROBLEM, + code: ASDC_4002, + severity: ERROR, + description: "Connection problem towards U-EB server. Cannot reach host %s", + alarmSeverity: MAJOR + } + + BeUebConnectionError: { + type: CONNECTION_PROBLEM, + code: ASDC_4004, + severity: ERROR, + description: "Connection problem towards U-EB server.", + alarmSeverity: MAJOR + } + + BeDistributionEngineInvalidArtifactType: { + type: DATA_ERROR, + code: ASDC_4006, + severity: WARN, + description: "The artifact type %s does not appear in the list of valid artifacts %s", + alarmSeverity: MAJOR + } + BeInvalidTypeError: { + type: DATA_ERROR, + code: ASDC_4008, + severity: WARN, + description: "The type %s of %s is invalid", + alarmSeverity: MAJOR + } + BeInvalidValueError: { + type: DATA_ERROR, + code: ASDC_3028, + severity: WARN, + description: "The value %s of %s from type %s is invalid", + alarmSeverity: MAJOR + } + + BeFailedDeletingResourceInstanceError: { + type: SYSTEM_ERROR, + code: ASDC_3029, + severity: ERROR, + description: "Failed to delete resource instance %s from service %s", + alarmSeverity: MAJOR + } + + BeMissingConfigurationError: { + type: CONFIG_ERROR, + code: ASDC_3030, + severity: FATAL, + description: "Configuration parameter %s is missing", + alarmSeverity: MAJOR + } + + BeConfigurationInvalidListSizeError: { + type: CONFIG_ERROR, + code: ASDC_3031, + severity: FATAL, + description: "Configuration parameter %s is invalid. At least %s values shall be configured", + alarmSeverity: MAJOR + } + + ErrorConfigFileFormat: { + type: CONFIG_ERROR, + code: ASDC_3032, + severity: ERROR, + description: "Error element not found in YAML name: %s", + alarmSeverity: MAJOR + } + + BeMissingArtifactInformationError: { + type: DATA_ERROR, + code: ASDC_4010, + severity: ERROR, + description: "Artifact uploaded has missing information. Missing %s", + alarmSeverity: MAJOR + } + + BeArtifactMissingError: { + type: DATA_ERROR, + code: ASDC_4011, + severity: ERROR, + description: "Artifact %s requested is not found", + alarmSeverity: MAJOR + } + + BeArtifactPayloadInvalid: { + type: DATA_ERROR, + code: ASDC_4012, + severity: ERROR, + description: "Payload of artifact uploaded is invalid (invalid MD5 or encryption)", + alarmSeverity: MAJOR + } + + BeUserMissingError: { + type: DATA_ERROR, + code: ASDC_4009, + severity: ERROR, + description: "User %s requested is not found", + alarmSeverity: MAJOR + } + + BeArtifactInformationInvalidError: { + type: DATA_ERROR, + code: ASDC_4013, + severity: ERROR, + description: "Input for artifact metadata is invalid", + alarmSeverity: MAJOR + } + BeFailedAddingCapabilityTypeError: { + type: DATA_ERROR, + code: ASDC_4015, + severity: ERROR, + description: "Failed adding capability type", + alarmSeverity: CRITICAL + } + + BeCapabilityTypeMissingError: { + type: DATA_ERROR, + code: ASDC_4016, + severity: ERROR, + description: "Capability Type %s not found", + alarmSeverity: CRITICAL + } + + BeInterfaceMissingError: { + type: DATA_ERROR, + code: ASDC_4020, + severity: ERROR, + description: "Interface %s required is missing", + alarmSeverity: MAJOR + } + + BeDaoSystemError: { + type: SYSTEM_ERROR, + code: ASDC_4014, + severity: ERROR, + description: "Operation towards database failed", + alarmSeverity: CRITICAL + } + + BeSystemError: { + type: SYSTEM_ERROR, + code: ASDC_4017, + severity: ERROR, + description: "Unexpected error during operation", + alarmSeverity: CRITICAL + } + + BeFailedLockObjectError: { + type: SYSTEM_ERROR, + code: ASDC_4007, + severity: WARN, + description: "Failed to lock object for update", + alarmSeverity: CRITICAL + } + + BeInvalidJsonInput: { + type: SYSTEM_ERROR, + code: ASDC_4018, + severity: ERROR, + description: "Failed to convert json input to object", + alarmSeverity: MAJOR + } + + BeDistributionMissingError: { + type: DATA_ERROR, + code: ASDC_4021, + severity: ERROR, + description: "Distribution %s required is missing", + alarmSeverity: MAJOR + } + + + # last error code: ASDC_4021
\ No newline at end of file @@ -147,6 +147,7 @@ <artifactId>mockito-core</artifactId> <version>${mockito.version}</version> </dependency> + <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> |