Validation of VSP fails with error null

Change-Id: I98bbff6b567932d06d4764ac24bc25984741834c
Issue-ID: SDC-1093
Signed-off-by: avigaffa <avi.gaffa@amdocs.com>

5 files changed, 46 insertions, 22 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 4176447d09..96f6560305 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -91,20 +91,20 @@ node_types:
         required: true

         status: SUPPORTED

     requirements:

-    - dependency_vdbe_untr_vmi_subport:

+    - dependency_vdbe_0_subint_untr_vmi_0:

         capability: tosca.capabilities.Node

         node: tosca.nodes.Root

         relationship: tosca.relationships.DependsOn

         occurrences:

         - 0

         - UNBOUNDED

-    - link_vdbe_untr_vmi_subport:

+    - link_vdbe_0_subint_untr_vmi_0:

         capability: tosca.capabilities.network.Linkable

         relationship: tosca.relationships.network.LinksTo

         occurrences:

         - 1

         - 1

-    - binding_vdbe_untr_vmi_subport:

+    - binding_vdbe_0_subint_untr_vmi_0:

         capability: tosca.capabilities.network.Bindable

         node: org.openecomp.resource.cp.nodes.network.Port

         relationship: tosca.relationships.network.BindsTo

@@ -112,8 +112,8 @@ node_types:
         - 1

         - 1

     capabilities:

-      feature_vdbe_untr_vmi_subport:

+      feature_vdbe_0_subint_untr_vmi_0:

         type: tosca.capabilities.Node

         occurrences:

         - 1

-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml
index d6f832f595..8f9138efec 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml
@@ -502,11 +502,11 @@ topology_template:
         aap_untrusted_ip_prefix_len:

           get_input: vdbe_aap_untrusted_ip_prefix_len

       requirements:

-      - link_vdbe_untr_vmi_subport:

+      - link_vdbe_0_subint_untr_vmi_0:

           capability: tosca.capabilities.network.Linkable

           node: control_int_net

           relationship: tosca.relationships.network.LinksTo

-      - binding_vdbe_untr_vmi_subport:

+      - binding_vdbe_0_subint_untr_vmi_0:

           capability: tosca.capabilities.network.Bindable

           node: vdbe_untr_1_port

           relationship: tosca.relationships.network.BindsTo

@@ -550,4 +550,4 @@ topology_template:
       value:

         get_attribute:

         - vdbe_untr_1_subports

-        - name
\ No newline at end of file
+        - name

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml
index 2eb726c199..cb088cf958 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -91,7 +91,7 @@ topology_template:
       type: string

       description: ip prefix length for the primary vDBE VM on the VAN untrusted network

   node_templates:

-    vdbe_untr_vmi_subport:

+    vdbe_0_subint_untr_vmi_0:

       type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface

       properties:

         virtual_machine_interface_refs:

@@ -152,20 +152,20 @@ topology_template:
         heat_file: ../Artifacts/nested.yml

         description: cmaui server template for vMMSC

       members:

-      - vdbe_untr_vmi_subport

+      - vdbe_0_subint_untr_vmi_0

   substitution_mappings:

     node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested

     capabilities:

-      feature_vdbe_untr_vmi_subport:

-      - vdbe_untr_vmi_subport

+      feature_vdbe_0_subint_untr_vmi_0:

+      - vdbe_0_subint_untr_vmi_0

       - feature

     requirements:

-      dependency_vdbe_untr_vmi_subport:

-      - vdbe_untr_vmi_subport

+      dependency_vdbe_0_subint_untr_vmi_0:

+      - vdbe_0_subint_untr_vmi_0

       - dependency

-      link_vdbe_untr_vmi_subport:

-      - vdbe_untr_vmi_subport

-      - link

-      binding_vdbe_untr_vmi_subport:

-      - vdbe_untr_vmi_subport

-      - binding
\ No newline at end of file
+      binding_vdbe_0_subint_untr_vmi_0:

+      - vdbe_0_subint_untr_vmi_0

+      - binding

+      link_vdbe_0_subint_untr_vmi_0:

+      - vdbe_0_subint_untr_vmi_0

+      - link
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/nested.yml
index eeaf3b68c3..f175f9a475 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/nested.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/nested.yml
@@ -52,7 +52,7 @@ parameters:
     description: "IPv6 address associated with subinterfaces"

     type: string

 resources:

-  vdbe_untr_vmi_subport:

+  vdbe_0_subint_untr_vmi_0:

     type: OS::ContrailV2::VirtualMachineInterface

     properties:

       name:

@@ -111,4 +111,4 @@ resources:
       virtual_machine_interface_refs:

           [{get_param: parent_interface}]

       virtual_network_refs:

-          [{get_param: vdbe_subport_network}]
\ No newline at end of file
+          [{get_param: vdbe_subport_network}]

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/inputfiles/main.yml
index 994b081559..36f15d42ec 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/inputfiles/main.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/inputfiles/main.yml
@@ -118,6 +118,9 @@ resources:
         - port: {get_resource: vdbe_0_oam_port_1}
         - port: {get_resource: vdbe_oam_port}
         - port: {get_resource: vdbe_oam_port_2}
+        - port: {get_resource: vdbe_0_int_oam_port_1}
+        - port: {get_resource: vdbe_int_oam_port}
+        - port: {get_resource: vdbe_int_oam_port_2}
         - port: {get_resource: vdbe_0_oam_neutronNotFollowingHeatGuidelines_2}
         - port: {get_resource: vdbe_0_untr_vmiNotFollowingHeatGuidelines_1}
   vdbe_untr_1_subports:
@@ -298,6 +301,27 @@ resources:
       fixed_ips: [{"ip_address": 1.2.3.4}]
       replacement_policy: AUTO
 
+  vdbe_0_int_oam_port_1:
+    type: OS::Neutron::Port
+    properties:
+      network: Test
+      fixed_ips: [{"ip_address": 1.2.3.4}]
+      replacement_policy: AUTO
+
+  vdbe_int_oam_port:
+    type: OS::Neutron::Port
+    properties:
+      network: Test
+      fixed_ips: [{"ip_address": 1.2.3.4}]
+      replacement_policy: AUTO
+
+  vdbe_int_oam_port_2:
+    type: OS::Neutron::Port
+    properties:
+      network: Test
+      fixed_ips: [{"ip_address": 1.2.3.4}]
+      replacement_policy: AUTO
+
   vdbe_0_untr_vmiNotFollowingHeatGuidelines_1:
     properties:
       name: