From 43187c8495b88589f3187e110cf8d592a091c37f Mon Sep 17 00:00:00 2001 From: shiria Date: Mon, 19 Mar 2018 15:23:23 +0200 Subject: 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 --- .../expectedoutputfiles/vmme_vlcServiceTemplate.yaml | 6 +++--- .../expectedoutputfiles/vmme_vlcServiceTemplate.yaml | 8 ++++---- .../expectedoutputfiles/vmme_vlcServiceTemplate.yaml | 6 +++--- .../expectedoutputfiles/vmme_vlcServiceTemplate.yaml | 8 ++++---- .../expectedoutputfiles/vmme_vlcServiceTemplate.yaml | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/expectedoutputfiles/vmme_vlcServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/expectedoutputfiles/vmme_vlcServiceTemplate.yaml index 7d30878434..4d3f799e09 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/expectedoutputfiles/vmme_vlcServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/expectedoutputfiles/vmme_vlcServiceTemplate.yaml @@ -101,12 +101,12 @@ topology_template: forwarder_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 - forwarder - binding_template_VMInt_INT1_VLC_1: - - template_VMInt_INT1_VLC_1 - - binding network.incoming.bytes.rate_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 - network.incoming.bytes.rate + binding_template_VMInt_INT1_VLC_1: + - template_VMInt_INT1_VLC_1 + - binding requirements: dependency_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/expectedoutputfiles/vmme_vlcServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/expectedoutputfiles/vmme_vlcServiceTemplate.yaml index c6562aae37..14caefd105 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/expectedoutputfiles/vmme_vlcServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/expectedoutputfiles/vmme_vlcServiceTemplate.yaml @@ -101,12 +101,12 @@ topology_template: forwarder_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 - forwarder - binding_template_VMInt_INT1_VLC_1: - - template_VMInt_INT1_VLC_1 - - binding network.incoming.bytes.rate_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 - network.incoming.bytes.rate + binding_template_VMInt_INT1_VLC_1: + - template_VMInt_INT1_VLC_1 + - binding requirements: dependency_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 @@ -116,4 +116,4 @@ topology_template: - link binding_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 - - binding \ No newline at end of file + - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/expectedoutputfiles/vmme_vlcServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/expectedoutputfiles/vmme_vlcServiceTemplate.yaml index 80763b5c6a..ed33de57b8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/expectedoutputfiles/vmme_vlcServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/expectedoutputfiles/vmme_vlcServiceTemplate.yaml @@ -116,12 +116,12 @@ topology_template: forwarder_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 - forwarder - binding_template_VMInt_INT1_VLC_1: - - template_VMInt_INT1_VLC_1 - - binding network.incoming.bytes.rate_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 - network.incoming.bytes.rate + binding_template_VMInt_INT1_VLC_1: + - template_VMInt_INT1_VLC_1 + - binding network.outgoing.bytes.rate_template_VMInt_INT2_VLC_1: - template_VMInt_INT2_VLC_1 - network.outgoing.bytes.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/expectedoutputfiles/vmme_vlcServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/expectedoutputfiles/vmme_vlcServiceTemplate.yaml index 1d9f79e7e4..db38c6a2c7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/expectedoutputfiles/vmme_vlcServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/expectedoutputfiles/vmme_vlcServiceTemplate.yaml @@ -102,12 +102,12 @@ topology_template: forwarder_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 - forwarder - binding_template_VMInt_INT1_VLC_1: - - template_VMInt_INT1_VLC_1 - - binding network.incoming.bytes.rate_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 - network.incoming.bytes.rate + binding_template_VMInt_INT1_VLC_1: + - template_VMInt_INT1_VLC_1 + - binding requirements: dependency_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 @@ -117,4 +117,4 @@ topology_template: - link binding_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 - - binding \ No newline at end of file + - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/expectedoutputfiles/vmme_vlcServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/expectedoutputfiles/vmme_vlcServiceTemplate.yaml index 6ed1a548fc..6f99749741 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/expectedoutputfiles/vmme_vlcServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/expectedoutputfiles/vmme_vlcServiceTemplate.yaml @@ -98,12 +98,12 @@ topology_template: forwarder_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 - forwarder - binding_template_VMInt_INT1_VLC_1: - - template_VMInt_INT1_VLC_1 - - binding network.incoming.bytes.rate_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 - network.incoming.bytes.rate + binding_template_VMInt_INT1_VLC_1: + - template_VMInt_INT1_VLC_1 + - binding requirements: dependency_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 @@ -113,4 +113,4 @@ topology_template: - link binding_template_VMInt_INT1_VLC_1: - template_VMInt_INT1_VLC_1 - - binding \ No newline at end of file + - binding -- cgit 1.2.3-korg