From 4621de12a343eaa34771c3bde35a4c0bda3cd43c Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 27 Dec 2019 18:54:35 +0100
Subject: Set port_security: true in tempest_conf.yaml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It allows running
test_boot_into_disabled_port_security_network_without_secgroup.

It also sets a few default values.

Change-Id: I851c5d13705e0419a7e664e05d32eec0efb417c6
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 9e128dcdbf26ace6790e9c0307b7e6e37763f43b)
---
 docker/smoke-cntt/tempest_conf.yaml                                   | 4 ++++
 docker/smoke-cntt/testcases.yaml                                      | 3 +--
 functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index 4b8927026..023eeb91f 100644
--- a/docker/smoke-cntt/tempest_conf.yaml
+++ b/docker/smoke-cntt/tempest_conf.yaml
@@ -49,6 +49,10 @@ identity-feature-enabled:
 image-feature-enabled:
     api_v2: true
     api_v1: false
+network-feature-enabled:
+    port_admin_state_change: true
+    port_security: true
+    floating_ips: true
 placement:
     max_microversion: 1.30
 volume:
diff --git a/docker/smoke-cntt/testcases.yaml b/docker/smoke-cntt/testcases.yaml
index 918421977..38a887816 100644
--- a/docker/smoke-cntt/testcases.yaml
+++ b/docker/smoke-cntt/testcases.yaml
@@ -187,7 +187,7 @@ tiers:
                 criteria: 100
                 blocking: false
                 deny_skipping: true
-                tests_count: 35
+                tests_count: 36
                 description: >-
                     The list of test cases is generated by
                     Tempest automatically and depends on the parameters of
@@ -203,7 +203,6 @@ tiers:
                           (?!.*test_minbw_allocation_placement)\
                           (?!.*test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_cold_migration_revert)\
                           (?!.*test_network_v6)\
-                          (?!.*test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_boot_into_disabled_port_security_network_without_secgroup)\
                           (?!.*test_stamp_pattern.TestStampPattern.test_stamp_pattern)\
                           (?!.*test_volume_migrate_attached)\
                           (?=.*\\[.*\\bslow\\b.*\\])(^tempest.)"
diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
index 3a5e15aab..c222cd9ac 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@ -49,6 +49,10 @@ identity-feature-enabled:
 image-feature-enabled:
     api_v2: true
     api_v1: false
+network-feature-enabled:
+    port_admin_state_change: true
+    port_security: true
+    floating_ips: true
 placement:
     max_microversion: 1.30
 volume:
-- 
cgit