diff options
| author |   mark.j.leonard <mark.j.leonard@gmail.com> | 2019-01-28 11:42:54 +0000 |
|---|---|---|
| committer | mark.j.leonard <mark.j.leonard@gmail.com> | 2019-01-30 14:05:06 +0000 |
| commit | 7fcc74469c941c1834cd02b54ff5ca88a53bf83b (patch) | |
| tree | 3d9c130fb098cb996d2c8db4a8b9f57501c393b6 /src/test/resources | |
| parent | 6833fb0a9a3f8c26688ad5c323eb266827b707c2 (diff) | |
Load type mappings from a group configuration file
Change the filter-types.properties file: re-implement to use JSON
content. Remove the System Property that defines the location of the
file and add this to the Spring application properties.
Initialise the type-to-model mappings using the key=value pairs from
this JSON content.
Refactor existing Junit tests to remove duplicated resource loading
code.
Change-Id: Idb2e962fe5cae39b70cc8cf16053d0a253f4fac0
Issue-ID: AAI-2121
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Diffstat (limited to 'src/test/resources')
| -rw-r--r-- | src/test/resources/filter-types.properties | 1 | ||||
| -rw-r--r-- | src/test/resources/tosca-mappings.json | 21 |
2 files changed, 21 insertions, 1 deletions
diff --git a/src/test/resources/filter-types.properties b/src/test/resources/filter-types.properties deleted file mode 100644 index 8577841..0000000 --- a/src/test/resources/filter-types.properties +++ /dev/null @@ -1 +0,0 @@ -AAI.instance-group-types=org.openecomp.groups.NetworkCollection,org.openecomp.groups.VfcInstanceGroup,org.openecomp.groups.ResourceInstanceGroup diff --git a/src/test/resources/tosca-mappings.json b/src/test/resources/tosca-mappings.json new file mode 100644 index 0000000..9c3d0b4 --- /dev/null +++ b/src/test/resources/tosca-mappings.json @@ -0,0 +1,21 @@ +{ + "instanceGroupTypes": [ + "org.openecomp.groups.NetworkCollection", + "org.openecomp.groups.VfcInstanceGroup", + "org.openecomp.groups.ResourceInstanceGroup" + ], + "toscaToWidgetMappings": { + "org.openecomp.resource.vf.allottedResource": "AllotedResource", + "org.openecomp.resource.vfc.AllottedResource": "ProvidingService", + "org.openecomp.resource.vfc": "VServerWidget", + "org.openecomp.resource.cp": "LIntfWidget", + "org.openecomp.cp": "LIntfWidget", + "org.openecomp.resource.vl": "L3Network", + "org.openecomp.resource.vf": "VirtualFunction", + "org.openecomp.groups.vfmodule": "VfModule", + "org.openecomp.groups.VfModule": "VfModule", + "org.openecomp.resource.vfc.nodes.heat.cinder": "VolumeWidget", + "org.openecomp.nodes.PortMirroringConfiguration": "Configuration", + "org.openecomp.resource.cr.Kk1806Cr1": "CR" + } +} |