From d67dee1776cb664260f03a9943f80132a35f666b Mon Sep 17 00:00:00 2001 From: Douglas Viroel Date: Sun, 11 Aug 2019 19:37:58 -0300 Subject: [PATCH] Enable replication tests (DHSS=True) on Dummy driver This patch enables the replication test to run on Dummy driver when configured with DHSS True. This change depends on subnets implementation to properly work. Change-Id: Ib6a44d8f0d8c56acd149b8d80549079f771ffbe0 Depends-On: Icb93fc346b71edc7bb3ac989e9751899bb80fbe5 --- contrib/ci/post_test_hook.sh | 2 ++ contrib/ci/pre_test_hook.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh index 8aa67e9e9b..84586de598 100755 --- a/contrib/ci/post_test_hook.sh +++ b/contrib/ci/post_test_hook.sh @@ -253,6 +253,7 @@ elif [[ "$DRIVER" == "dummy" ]]; then RUN_MANILA_REVERT_TO_SNAPSHOT_TESTS=True RUN_MANILA_MOUNT_SNAPSHOT_TESTS=True RUN_MANILA_MIGRATION_WITH_PRESERVE_SNAPSHOTS_TESTS=True + RUN_MANILA_REPLICATION_TESTS=True iniset $TEMPEST_CONFIG share enable_ip_rules_for_protocols 'nfs' iniset $TEMPEST_CONFIG share enable_user_rules_for_protocols 'cifs' iniset $TEMPEST_CONFIG share enable_cert_rules_for_protocols '' @@ -266,6 +267,7 @@ elif [[ "$DRIVER" == "dummy" ]]; then iniset $TEMPEST_CONFIG share multitenancy_enabled True iniset $TEMPEST_CONFIG share create_networks_when_multitenancy_enabled False iniset $TEMPEST_CONFIG share multi_backend True + iniset $TEMPEST_CONFIG share backend_replication_type 'readable' elif [[ "$DRIVER" == "container"* ]]; then if [[ "$DRIVER" == "container_with_custom_image" ]]; then # TODO(vponomaryov): set scenario tests for run when diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh index dc5f340deb..7499c9777f 100755 --- a/contrib/ci/pre_test_hook.sh +++ b/contrib/ci/pre_test_hook.sh @@ -109,12 +109,14 @@ elif [[ "$DRIVER" == "dummy" ]]; then echo "MANILA_OPTGROUP_alpha_share_backend_name=ALPHA" >> $localconf echo "MANILA_OPTGROUP_alpha_network_config_group=membernet" >> $localconf echo "MANILA_OPTGROUP_alpha_admin_network_config_group=adminnet" >> $localconf + echo "MANILA_OPTGROUP_alpha_replication_domain=DUMMY_DOMAIN_2" >> $localconf echo "MANILA_OPTGROUP_beta_share_driver=$driver_path" >> $localconf echo "MANILA_OPTGROUP_beta_driver_handles_share_servers=True" >> $localconf echo "MANILA_OPTGROUP_beta_share_backend_name=BETA" >> $localconf echo "MANILA_OPTGROUP_beta_network_config_group=membernet" >> $localconf echo "MANILA_OPTGROUP_beta_admin_network_config_group=adminnet" >> $localconf + echo "MANILA_OPTGROUP_beta_replication_domain=DUMMY_DOMAIN_2" >> $localconf echo "MANILA_OPTGROUP_gamma_share_driver=$driver_path" >> $localconf echo "MANILA_OPTGROUP_gamma_driver_handles_share_servers=False" >> $localconf