From d60b2a40c15c5952f8a31e2d2aa4be2cf4837fc8 Mon Sep 17 00:00:00 2001
From: siddharth0905 <siddharth.singh4@amdocs.com>
Date: Thu, 12 Apr 2018 19:29:57 +0530
Subject: Subinterface_indicator property issue

It should only be present under port implementation

Change-Id: I8b52905c5e5c888cf384bebf1d23168c7906b004
Issue-ID: SDC-1183
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
---
 .../GlobalSubstitutionTypesServiceTemplate.yaml    | 82 +++++++++-------------
 1 file changed, 35 insertions(+), 47 deletions(-)

(limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml')

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d5acb4ca67..2c72b0aa07 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -22,6 +22,20 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd_oam1_port_0_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -42,48 +56,6 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
-      port_pd_oam1_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_pd_oam1_port_1_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pd_oam1_port_1_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
-      port_pd_oam1_port_1_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      compute_pd_server_user_data_format:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_pd_oam1_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       port_pd_oam1_port_0_vlan_requirements:
         type: list
         required: true
@@ -96,16 +68,18 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd_oam1_port_1_subnetpoolid:
+      port_pd_oam1_port_1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pd_oam1_port_1_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_oam1_port_0_subinterface_indicator:
-        type: list
+      port_pd_oam1_port_1_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_pd_oam1_port_0_order:
         type: integer
         required: true
@@ -120,6 +94,10 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd_oam1_port_0_subnetpoolid:
         type: string
         required: true
@@ -128,6 +106,10 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd_oam1_port_1_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd_oam1_port_1_vlan_requirements:
         type: list
         required: true
@@ -138,6 +120,12 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
+      compute_pd_server_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
-- 
cgit 1.2.3-korg