Move Widget attribute data to the mappings JSON 04/79704/1
authormark.j.leonard <mark.j.leonard@gmail.com>
Tue, 5 Mar 2019 12:28:24 +0000 (12:28 +0000)
committermark.j.leonard <mark.j.leonard@gmail.com>
Tue, 5 Mar 2019 12:28:24 +0000 (12:28 +0000)
commitf5dae47e293ae63a7a2f18230b772a699a52566f
treeaa8b90e1ed811ea3168ad8778baf145857993652
parentbe30876e3a3872a7274c944995544836ff31913c
Move Widget attribute data to the mappings JSON

Extend the TOSCA mappings JSON content by adding a set of of Widget
types defining the type name and data-delete flag. In this change the
set of supported types (defined by an enum) remains. However the
intention is to replace this in a future commit.

The hierarchy of annotated Widget types is replaced by this new
configuration, which is accessed from the Widget class.

Refactoring has been kept to a minimum to simplify the code review
process but further improvements can now be made.
Ideally the set of supported Widgets can be extended through
configuration changes only.

Change-Id: I005cfe6976778b14f14c3ad06d8acf3745c8dd8f
Issue-ID: AAI-2212
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
45 files changed:
src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java
src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java
src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java
src/main/java/org/onap/aai/babel/xml/generator/data/GroupConfiguration.java
src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java
src/main/java/org/onap/aai/babel/xml/generator/data/WidgetMapping.java
src/main/java/org/onap/aai/babel/xml/generator/data/WidgetType.java [moved from src/main/java/org/onap/aai/babel/xml/generator/model/ResourceWidget.java with 77% similarity]
src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResourceWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/CRWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/ConfigurationWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/FlavorWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/ImageWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/InstanceGroupWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/L3NetworkWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/LIntfWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/Model.java
src/main/java/org/onap/aai/babel/xml/generator/model/OamNetwork.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java
src/main/java/org/onap/aai/babel/xml/generator/model/Service.java
src/main/java/org/onap/aai/babel/xml/generator/model/ServiceWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/TenantWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/TunnelXconnectWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/VServerWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/VfModuleWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/VfWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/VfcWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/VolumeGroupWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/VolumeWidget.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/model/Widget.java
src/main/java/org/onap/aai/babel/xml/generator/types/Cardinality.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/types/Model.java [deleted file]
src/main/java/org/onap/aai/babel/xml/generator/types/ModelWidget.java [deleted file]
src/main/resources/babel-logging-resources.properties
src/test/java/org/onap/aai/babel/parser/TestArtifactGeneratorToscaParser.java
src/test/java/org/onap/aai/babel/parser/TestToscaParser.java
src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
src/test/java/org/onap/aai/babel/util/ArtifactTestUtils.java
src/test/java/org/onap/aai/babel/util/Resources.java
src/test/java/org/onap/aai/babel/xml/generator/model/TestModel.java
src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java
src/test/java/org/onap/aai/babel/xml/generator/model/TestWidget.java
src/test/resources/empty-tosca-mappings.json [new file with mode: 0644]
src/test/resources/invalid-tosca-mappings.json [new file with mode: 0644]
src/test/resources/tosca-mappings.json