diff options
author | vasraz <vasyl.razinkov@est.tech> | 2020-07-06 17:08:08 +0100 |
---|---|---|
committer | Christophe Closset <christophe.closset@intl.att.com> | 2020-09-02 06:59:38 +0000 |
commit | 1ec3dde2067e0181faa8e5098219c93126638aef (patch) | |
tree | f09dced5babfa16da8653c5bb464172f5d4ac9c3 /test-apis-ci/src/main/java/org | |
parent | 930ed2515529bd7ff054b083816587b6d46f56b5 (diff) |
Support for defining attributes on a node_type
This commit aims to add support of attributes on node_type.
It is first of several commits to cover all support.
It includes:
- new classes:
AttributeDefinition
ComponentInstanceAttribute
IAttributeInputCommon
IAttributeInputCommon
AttributeDataDefinition
MapAttributesDataDefinition
- support of 'Import of VFC with attributes'
- TCs fix for changed code
Next commit(s) will cover:
- support of "Onboarding packages with attributes"
- support of "Download TOSCA Artifacts - Tosca Model"
- support of "Import onboarded VSP"
Change-Id: I0167abc58e8aeef3d631833cc323e466f8e71492
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3200
Diffstat (limited to 'test-apis-ci/src/main/java/org')
-rw-r--r-- | test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java index 0033e37932..89d629d36c 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java @@ -27,7 +27,7 @@ import org.junit.rules.TestName; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; import org.openecomp.sdc.be.model.ComponentInstance; -import org.openecomp.sdc.be.model.ComponentInstanceProperty; +import org.openecomp.sdc.be.model.ComponentInstanceAttribute; import org.openecomp.sdc.be.model.Resource; import org.openecomp.sdc.ci.tests.api.ComponentBaseTest; import org.openecomp.sdc.ci.tests.api.Urls; @@ -68,15 +68,15 @@ public class ComponentInstanceAttributeTest extends ComponentBaseTest { .addComponentInstanceToComponentContainer(vfcWithAttributes, vf).left().value(); // util method to get the specific attribute from the vf - Function<Resource, ComponentInstanceProperty> attributeGetter = resourceVf -> resourceVf + Function<Resource, ComponentInstanceAttribute> attributeGetter = resourceVf -> resourceVf .getComponentInstancesAttributes().values().iterator().next().stream() .filter(att -> att.getName().equals("private_address")).findAny().get(); // update attribute on vfc instance final Resource vfWithInsatncePreUpdate = swallowException( () -> (Resource) AtomicOperationUtils.getComponentObject(vf, UserRoleEnum.DESIGNER)); - ComponentInstanceProperty attributeOfRI = attributeGetter.apply(vfWithInsatncePreUpdate); + ComponentInstanceAttribute attributeOfRI = attributeGetter.apply(vfWithInsatncePreUpdate); final String newAttValue = "NewValue"; - attributeOfRI.setValue(newAttValue); + attributeOfRI.setValueUniqueUid(newAttValue); String body = gson.toJson(attributeOfRI); String url = String.format(Urls.UPDATE_ATTRIBUTE_ON_RESOURCE_INSTANCE, config.getCatalogBeHost(), config.getCatalogBePort(), ComponentTypeEnum.findParamByType(ComponentTypeEnum.RESOURCE), @@ -86,8 +86,8 @@ public class ComponentInstanceAttributeTest extends ComponentBaseTest { // Retrieve updated vf and verify attribute was updated final Resource vfWithInsatncePostUpdate = swallowException( () -> (Resource) AtomicOperationUtils.getComponentObject(vf, UserRoleEnum.DESIGNER)); - ComponentInstanceProperty updatedAttribute = attributeGetter.apply(vfWithInsatncePostUpdate); - assertEquals(updatedAttribute.getValue(), newAttValue); + ComponentInstanceAttribute updatedAttribute = attributeGetter.apply(vfWithInsatncePostUpdate); + assertEquals(updatedAttribute.getValueUniqueUid(), newAttValue); } } |