X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_allowed_address_pairs_include_vm_type_network_role.py;h=6b3c63cea93731b83d3cbbef265aa072580637a9;hb=5ff7ed0cf3ac9e8110579ee4f0f711e30fb2511e;hp=4654333757522b7a703e85e7d79ecaa4d80fa8ce;hpb=0e1794537b96149737abf4e6373665eee3579ffe;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_allowed_address_pairs_include_vm_type_network_role.py b/ice_validator/tests/test_allowed_address_pairs_include_vm_type_network_role.py
index 4654333..6b3c63c 100644
--- a/ice_validator/tests/test_allowed_address_pairs_include_vm_type_network_role.py
+++ b/ice_validator/tests/test_allowed_address_pairs_include_vm_type_network_role.py
@@ -2,7 +2,7 @@
 # ============LICENSE_START====================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2019 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
@@ -39,7 +39,11 @@
 import re
 
 from .helpers import validates
-from .utils.ports import check_ip_format
+from .utils.ports import check_parameter_format
+from tests.structures import (
+    NeutronPortProcessor,
+    ContrailV2VirtualMachineInterfaceProcessor,
+)
 
 VERSION = "1.0.0"
 
@@ -78,15 +82,55 @@ aap_regx_dict = {
 }
 
 
-@validates("R-41492", "R-35735", "R-159016")
+@validates("R-41492", "R-35735", "R-159016", "R-91810", "R-41956", "R-41493")
 def test_external_aap_format(yaml_file):
-    check_ip_format(
-        yaml_file, aap_regx_dict, "external", "allowed_address_pairs", "ip_address"
+    check_parameter_format(
+        yaml_file,
+        aap_regx_dict,
+        "external",
+        NeutronPortProcessor,
+        "allowed_address_pairs",
+        "ip_address",
+        exemptions_allowed=True,
     )
 
 
 @validates("R-717227", "R-805572")
 def test_internal_aap_format(yaml_file):
-    check_ip_format(
-        yaml_file, aap_regx_dict, "internal", "allowed_address_pairs", "ip_address"
+    check_parameter_format(
+        yaml_file,
+        aap_regx_dict,
+        "internal",
+        NeutronPortProcessor,
+        "allowed_address_pairs",
+        "ip_address",
+    )
+
+
+@validates("R-100280", "R-100290", "R-100310", "R-100330", "R-100350", "R-41493")
+def test_external_aap_format_contrail(yaml_file):
+    check_parameter_format(
+        yaml_file,
+        aap_regx_dict,
+        "external",
+        ContrailV2VirtualMachineInterfaceProcessor,
+        "virtual_machine_interface_allowed_address_pairs",
+        "virtual_machine_interface_allowed_address_pairs_allowed_address_pair",
+        "virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip",
+        "virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix",
+        exemptions_allowed=True,
+    )
+
+
+@validates("R-100360", "R-100370")
+def test_contrail_internal_vmi_aap_parameter(yaml_file):
+    check_parameter_format(
+        yaml_file,
+        aap_regx_dict,
+        "internal",
+        ContrailV2VirtualMachineInterfaceProcessor,
+        "virtual_machine_interface_allowed_address_pairs",
+        "virtual_machine_interface_allowed_address_pairs_allowed_address_pair",
+        "virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip",
+        "virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix",
     )