diff --git a/fuelweb_test/tests/test_pullrequest.py b/fuelweb_test/tests/test_pullrequest.py index 5d38e5ef1..d06dee550 100644 --- a/fuelweb_test/tests/test_pullrequest.py +++ b/fuelweb_test/tests/test_pullrequest.py @@ -16,6 +16,7 @@ from proboscis import test from fuelweb_test.helpers.decorators import log_snapshot_after_test from fuelweb_test.settings import DEPLOYMENT_MODE, NEUTRON_ENABLE +from fuelweb_test.settings import NEUTRON_SEGMENT from fuelweb_test.tests.base_test_case import SetupEnvironment from fuelweb_test.tests.base_test_case import TestBasic @@ -47,7 +48,7 @@ class TestPullRequest(TestBasic): if NEUTRON_ENABLE: settings = { "net_provider": 'neutron', - "net_segment_type": "gre" + "net_segment_type": NEUTRON_SEGMENT['tun'] } cluster_id = self.fuel_web.create_cluster( diff --git a/fuelweb_test/tests/tests_strength/test_image_based.py b/fuelweb_test/tests/tests_strength/test_image_based.py index 852558a9c..4b8450db6 100644 --- a/fuelweb_test/tests/tests_strength/test_image_based.py +++ b/fuelweb_test/tests/tests_strength/test_image_based.py @@ -17,6 +17,7 @@ from proboscis import test from fuelweb_test.helpers.decorators import log_snapshot_after_test from fuelweb_test.settings import DEPLOYMENT_MODE +from fuelweb_test.settings import NEUTRON_SEGMENT from fuelweb_test.tests.base_test_case import SetupEnvironment from fuelweb_test.tests.base_test_case import TestBasic @@ -49,7 +50,7 @@ class RepeatableImageBased(TestBasic): mode=DEPLOYMENT_MODE, settings={ "net_provider": 'neutron', - "net_segment_type": 'gre'}) + "net_segment_type": NEUTRON_SEGMENT['tun']}) self.fuel_web.update_nodes( cluster_id, { diff --git a/fuelweb_test/tests/tests_strength/test_neutron.py b/fuelweb_test/tests/tests_strength/test_neutron.py index 738502a9a..b79c1c260 100644 --- a/fuelweb_test/tests/tests_strength/test_neutron.py +++ b/fuelweb_test/tests/tests_strength/test_neutron.py @@ -133,118 +133,6 @@ class TestNeutronFailoverVlan(TestNeutronFailoverBase): super(self.__class__, self).neutron_packets_drop_stat() -@test(groups=["ha_neutron_destructive_gre", "ha"]) -class TestNeutronFailoverGRE(TestNeutronFailoverBase): - """TestNeutronFailoverGre""" # TODO(kkuznetsova) documentation - - segment_type = "gre" - - @test(depends_on=[base_test_case.SetupEnvironment.prepare_release], - groups=["deploy_ha_neutron_gre"]) - @log_snapshot_after_test - def deploy_ha_neutron_gre(self): - """Deploy cluster in HA mode, Neutron with GRE segmentation - - Scenario: - 1. Create cluster. HA, Neutron with GRE segmentation - 2. Add 3 nodes with controller roles - 3. Add 2 nodes with compute roles - 4. Add 1 node with cinder role - 5. Deploy the cluster - - Duration 90m - Snapshot deploy_ha_neutron_gre - - """ - super(self.__class__, self).deploy_ha_neutron() - - @test(depends_on=[deploy_ha_neutron_gre], - groups=["neutron_l3_migration", - "neutron_l3_migration_gre"]) - @log_snapshot_after_test - def neutron_l3_migration_gre(self): - """Check l3-agent rescheduling after l3-agent dies on gre - - Scenario: - 1. Revert snapshot with neutron cluster - 2. Create an instance with a key pair - 3. Manually reschedule router from primary controller - to another one - 4. Stop l3-agent on new node with pcs - 5. Check l3-agent was rescheduled - 6. Check network connectivity from instance via - dhcp namespace - 7. Run OSTF - - Duration 30m - - """ - super(self.__class__, self).neutron_l3_migration() - - @test(depends_on=[deploy_ha_neutron_gre], - groups=["neutron_l3_migration_after_reset", - "neutron_l3_migration_after_reset_gre"]) - @log_snapshot_after_test - def neutron_l3_migration_after_reset_gre(self): - """Check l3-agent rescheduling after reset non-primary controller (gre) - - Scenario: - 1. Revert snapshot with neutron cluster - 2. Create an instance with a key pair - 3. Manually reschedule router from primary controller - to another one - 4. Reset controller with l3-agent - 5. Check l3-agent was rescheduled - 6. Check network connectivity from instance via - dhcp namespace - 7. Run OSTF - - Duration 30m - """ - super(self.__class__, self).neutron_l3_migration_after_reset() - - @test(depends_on=[deploy_ha_neutron_gre], - groups=["neutron_l3_migration_after_destroy", - "neutron_l3_migration_after_destroy_gre"]) - @log_snapshot_after_test - def neutron_l3_migration_after_destroy_gre(self): - """Check l3-agent rescheduling after destroy nonprimary controller gre - - Scenario: - 1. Revert snapshot with neutron cluster - 2. Create an instance with a key pair - 3. Manually reschedule router from primary controller - to another one - 4. Destroy controller with l3-agent - 5. Check l3-agent was rescheduled - 6. Check network connectivity from instance via - dhcp namespace - 7. Run OSTF - - Duration 30m - """ - super(self.__class__, self).neutron_l3_migration_after_destroy() - - @test(depends_on=[deploy_ha_neutron_gre], - groups=["neutron_packets_drops_stat", - "neutron_packets_drops_stat_gre"]) - @log_snapshot_after_test - def neutron_packets_drop_stat_gre(self): - """Check packets drops statistic when size is equal to MTU on gre - - Scenario: - 1. Revert snapshot with neutron cluster - 2. Create instance, assign floating IP to it - 3. Send ICMP packets from controller to instance with 1500 bytes - 4. If at least 7 responses on 10 requests are received - assume test is passed - - Duration 30m - - """ - super(self.__class__, self).neutron_packets_drop_stat() - - @test(groups=["ha_neutron_destructive_vxlan", "ha"]) class TestNeutronFailoverVxlan(TestNeutronFailoverBase): """TestNeutronFailoverVxlan""" # TODO(akostrikov) documentation