Merge "Re-enable the tests for bgpvpn scenario wich use floating ips"

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index ed3a0b8..598da39 100755 (executable)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -74,7 +74,7 @@ tiers:
                     over a private network.
                 dependencies:
                     installer: ''
-                    scenario: '^((?!bgpvpn|odl_l3).)*$'
+                    scenario: '^((?!odl_l3).)*$'
                 run:
                     module: 'functest.opnfv_tests.openstack.vping.vping_ssh'
                     class: 'VPingSSH'
@@ -118,7 +118,7 @@ tiers:
                     Rally suite in smoke mode.
                 dependencies:
                     installer: ''
-                    scenario: '^((?!bgpvpn).)*$'
+                    scenario: ''
                 run:
                     module: 'functest.opnfv_tests.openstack.rally.rally'
                     class: 'RallySanity'

diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt b/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt
index 0a4256c..fcdfe22 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt
@@ -1,22 +1,3 @@
--
-    scenarios:
-        - os-odl_l2-bgpvpn-ha
-        - os-odl_l2-bgpvpn-noha
-    installers:
-        - fuel
-        - apex
-    tests:
-        - tempest.api.compute.servers.test_create_server.ServersTestJSON.test_list_servers
-        - tempest.api.compute.servers.test_create_server.ServersTestJSON.test_verify_server_details
-        - tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_list_servers
-        - tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_verify_server_details
-        - tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_reboot_server_hard
-        - tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_create_list_show_update_delete_floating_ip
-        - tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_create_floating_ip_specifying_a_fixed_ip_address
-        - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops
-        - tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops
-        - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern
-        - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPatternV2.test_volume_boot_pattern
 
 -
     scenarios: