diff options
| author |   andre.schmid <andre.schmid@est.tech> | 2020-03-04 16:28:05 +0000 |
|---|---|---|
| committer |   Julien Bertozzi <julien.bertozzi@intl.att.com> | 2020-07-29 11:39:50 +0000 |
| commit | 5e8464585f07210ad4b20ddfee2c23b1cf2d8b2a (patch) | |
| tree | d0e9b828f0b374f504115443814537deb35d49c1 /catalog-model/src/test/resources | |
| parent | 18a43d537bc91d752377159fb0d5b3e9f5bdd6e5 (diff) | |
Config. allowed instances in component composition
During the creation of Resource and Services components,
the allowed types to add in its composition are hard-coded.
This change allows those types to be configurable using the
configuration.yaml backend file.
Change-Id: If48849b57fe5124468db3d55f2f06391348935fb
Issue-ID: SDC-3177
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Diffstat (limited to 'catalog-model/src/test/resources')
| -rw-r--r-- | catalog-model/src/test/resources/application-context-test.xml | 4 | ||||
| -rw-r--r-- | catalog-model/src/test/resources/config/configuration.yaml | 61 |
2 files changed, 63 insertions, 2 deletions
diff --git a/catalog-model/src/test/resources/application-context-test.xml b/catalog-model/src/test/resources/application-context-test.xml index 475760f51a..dc9d5ba7bf 100644 --- a/catalog-model/src/test/resources/application-context-test.xml +++ b/catalog-model/src/test/resources/application-context-test.xml @@ -12,8 +12,8 @@ org.openecomp.sdc.be.model.cache, org.openecomp.sdc.be.dao.janusgraph, org.openecomp.sdc.be.dao.cassandra, - org.openecomp.sdc.be.model.jsonjanusgraph.utils - "> + org.openecomp.sdc.be.model.jsonjanusgraph.utils, + org.openecomp.sdc.be.model.jsonjanusgraph.config"> </context:component-scan> diff --git a/catalog-model/src/test/resources/config/configuration.yaml b/catalog-model/src/test/resources/config/configuration.yaml index 4e8bc0a7dc..504c020dca 100644 --- a/catalog-model/src/test/resources/config/configuration.yaml +++ b/catalog-model/src/test/resources/config/configuration.yaml @@ -97,9 +97,70 @@ resourceTypes: &allResourceTypes - CP - VL - VF + - CR - VFCMT - Abstract - CVFC + - Configuration + - ServiceProxy + - PNF + +componentAllowedInstanceTypes: + Resource: + VF: + - VFC + - VF + - CR + - CP + - PNF + - CVFC + - VL + - Configuration + - ServiceProxy + - Abstract + CVFC: + - VFC + - VF + - CR + - CP + - PNF + - CVFC + - VL + - ServiceProxy + - Abstract + PNF: + - VF + - CR + - CP + - PNF + - CVFC + - VL + - Configuration + - ServiceProxy + - Abstract + CR: + - VF + - CR + - CP + - PNF + - CVFC + - VL + - Configuration + - ServiceProxy + - Abstract + VL: + - VL + Service: + "*": + - VF + - CR + - CP + - PNF + - CVFC + - VL + - Configuration + - ServiceProxy + - Abstract # validForResourceTypes usage # validForResourceTypes: |