diff options
| author |   andre.schmid <andre.schmid@est.tech> | 2021-08-31 10:04:26 +0100 |
|---|---|---|
| committer | andre.schmid <andre.schmid@est.tech> | 2021-08-31 10:20:06 +0100 |
| commit | 38c6faa738abe6e0acdd24df2364d725d36fca40 (patch) | |
| tree | 3412c0ee222d60bbc98a997390dbae19d55e3fc9 /catalog-model/src/test/resources | |
| parent | a1cdcda28701f603cf95f591ba447bd723273622 (diff) | |
Fix additional types import file generation
The additional_type_definitions.yaml is missing types entries and
header.
Also, the solution is not considering the types entries, i.e.
'data_types:', 'policy_types:', etc., when replacing types and
generating the new file, which renders the solution broken.
This change aims to fix the related problems.
Change-Id: I412683b49966c09dd067ecbf8a1d778155b23fa6
Issue-ID: SDC-3703
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Diffstat (limited to 'catalog-model/src/test/resources')
8 files changed, 83 insertions, 0 deletions
diff --git a/catalog-model/src/test/resources/modelOperation/expected-additional_types-1.yaml b/catalog-model/src/test/resources/modelOperation/expected-additional_types-1.yaml new file mode 100644 index 0000000000..c9e6741993 --- /dev/null +++ b/catalog-model/src/test/resources/modelOperation/expected-additional_types-1.yaml @@ -0,0 +1,13 @@ +tosca_definitions_version: tosca_simple_yaml_1_3 +description: Auto-generated file that contains package custom types or types added + after system installation. +data_types: + tosca.datatypes.nfv.ServiceAvailability: + derived_from: tosca.datatypes.Root + description: additional type + tosca.datatypes.nfv.L2AddressData: + derived_from: tosca.datatypes.Root + description: additional type + tosca.datatypes.nfv.Unknown: + derived_from: tosca.datatypes.Root + description: additional type diff --git a/catalog-model/src/test/resources/modelOperation/expected-additional_types-2.yaml b/catalog-model/src/test/resources/modelOperation/expected-additional_types-2.yaml new file mode 100644 index 0000000000..2d2c54206e --- /dev/null +++ b/catalog-model/src/test/resources/modelOperation/expected-additional_types-2.yaml @@ -0,0 +1,19 @@ +tosca_definitions_version: tosca_simple_yaml_1_3 +description: Auto-generated file that contains package custom types or types added + after system installation. +data_types: + tosca.datatypes.nfv.PreviouslyExistingType1: + derived_from: tosca.datatypes.Root + description: additional type + tosca.datatypes.nfv.PreviouslyExistingType2: + derived_from: tosca.datatypes.Root + description: additional type + tosca.datatypes.nfv.ServiceAvailability: + derived_from: tosca.datatypes.Root + description: additional type + tosca.datatypes.nfv.L2AddressData: + derived_from: tosca.datatypes.Root + description: additional type + tosca.datatypes.nfv.Unknown: + derived_from: tosca.datatypes.Root + description: additional type diff --git a/catalog-model/src/test/resources/modelOperation/expected-import-1.yaml b/catalog-model/src/test/resources/modelOperation/expected-import-1.yaml new file mode 100644 index 0000000000..cecb1b49cd --- /dev/null +++ b/catalog-model/src/test/resources/modelOperation/expected-import-1.yaml @@ -0,0 +1,5 @@ +tosca_definitions_version: tosca_simple_yaml_1_2 +description: ETSI NFV SOL 001 nsd types definitions version 2.5.1 +data_types: + tosca.datatypes.nfv.AddressData: + derived_from: tosca.datatypes.Root diff --git a/catalog-model/src/test/resources/modelOperation/expected-import-2.yaml b/catalog-model/src/test/resources/modelOperation/expected-import-2.yaml new file mode 100644 index 0000000000..cdee947652 --- /dev/null +++ b/catalog-model/src/test/resources/modelOperation/expected-import-2.yaml @@ -0,0 +1,7 @@ +tosca_definitions_version: tosca_simple_yaml_1_2 +description: ETSI NFV SOL 001 vnfd types definitions version 2.5.1 +data_types: + tosca.datatypes.nfv.L3AddressData: + derived_from: tosca.datatypes.Root + tosca.datatypes.nfv.AddressData: + derived_from: tosca.datatypes.Root diff --git a/catalog-model/src/test/resources/modelOperation/input-data_types.yaml b/catalog-model/src/test/resources/modelOperation/input-data_types.yaml new file mode 100644 index 0000000000..77b7d977b0 --- /dev/null +++ b/catalog-model/src/test/resources/modelOperation/input-data_types.yaml @@ -0,0 +1,9 @@ +tosca.datatypes.nfv.ServiceAvailability: + derived_from: tosca.datatypes.Root + description: additional type +tosca.datatypes.nfv.L2AddressData: + derived_from: tosca.datatypes.Root + description: additional type +tosca.datatypes.nfv.Unknown: + derived_from: tosca.datatypes.Root + description: additional type
\ No newline at end of file diff --git a/catalog-model/src/test/resources/modelOperation/original-additional_types-1.yaml b/catalog-model/src/test/resources/modelOperation/original-additional_types-1.yaml new file mode 100644 index 0000000000..c2cc7f13b4 --- /dev/null +++ b/catalog-model/src/test/resources/modelOperation/original-additional_types-1.yaml @@ -0,0 +1,10 @@ +tosca_definitions_version: tosca_simple_yaml_1_3 +description: Auto-generated file that contains package custom types or types added + after system installation. +data_types: + tosca.datatypes.nfv.PreviouslyExistingType1: + derived_from: tosca.datatypes.Root + description: additional type + tosca.datatypes.nfv.PreviouslyExistingType2: + derived_from: tosca.datatypes.Root + description: additional type diff --git a/catalog-model/src/test/resources/modelOperation/original-import-1.yaml b/catalog-model/src/test/resources/modelOperation/original-import-1.yaml new file mode 100644 index 0000000000..d54e61e6ce --- /dev/null +++ b/catalog-model/src/test/resources/modelOperation/original-import-1.yaml @@ -0,0 +1,9 @@ +tosca_definitions_version: tosca_simple_yaml_1_2 +description: ETSI NFV SOL 001 nsd types definitions version 2.5.1 + +data_types: + tosca.datatypes.nfv.ServiceAvailability: + derived_from: tosca.datatypes.Root + description: original type that will be replaced + tosca.datatypes.nfv.AddressData: + derived_from: tosca.datatypes.Root diff --git a/catalog-model/src/test/resources/modelOperation/original-import-2.yaml b/catalog-model/src/test/resources/modelOperation/original-import-2.yaml new file mode 100644 index 0000000000..8ba6b8bfb3 --- /dev/null +++ b/catalog-model/src/test/resources/modelOperation/original-import-2.yaml @@ -0,0 +1,11 @@ +tosca_definitions_version: tosca_simple_yaml_1_2 +description: ETSI NFV SOL 001 vnfd types definitions version 2.5.1 + +data_types: + tosca.datatypes.nfv.L2AddressData: + derived_from: tosca.datatypes.Root + description: original type that will be replaced + tosca.datatypes.nfv.L3AddressData: + derived_from: tosca.datatypes.Root + tosca.datatypes.nfv.AddressData: + derived_from: tosca.datatypes.Root
\ No newline at end of file |