Code Review / sdc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
[SDC-29] rebase continue work to align source
[sdc.git] / openecomp-be / lib / openecomp-sdc-translator-lib / openecomp-sdc-translator-core / src / test / resources / mock / services / heattotosca / unifiedComposition / creSubstitutionServiceTemplate / NoOutParamDuplicatePortType / out / SubstitutionServiceTemplate.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
index 3fd981d..ac5e7b1 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
@@ -16,11 +16,139 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB_OAM_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_FSB1_metadata:
       type: list
       required: true
       entry_schema:
         type: json
+    port_FSB2_Internal2_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB_OAM_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal2_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal2_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_mac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal2_mac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal2_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal2_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_FSB1_availability_zone:
       type: list
       required: true
@@ -38,40 +166,72 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_FSB_OAM_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     port_FSB2_Internal2_network:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_FSB2_Internal2_vlan_requirements:
+      type: list
       required: true
-    port_FSB2_Internal1_mac_address:
+      entry_schema:
+        type: json
+    port_FSB2_Internal1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB2_Internal2_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
+    port_FSB1_Internal_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB2_Internal1_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_FSB_OAM_fixed_ips:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_FSB1_name:
+    port_FSB2_Internal2_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_FSB_OAM_network:
+        type: integer
+    port_FSB2_Internal1_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB2_Internal1_network:
+    port_FSB1_Internal_mac_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_FSB2_Internal2_mac_address:
+        type: json
+    port_FSB_OAM_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    compute_FSB1_name:
       type: list
       required: true
       entry_schema:
@@ -80,6 +240,38 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB1_Internal_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB1_Internal_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB1_Internal_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB1_Internal_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB1_Internal_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB1_Internal_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB1_Internal_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB1_Internal_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB1_Internal_network
@@ -96,6 +288,38 @@ topology_template:
     FSB1_FSB_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB_OAM_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB_OAM_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB_OAM_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB_OAM_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB_OAM_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB_OAM_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB_OAM_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB_OAM_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_FSB_OAM_fixed_ips
@@ -112,6 +336,38 @@ topology_template:
     FSB1_FSB2_Internal2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB2_Internal2_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB2_Internal2_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB2_Internal2_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB2_Internal2_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB2_Internal2_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB2_Internal2_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB2_Internal2_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB2_Internal2_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB2_Internal2_network
@@ -152,6 +408,38 @@ topology_template:
     FSB1_FSB2_Internal1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB2_Internal1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB2_Internal1_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB2_Internal1_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB2_Internal1_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB2_Internal1_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB2_Internal1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB2_Internal1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB2_Internal1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB2_Internal1_network
SDC Parent Project Catalog FE and BE