From 21a0708799bd0fa61e086dc6f1c0f35c1450b55c Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 26 Nov 2019 13:17:35 +0100
Subject: Complete tempest_full for CNTT Compliance
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It forbids skipping any test and counts the testcases executed.

It mosly avoids running tests accoring to the upstream skip tests
(known bugs), related to nova-network, glance v1, keystone v2 and
all features defined as optional by CNTT.

It fixes an issue highlighted by yallint.

Change-Id: Ib4678cb9e9fc37b16fcf21d8418931eae0f667d0
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 docker/smoke-cntt/tempest_conf.yaml                |  3 +++
 docker/smoke-cntt/testcases.yaml                   | 23 +++++++++++++++++++++-
 .../tempest/custom_tests/tempest_conf.yaml         |  4 +++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index 288abed73..7877d7681 100644
--- a/docker/smoke-cntt/tempest_conf.yaml
+++ b/docker/smoke-cntt/tempest_conf.yaml
@@ -20,6 +20,9 @@ compute-feature-enabled:
     rdp_console: false
     rescue: true
     resize: true
+    scheduler_available_filters: "AvailabilityZoneFilter,ComputeFilter,\
+      ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,\
+      ServerGroupAffinityFilter,SameHostFilter,DifferentHostFilter"
     serial_console: false
     shelve: true
     snapshot: true
diff --git a/docker/smoke-cntt/testcases.yaml b/docker/smoke-cntt/testcases.yaml
index 073dd6d16..0dd8768f7 100644
--- a/docker/smoke-cntt/testcases.yaml
+++ b/docker/smoke-cntt/testcases.yaml
@@ -106,6 +106,8 @@ tiers:
                 project_name: functest
                 criteria: 100
                 blocking: false
+                deny_skipping: true
+                tests_count: 1295
                 description: >-
                     The list of test cases is generated by
                     Tempest automatically and depends on the parameters of
@@ -114,11 +116,23 @@ tiers:
                 run:
                     name: tempest_common
                     args:
-                        mode: "(?!.*test_fixed_ips)(?!.*test_fixed_ips_negative)\
+                        mode: "(?!.*test_fixed_ips)\
+                          (?!.*test_fixed_ips_negative)\
+                          (?!.*test_auto_allocate_network)(?!.*test_floating_ips_bulk)\
+                          (?!.*test_live_migration.LiveAutoBlockMigrationV225Test.test_iscsi_volume)\
                           (?!.*test_live_migration.LiveAutoBlockMigrationV225Test.test_volume_backed_live_migration)\
                           (?!.*test_live_migration.LiveMigrationTest.test_iscsi_volume)\
                           (?!.*test_live_migration.LiveMigrationTest.test_volume_backed_live_migration)\
+                          (?!.*test_live_migration.LiveMigrationRemoteConsolesV26Test)\
+                          (?!.*certificates.test_certificates)\
                           (?!.*test_quotas_negative.QuotasSecurityGroupAdminNegativeTest)\
+                          (?!.*test_novnc)(?!.*test_server_personality)\
+                          (?!.*test_servers.ServerShowV263Test.test_show_update_rebuild_list_server)\
+                          (?!.*test_servers_negative.ServersNegativeTestJSON.test_personality_file_contents_not_encoded)\
+                          (?!.*servers.test_virtual_interfaces)\
+                          (?!.*test_server_actions.ServerActionsTestJSON.test_change_server_password)\
+                          (?!.*test_server_actions.ServerActionsTestJSON.test_get_vnc_console)\
+                          (?!.*test_server_actions.ServerActionsTestJSON.test_reboot_server_soft)\
                           (?!.*test_security_group_default_rules)\
                           (?!.*test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_security_group_create_with_duplicate_name)\
                           (?!.*test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_security_group_create_with_invalid_group_description)\
@@ -133,7 +147,14 @@ tiers:
                           (?!.*identity.admin.v2)(?!.*identity.v2)\
                           (?!.*image.v1)\
                           (?!.*test_metering_extensions)(?!.*network.test_tags)\
+                          (?!.*test_routers.RoutersIpV6Test.test_create_router_set_gateway_with_fixed_ip)\
+                          (?!.*test_routers.RoutersTest.test_create_router_set_gateway_with_fixed_ip)\
+                          (?!.*test_group_snapshots.GroupSnapshotsV319Test.test_reset_group_snapshot_status)\
                           (?!.*test_multi_backend)\
+                          (?!.*test_volume_retype.VolumeRetypeWithMigrationTest)\
+                          (?!.*test_volume_delete_cascade.VolumesDeleteCascade.test_volume_from_snapshot_cascade_delete)\
+                          (?!.*test_volumes_backup.VolumesBackupsTest.test_volume_backup_create_get_detailed_list_restore_delete)\
+                          (?!.*test_volumes_extend.VolumesExtendAttachedTest.test_extend_attached_volume)\
                           (?!.*\\[.*\\bslow\\b.*\\])(^tempest.api)"
                         option:
                             - '--concurrency=4'
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 e78f2fa35..5e55f39d6 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@ -20,7 +20,9 @@ compute-feature-enabled:
     rdp_console: false
     rescue: true
     resize: true
-    scheduler_available_filters: AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,SameHostFilter,DifferentHostFilter
+    scheduler_available_filters: "AvailabilityZoneFilter,ComputeFilter,\
+      ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,\
+      ServerGroupAffinityFilter,SameHostFilter,DifferentHostFilter"
     serial_console: true
     shelve: true
     snapshot: true
-- 
cgit