diff options
| author |   shiria <shiri.amichai@amdocs.com> | 2018-03-19 15:23:23 +0200 |
|---|---|---|
| committer | shiria <shiri.amichai@amdocs.com> | 2018-03-22 08:21:36 +0200 |
| commit | 43187c8495b88589f3187e110cf8d592a091c37f (patch) | |
| tree | 87ffaf38a95344d76547478f0306b2a923896e44 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern | |
| parent | d049ca05bbfb6fa6b86b2a093b09ffc1fc0a6e37 (diff) | |
Update FlatEntity in TOSCA
Add support of dataType entity flat hierarchy in TOSCA
Fix existing nodeType entity flat hierarchy in TOSCA
Change-Id: I52cd188c595a263c70c2067fd1aac9752f7e24a4
Issue-ID: SDC-1147
Signed-off-by: shiria <shiri.amichai@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern')
2 files changed, 18 insertions, 18 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml index 83341fab08..72198664c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2305,6 +2305,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_1c2_catalog_instance_1c2_t2_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED binding_1c2_catalog_instance_1c2_t2_port: type: tosca.capabilities.network.Bindable valid_source_types: @@ -2312,12 +2318,6 @@ node_types: occurrences: - 0 - UNBOUNDED - network.incoming.bytes.rate_1c2_catalog_instance_1c2_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED network.incoming.packets_1c2_catalog_instance_1c2_t1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2364,6 +2364,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_1c2_catalog_instance_1c2_t1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED binding_1c2_catalog_instance_1c2_t1_port: type: tosca.capabilities.network.Bindable valid_source_types: @@ -2371,12 +2377,6 @@ node_types: occurrences: - 0 - UNBOUNDED - network.incoming.bytes.rate_1c2_catalog_instance_1c2_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.ephemeral.size_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index e761770921..84648e4a89 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -224,12 +224,12 @@ topology_template: disk.write.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.write.bytes.rate - binding_1c2_catalog_instance_1c2_t2_port: - - 1c2_catalog_instance_1c2_t2_port - - binding network.incoming.bytes.rate_1c2_catalog_instance_1c2_t2_port: - 1c2_catalog_instance_1c2_t2_port - network.incoming.bytes.rate + binding_1c2_catalog_instance_1c2_t2_port: + - 1c2_catalog_instance_1c2_t2_port + - binding network.incoming.packets_1c2_catalog_instance_1c2_t1_port: - 1c2_catalog_instance_1c2_t1_port - network.incoming.packets @@ -254,12 +254,12 @@ topology_template: disk.read.requests_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.requests - binding_1c2_catalog_instance_1c2_t1_port: - - 1c2_catalog_instance_1c2_t1_port - - binding network.incoming.bytes.rate_1c2_catalog_instance_1c2_t1_port: - 1c2_catalog_instance_1c2_t1_port - network.incoming.bytes.rate + binding_1c2_catalog_instance_1c2_t1_port: + - 1c2_catalog_instance_1c2_t1_port + - binding disk.ephemeral.size_1c2_catalog_instance: - 1c2_catalog_instance - disk.ephemeral.size |