Take hostname_fqdn_sanitization into account

It's skipped in CNTT as it's not enabled yet.

Change-Id: Iac3976f4a5fbc2a1e32934bcb4c49877c5753ed4
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit f3bfdf806216930da4da656684f8955503ba3538)

diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index 6a31fb2..9d2f256 100644 (file)
--- a/docker/smoke-cntt/tempest_conf.yaml
+++ b/docker/smoke-cntt/tempest_conf.yaml
@@ -11,6 +11,7 @@ compute-feature-enabled:
     console_output: true
     disk_config: true
     enable_instance_password: true
+    hostname_fqdn_sanitization: false
     interface_attach: true
     live_migration: true
     live_migrate_back_and_forth: false

diff --git a/docker/smoke-cntt/testcases.yaml b/docker/smoke-cntt/testcases.yaml
index 427f4e3..be8a93f 100644 (file)
--- a/docker/smoke-cntt/testcases.yaml
+++ b/docker/smoke-cntt/testcases.yaml
@@ -219,6 +219,7 @@ tiers:
                           (?!.*test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_update_security_group_with_invalid_sg_des)\
                           (?!.*test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_update_security_group_with_invalid_sg_id)\
                           (?!.*test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_update_security_group_with_invalid_sg_name)\
+                          (?!.*test_create_server.ServersTestFqdnHostnames.test_create_server_with_fqdn_name)\
                           (?!.*test_server_metadata.ServerMetadataTestJSON)\
                           (?!.*test_server_metadata_negative.ServerMetadataNegativeTestJSON.test_delete_metadata_non_existent_server)\
                           (?!.*test_server_metadata_negative.ServerMetadataNegativeTestJSON.test_metadata_items_limit)\

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 99b3ba2..3efcb44 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -734,6 +734,7 @@ tiers:
                           (?!.*test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_update_security_group_with_invalid_sg_des)\
                           (?!.*test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_update_security_group_with_invalid_sg_id)\
                           (?!.*test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_update_security_group_with_invalid_sg_name)\
+                          (?!.*test_create_server.ServersTestFqdnHostnames.test_create_server_with_fqdn_name)\
                           (?!.*test_server_metadata.ServerMetadataTestJSON)\
                           (?!.*test_server_metadata_negative.ServerMetadataNegativeTestJSON.test_delete_metadata_non_existent_server)\
                           (?!.*test_server_metadata_negative.ServerMetadataNegativeTestJSON.test_metadata_items_limit)\

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 476c0f2..f33083a 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@ -11,6 +11,7 @@ compute-feature-enabled:
     console_output: true
     disk_config: true
     enable_instance_password: true
+    hostname_fqdn_sanitization: true
     interface_attach: true
     live_migration: true
     live_migrate_back_and_forth: false

diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
index 8bb0e7f..1a48f30 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
@@ -11,6 +11,7 @@ compute-feature-enabled:
     console_output: true
     disk_config: true
     enable_instance_password: true
+    hostname_fqdn_sanitization: true
     interface_attach: true
     live_migration: true
     live_migrate_back_and_forth: false