diff options
author | 2019-03-05 12:28:24 +0000 | |
---|---|---|
committer | 2019-03-05 12:28:24 +0000 | |
commit | f5dae47e293ae63a7a2f18230b772a699a52566f (patch) | |
tree | aa8b90e1ed811ea3168ad8778baf145857993652 /src/test/resources | |
parent | be30876e3a3872a7274c944995544836ff31913c (diff) |
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>
Diffstat (limited to 'src/test/resources')
-rw-r--r-- | src/test/resources/empty-tosca-mappings.json | 0 | ||||
-rw-r--r-- | src/test/resources/invalid-tosca-mappings.json | 1 | ||||
-rw-r--r-- | src/test/resources/tosca-mappings.json | 92 |
3 files changed, 93 insertions, 0 deletions
diff --git a/src/test/resources/empty-tosca-mappings.json b/src/test/resources/empty-tosca-mappings.json new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/test/resources/empty-tosca-mappings.json diff --git a/src/test/resources/invalid-tosca-mappings.json b/src/test/resources/invalid-tosca-mappings.json new file mode 100644 index 0000000..bbd27bd --- /dev/null +++ b/src/test/resources/invalid-tosca-mappings.json @@ -0,0 +1 @@ +test file that does not contain valid JSON content
\ No newline at end of file diff --git a/src/test/resources/tosca-mappings.json b/src/test/resources/tosca-mappings.json index 0d306ea..c67b3e2 100644 --- a/src/test/resources/tosca-mappings.json +++ b/src/test/resources/tosca-mappings.json @@ -4,6 +4,98 @@ "org.openecomp.groups.VfcInstanceGroup", "org.openecomp.groups.ResourceInstanceGroup" ], + "widgetTypes": [ + { + "type": "SERVICE", + "name": "service-instance", + "deleteFlag": true + }, + { + "type": "VF", + "name": "generic-vnf", + "deleteFlag": false + }, + { + "type": "VFC", + "name": "vnfc", + "deleteFlag": true + }, + { + "type": "VSERVER", + "name": "vserver", + "deleteFlag": true + }, + { + "type": "VOLUME", + "name": "volume", + "deleteFlag": true + }, + { + "type": "FLAVOR", + "name": "flavor", + "deleteFlag": false + }, + { + "type": "TENANT", + "name": "tenant", + "deleteFlag": false + }, + { + "type": "VOLUME_GROUP", + "name": "volume-group", + "deleteFlag": true + }, + { + "type": "LINT", + "name": "l-interface", + "deleteFlag": true + }, + { + "type": "L3_NET", + "name": "l3-network", + "deleteFlag": true + }, + { + "type": "VFMODULE", + "name": "vf-module", + "deleteFlag": true + }, + { + "type": "IMAGE", + "name": "image", + "deleteFlag": false + }, + { + "type": "OAM_NETWORK", + "name": "oam-network", + "deleteFlag": true + }, + { + "type": "ALLOTTED_RESOURCE", + "name": "allotted-resource", + "deleteFlag": true + }, + { + "type": "TUNNEL_XCONNECT", + "name": "tunnel-xconnect", + "deleteFlag": true + }, + { + "type": "CONFIGURATION", + "name": "configuration", + "deleteFlag": true + }, + { + "type": "CR", + "name": "cr", + "deleteFlag": true + }, + { + "type": "INSTANCE_GROUP", + "name": "instance-group", + "deleteFlag": true + } + ], "widgetMappings": [ { "prefix": "org.openecomp.resource.vfc", |