Code Review / sdc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
[SDC] Onboarding 1710 rebase.
[sdc.git] / openecomp-be / lib / openecomp-sdc-translator-lib / openecomp-sdc-translator-core / src / test / resources / mock / services / heattotosca / fulltest / singleSubstitution / generalVf / out / Nested_FSB1ServiceTemplate.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml
index a9acfcc..d9a7752 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml
@@ -12,98 +12,30 @@ node_types:
 topology_template:
   inputs:
     port_FSB1_Internal1_mac_address:
-      type: string
-      required: true
-    port_FSB_OAM_network_role_tag:
-      type: string
-      required: true
-    port_FSB1_Internal2_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_FSB1_Internal1_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
-      required: true
-    port_FSB_OAM_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: json
-    port_FSB1_Internal2_mac_address:
-      type: string
-      required: true
-    port_FSB_OAM_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_FSB1_Internal1_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB1_Internal2_subnetpoolid:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_FSB1_Internal1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_FSB_OAM_network_role:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_FSB1_Internal1_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_FSB1_Internal1_order:
-      type: list
-      required: true
-      entry_schema:
-        type: integer
-    port_FSB_OAM_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_FSB1_Internal2_network_role:
+    port_FSB_OAM_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB1_Internal1_network_role_tag:
+    port_FSB1_Internal2_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB_OAM_subnetpoolid:
+    port_FSB_OAM_mac_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_FSB_OAM_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
+        type: org.openecomp.datatypes.network.MacRequirements
     compute_FSB1_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB1_Internal1_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: json
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -111,102 +43,79 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_FSB_OAM_order:
+    port_FSB1_Internal1_network:
       type: list
       required: true
       entry_schema:
-        type: integer
-    port_FSB1_Internal1_network_role:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB1_Internal2_mac_address:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB1_Internal2_network_role_tag:
+    port_FSB_OAM_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
     port_FSB1_Internal2_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_FSB1_Internal2_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_FSB1_Internal2_order:
+        type: org.openecomp.datatypes.network.MacRequirements
+    port_FSB1_Internal2_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: integer
+        type: json
     port_FSB_OAM_fixed_ips:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_FSB1_Internal1_exCP_naming:
       type: list
       required: true
       entry_schema:
         type: json
-    port_FSB_OAM_exCP_naming:
+    compute_FSB1_name:
       type: list
       required: true
       entry_schema:
-        type: json
-    compute_FSB1_name:
+        type: string
+    port_FSB1_Internal1_mac_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_FSB1_Internal2_exCP_naming:
+        type: org.openecomp.datatypes.network.MacRequirements
+    port_FSB1_Internal1_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_FSB1_Internal2_vlan_requirements:
+    port_FSB_OAM_network:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
   node_templates:
     FSB1_FSB1_Internal2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input:
-          - port_FSB1_Internal2_exCP_naming
-          - index_value
-        vlan_requirements:
-          get_input:
-          - port_FSB1_Internal2_vlan_requirements
-          - index_value
         ip_requirements:
-          get_input: port_FSB1_Internal2_ip_requirements
-        network_role_tag:
           get_input:
-          - port_FSB1_Internal2_network_role_tag
+          - port_FSB1_Internal2_ip_requirements
           - index_value
         mac_requirements:
-          get_input: port_FSB1_Internal2_mac_requirements
-        order:
-          get_input:
-          - port_FSB1_Internal2_order
-          - index_value
-        network_role:
-          get_input:
-          - port_FSB1_Internal2_network_role
-          - index_value
-        subnetpoolid:
           get_input:
-          - port_FSB1_Internal2_subnetpoolid
+          - port_FSB1_Internal2_mac_requirements
           - index_value
         network:
           get_input:
           - port_FSB1_Internal2_network
           - index_value
         mac_address:
-          get_input: port_FSB1_Internal2_mac_address
+          get_input:
+          - port_FSB1_Internal2_mac_address
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -215,40 +124,22 @@ topology_template:
     FSB1_FSB1_Internal1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input:
-          - port_FSB1_Internal1_exCP_naming
-          - index_value
-        vlan_requirements:
-          get_input:
-          - port_FSB1_Internal1_vlan_requirements
-          - index_value
         ip_requirements:
-          get_input: port_FSB1_Internal1_ip_requirements
-        network_role_tag:
           get_input:
-          - port_FSB1_Internal1_network_role_tag
+          - port_FSB1_Internal1_ip_requirements
           - index_value
         mac_requirements:
-          get_input: port_FSB1_Internal1_mac_requirements
-        order:
           get_input:
-          - port_FSB1_Internal1_order
-          - index_value
-        network_role:
-          get_input:
-          - port_FSB1_Internal1_network_role
-          - index_value
-        subnetpoolid:
-          get_input:
-          - port_FSB1_Internal1_subnetpoolid
+          - port_FSB1_Internal1_mac_requirements
           - index_value
         network:
           get_input:
           - port_FSB1_Internal1_network
           - index_value
         mac_address:
-          get_input: port_FSB1_Internal1_mac_address
+          get_input:
+          - port_FSB1_Internal1_mac_address
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -257,34 +148,22 @@ 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:
+        ip_requirements:
           get_input:
-          - port_FSB_OAM_vlan_requirements
+          - port_FSB_OAM_ip_requirements
           - index_value
-        ip_requirements:
-          get_input: port_FSB_OAM_ip_requirements
         network_role_tag:
-          get_input: port_FSB_OAM_network_role_tag
-        mac_requirements:
-          get_input: port_FSB_OAM_mac_requirements
-        order:
           get_input:
-          - port_FSB_OAM_order
+          - port_FSB_OAM_network_role_tag
           - index_value
-        network_role:
+        mac_requirements:
           get_input:
-          - port_FSB_OAM_network_role
+          - port_FSB_OAM_mac_requirements
           - index_value
-        subnetpoolid:
+        fixed_ips:
           get_input:
-          - port_FSB_OAM_subnetpoolid
+          - port_FSB_OAM_fixed_ips
           - index_value
-        fixed_ips:
-          get_input: port_FSB_OAM_fixed_ips
         network:
           get_input:
           - port_FSB_OAM_network
@@ -556,4 +435,4 @@ topology_template:
       - dependency
       link_FSB1_FSB_OAM:
       - FSB1_FSB_OAM
-      - link
+      - link
\ No newline at end of file
SDC Parent Project Catalog FE and BE