openstack
/
fuel-qa
Code Issues Proposed changes

Use names for Neutron segment types from settings 

In order to have ability to easily rename types of
Neutron backends, replace segmentation types in all
tests by appropriate variables from settings.

Use 'tun' segmentation type instead of 'gre'

Closes-Bug:#1479392
Change-Id: Ide254e035c50323ecd2a909d804e47a971f1339c
This commit is contained in:
Dennis Dmitriev 2015-08-03 14:45:31 +03:00
parent 9496d17767
commit 6e39c180c0
13 changed files with 99 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuelweb_test/models/fuel_web_client.py
View File

@ -1398,7 +1398,8 @@ class FuelWebClient(object):
def set_network(self, net_config, net_name, net_pools=None, seg_type=None):
nets_wo_floating = ['public', 'management', 'storage']
if seg_type == NEUTRON_SEGMENT['gre']:
if (seg_type == NEUTRON_SEGMENT['tun'] or
seg_type == NEUTRON_SEGMENT['gre']):
nets_wo_floating.append('private')
if not net_pools:

9
fuelweb_test/tests/gd_based_tests/test_neutron.py
View File

@ -25,15 +25,16 @@ from fuelweb_test.helpers.decorators import log_snapshot_after_test
from fuelweb_test.helpers.decorators import upload_manifests
from fuelweb_test.helpers import granular_deployment_checkers as gd
from fuelweb_test.settings import DEPLOYMENT_MODE
from fuelweb_test.settings import NEUTRON_SEGMENT
from fuelweb_test.settings import UPLOAD_MANIFESTS
from fuelweb_test.tests.base_test_case import SetupEnvironment
from fuelweb_test.tests.base_test_case import TestBasic
import time
@test(groups=["gd", "gd_deploy_neutron_gre"])
class NeutronGre(TestBasic):
"""NeutronGre.""" # TODO documentation
@test(groups=["gd", "gd_deploy_neutron_tun"])
class NeutronTun(TestBasic):
"""NeutronTun.""" # TODO documentation
@classmethod
def get_pre_test(cls, tasks, task_name):
@ -96,7 +97,7 @@ class NeutronGre(TestBasic):
self.check_run("step_1_create_3_node_cluster")
self.env.revert_snapshot("ready_with_3_slaves")
segment_type = 'gre'
segment_type = NEUTRON_SEGMENT['tun']
cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__,
mode=DEPLOYMENT_MODE,

3
fuelweb_test/tests/gd_based_tests/test_neutron_vlan_ceph_mongo.py
View File

@ -24,6 +24,7 @@ from fuelweb_test.helpers.decorators import log_snapshot_after_test
from fuelweb_test.helpers.decorators import upload_manifests
from fuelweb_test.helpers import granular_deployment_checkers as gd
from fuelweb_test.settings import DEPLOYMENT_MODE
from fuelweb_test.settings import NEUTRON_SEGMENT
from fuelweb_test.settings import UPLOAD_MANIFESTS
from fuelweb_test.tests.base_test_case import SetupEnvironment
from fuelweb_test.tests.base_test_case import TestBasic
@ -93,7 +94,7 @@ class NeutronVlanCephMongo(TestBasic):
self.check_run("step_1_create_5_node_cluster_provision")
self.env.revert_snapshot("ready_with_5_slaves")
segment_type = 'vlan'
segment_type = NEUTRON_SEGMENT['vlan']
cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__,
mode=DEPLOYMENT_MODE,

3
fuelweb_test/tests/plugins/plugin_contrail/test_fuel_plugin_contrail.py
View File

@ -27,6 +27,7 @@ from fuelweb_test.settings import DEPLOYMENT_MODE
from fuelweb_test.settings import CONTRAIL_PLUGIN_PATH
from fuelweb_test.settings import CONTRAIL_PLUGIN_PACK_UB_PATH
from fuelweb_test.settings import CONTRAIL_PLUGIN_PACK_CEN_PATH
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
@ -68,7 +69,7 @@ class ContrailPlugin(TestBasic):
def _assign_net_provider(self, pub_all_nodes=False):
"""Assign neutron with vlan segmentation"""
segment_type = 'vlan'
segment_type = NEUTRON_SEGMENT['vlan']
self.cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__,
mode=DEPLOYMENT_MODE,

5
fuelweb_test/tests/plugins/plugin_example/test_fuel_plugin_example.py
View File

@ -22,6 +22,7 @@ from fuelweb_test.helpers import checkers
from fuelweb_test.settings import DEPLOYMENT_MODE
from fuelweb_test.settings import EXAMPLE_PLUGIN_PATH
from fuelweb_test.settings import EXAMPLE_PLUGIN_V3_PATH
from fuelweb_test.settings import NEUTRON_SEGMENT
from fuelweb_test.settings import NEUTRON_SEGMENT_TYPE
from fuelweb_test.tests.base_test_case import SetupEnvironment
from fuelweb_test.tests.base_test_case import TestBasic
@ -65,7 +66,7 @@ class ExamplePlugin(TestBasic):
self.env.d_env.get_admin_remote(),
plugin=os.path.basename(EXAMPLE_PLUGIN_PATH))
segment_type = 'vlan'
segment_type = NEUTRON_SEGMENT['vlan']
cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__,
mode=DEPLOYMENT_MODE,
@ -384,7 +385,7 @@ class ExamplePlugin(TestBasic):
mode=DEPLOYMENT_MODE,
settings={
"net_provider": 'neutron',
"net_segment_type": 'gre',
"net_segment_type": NEUTRON_SEGMENT['tun'],
}
)

15
fuelweb_test/tests/test_bonding.py
View File

@ -21,6 +21,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
@ -246,7 +247,7 @@ class BondingHA(TestBasic):
self.env.revert_snapshot("ready_with_5_slaves")
segment_type = 'vlan'
segment_type = NEUTRON_SEGMENT['vlan']
cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__,
@ -288,10 +289,10 @@ class BondingHA(TestBasic):
self.env.make_snapshot("deploy_bonding_neutron_vlan")
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["deploy_bonding_neutron_gre"])
groups=["deploy_bonding_neutron_tun"])
@log_snapshot_after_test
def deploy_bonding_neutron_gre(self):
"""Deploy cluster with active-backup bonding and Neutron GRE
def deploy_bonding_neutron_tun(self):
"""Deploy cluster with active-backup bonding and Neutron VXLAN
Scenario:
1. Create cluster
@ -305,12 +306,12 @@ class BondingHA(TestBasic):
8. Run OSTF
Duration 70m
Snapshot deploy_bonding_neutron_gre
Snapshot deploy_bonding_neutron_tun
"""
self.env.revert_snapshot("ready_with_5_slaves")
segment_type = 'gre'
segment_type = NEUTRON_SEGMENT['tun']
cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__,
@ -349,4 +350,4 @@ class BondingHA(TestBasic):
self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(cluster_id=cluster_id)
self.env.make_snapshot("deploy_bonding_neutron_gre")
self.env.make_snapshot("deploy_bonding_neutron_tun")

6
fuelweb_test/tests/test_ceph.py
View File

@ -68,7 +68,7 @@ class CephCompact(TestBasic):
}
if NEUTRON_ENABLE:
data["net_provider"] = 'neutron'
data["net_segment_type"] = 'vlan'
data["net_segment_type"] = settings.NEUTRON_SEGMENT['vlan']
cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__,
@ -246,7 +246,7 @@ class CephHA(TestBasic):
if settings.NEUTRON_ENABLE:
csettings = {
"net_provider": 'neutron',
"net_segment_type": "vlan"
"net_segment_type": settings.NEUTRON_SEGMENT_TYPE['vlan']
}
csettings.update(
{
@ -443,7 +443,7 @@ class CephRadosGW(TestBasic):
'images_ceph': True,
'objects_ceph': True,
'net_provider': 'neutron',
'net_segment_type': 'vlan',
'net_segment_type': settings.NEUTRON_SEGMENT['vlan'],
'tenant': 'rados',
'user': 'rados',
'password': 'rados'

12
fuelweb_test/tests/test_environment_action.py
View File

@ -292,13 +292,13 @@ class ControllerReplacement(base_test_case.TestBasic):
"""
@test(depends_on=[base_test_case.SetupEnvironment.prepare_slaves_5],
groups=["deploy_ha_neutron_gre_ctrl_replacement"])
groups=["deploy_ha_neutron_tun_ctrl_replacement"])
@log_snapshot_after_test
def deploy_ha_neutron_gre_ctrl_replacement(self):
def deploy_ha_neutron_tun_ctrl_replacement(self):
"""Replace 1 controller and re-deploy on ha env with neutron gre
Scenario:
1. Create cluster with neutron gre
1. Create cluster with Neutron VXLAN
2. Add 3 node with controller role
3. Add 1 node with compute
3. Deploy cluster
@ -307,7 +307,7 @@ class ControllerReplacement(base_test_case.TestBasic):
6. Run OSTF
Duration 90m
Snapshot: deploy_ha_neutron_gre_ctrl_replacement
Snapshot: deploy_ha_neutron_tun_ctrl_replacement
"""
self.env.revert_snapshot("ready_with_5_slaves")
@ -343,7 +343,7 @@ class ControllerReplacement(base_test_case.TestBasic):
test_sets=['ha', 'smoke', 'sanity'],
should_fail=1)
self.env.make_snapshot("deploy_ha_neutron_gre_ctrl_replacement")
self.env.make_snapshot("deploy_ha_neutron_tun_ctrl_replacement")
@test(depends_on=[base_test_case.SetupEnvironment.prepare_slaves_5],
groups=["deploy_ha_neutron_vlan_ctrl_replacement"])
@ -397,7 +397,7 @@ class ControllerReplacement(base_test_case.TestBasic):
test_sets=['ha', 'smoke', 'sanity'],
should_fail=1)
self.env.make_snapshot("deploy_ha_neutron_gre_ctrl_replacement")
self.env.make_snapshot("deploy_ha_neutron_vlan_ctrl_replacement")
@test(enabled=False,
depends_on=[base_test_case.SetupEnvironment.prepare_slaves_5],

37
fuelweb_test/tests/test_multiple_networks.py
View File

@ -20,6 +20,7 @@ from fuelweb_test.helpers.decorators import check_fuel_statistics
from fuelweb_test.helpers.decorators import log_snapshot_after_test
from fuelweb_test.settings import DEPLOYMENT_MODE_HA
from fuelweb_test.settings import MULTIPLE_NETWORKS
from fuelweb_test.settings import NEUTRON_SEGMENT
from fuelweb_test.settings import NODEGROUPS
from fuelweb_test.tests.base_test_case import TestBasic
from fuelweb_test.tests.base_test_case import SetupEnvironment
@ -67,22 +68,22 @@ class TestMultipleClusterNets(TestBasic):
@test(depends_on=[multiple_cluster_net_setup],
groups=["multiple_cluster_networks",
"multiple_cluster_net_neutron_gre_ha", "thread_7"])
"multiple_cluster_net_neutron_tun_ha", "thread_7"])
@log_snapshot_after_test
@check_fuel_statistics
def deploy_neutron_gre_ha_nodegroups(self):
"""Deploy HA environment with NeutronGRE and 2 nodegroups
def deploy_neutron_tun_ha_nodegroups(self):
"""Deploy HA environment with NeutronVXLAN and 2 nodegroups
Scenario:
1. Revert snapshot with 2 networks sets for slaves
2. Create cluster (HA) with Neutron GRE
2. Create cluster (HA) with Neutron VXLAN
3. Add 3 controller nodes from default nodegroup
4. Add 2 compute nodes from custom nodegroup
5. Deploy cluster
6. Run health checks (OSTF)
Duration 110m
Snapshot deploy_neutron_gre_ha_nodegroups
Snapshot deploy_neutron_tun_ha_nodegroups
"""
@ -95,10 +96,10 @@ class TestMultipleClusterNets(TestBasic):
mode=DEPLOYMENT_MODE_HA,
settings={
"net_provider": 'neutron',
"net_segment_type": 'gre',
'tenant': 'haGre',
'user': 'haGre',
'password': 'haGre'
"net_segment_type": NEUTRON_SEGMENT['tun'],
'tenant': 'haVxlan',
'user': 'haVxlan',
'password': 'haVxlan'
}
)
@ -119,25 +120,25 @@ class TestMultipleClusterNets(TestBasic):
self.fuel_web.deploy_cluster_wait(cluster_id)
self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(cluster_id=cluster_id)
self.env.make_snapshot("deploy_neutron_gre_ha_nodegroups")
self.env.make_snapshot("deploy_neutron_tun_ha_nodegroups")
@test(depends_on=[multiple_cluster_net_setup],
groups=["multiple_cluster_networks",
"multiple_cluster_net_ceph_ha", "thread_7"])
@log_snapshot_after_test
def deploy_ceph_ha_nodegroups(self):
"""Deploy HA environment with NeutronGRE, Ceph and 2 nodegroups
"""Deploy HA environment with Neutron VXLAN, Ceph and 2 nodegroups
Scenario:
1. Revert snapshot with 2 networks sets for slaves
2. Create cluster (HA) with Neutron GRE and Ceph
2. Create cluster (HA) with Neutron VXLAN and Ceph
3. Add 3 controller + ceph nodes from default nodegroup
4. Add 2 compute + ceph nodes from custom nodegroup
5. Deploy cluster
6. Run health checks (OSTF)
Duration 110m
Snapshot deploy_neutron_gre_ha_nodegroups
Snapshot deploy_neutron_tun_ha_nodegroups
"""
@ -153,10 +154,10 @@ class TestMultipleClusterNets(TestBasic):
'images_ceph': True,
'volumes_lvm': False,
"net_provider": 'neutron',
"net_segment_type": 'gre',
'tenant': 'haGreCeph',
'user': 'haGreCeph',
'password': 'haGreCeph'
"net_segment_type": NEUTRON_SEGMENT['tun'],
'tenant': 'haVxlanCeph',
'user': 'haVxlanCeph',
'password': 'haVxlanCeph'
}
)
@ -177,4 +178,4 @@ class TestMultipleClusterNets(TestBasic):
self.fuel_web.deploy_cluster_wait(cluster_id, timeout=150 * 60)
self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(cluster_id=cluster_id)
self.env.make_snapshot("deploy_neutron_gre_ha_nodegroups")
self.env.make_snapshot("deploy_neutron_tun_ha_nodegroups")

54
fuelweb_test/tests/test_services.py
View File

@ -34,10 +34,10 @@ class SaharaHAOneController(TestBasic):
Put Sahara image before start
"""
@test(depends_on=[SetupEnvironment.prepare_slaves_3],
groups=["deploy_sahara_ha_one_controller_gre"])
groups=["deploy_sahara_ha_one_controller_tun"])
@log_snapshot_after_test
def deploy_sahara_ha_one_controller_gre(self):
"""Deploy cluster in ha mode with 1 controller Sahara and Neutron GRE
def deploy_sahara_ha_one_controller_tun(self):
"""Deploy cluster in ha mode with 1 controller Sahara and Neutron VXLAN
Scenario:
1. Create a Fuel cluster. Set the option for Sahara installation
@ -50,7 +50,7 @@ class SaharaHAOneController(TestBasic):
8. Run platform Vanilla2 test for Sahara
Duration 65m
Snapshot: deploy_sahara_ha_one_controller_gre
Snapshot: deploy_sahara_ha_one_controller_tun
"""
LOGGER.debug('Check MD5 sum of Vanilla2 image')
check_image = checkers.check_image(
@ -65,7 +65,7 @@ class SaharaHAOneController(TestBasic):
data = {
'sahara': True,
'net_provider': 'neutron',
'net_segment_type': 'gre',
'net_segment_type': settings.NEUTRON_SEGMENT['tun'],
'tenant': 'saharaSimple',
'user': 'saharaSimple',
'password': 'saharaSimple'
@ -129,7 +129,7 @@ class SaharaHAOneController(TestBasic):
cluster_id=cluster_id, test_sets=['tests_platform'],
test_name=path_to_tests + test_name, timeout=60 * 200)
self.env.make_snapshot("deploy_sahara_ha_one_controller_gre")
self.env.make_snapshot("deploy_sahara_ha_one_controller_tun")
@test(groups=["services", "services.sahara", "services_ha"])
@ -139,10 +139,10 @@ class SaharaHA(TestBasic):
Put Sahara image before start
"""
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["deploy_sahara_ha_gre"])
groups=["deploy_sahara_ha_tun"])
@log_snapshot_after_test
def deploy_sahara_ha_gre(self):
"""Deploy cluster in HA mode with Sahara and Neutron GRE
def deploy_sahara_ha_tun(self):
"""Deploy cluster in HA mode with Sahara and Neutron VXLAN
Scenario:
1. Create a Fuel cluster. Set the option for Sahara installation
@ -155,7 +155,7 @@ class SaharaHA(TestBasic):
8. Run platform Vanilla2 test for Sahara
Duration 130m
Snapshot: deploy_sahara_ha_gre
Snapshot: deploy_sahara_ha_tun
"""
LOGGER.debug('Check MD5 sum of Vanilla2 image')
@ -171,7 +171,7 @@ class SaharaHA(TestBasic):
data = {
'sahara': True,
'net_provider': 'neutron',
'net_segment_type': 'gre',
'net_segment_type': settings.NEUTRON_SEGMENT['tun'],
'tenant': 'saharaHA',
'user': 'saharaHA',
'password': 'saharaHA'
@ -238,7 +238,7 @@ class SaharaHA(TestBasic):
cluster_id=cluster_id, test_sets=['tests_platform'],
test_name=path_to_tests + test_name, timeout=60 * 200)
self.env.make_snapshot("deploy_sahara_ha_gre")
self.env.make_snapshot("deploy_sahara_ha_tun")
@test(groups=["services", "services.murano", "services_ha_one_controller"])
@ -247,10 +247,10 @@ class MuranoHAOneController(TestBasic):
Don't recommend to start tests without kvm.
"""
@test(depends_on=[SetupEnvironment.prepare_slaves_3],
groups=["deploy_murano_ha_one_controller_gre"])
groups=["deploy_murano_ha_one_controller_tun"])
@log_snapshot_after_test
def deploy_murano_ha_one_controller_gre(self):
"""Deploy cluster in HA mode with Murano and Neutron GRE
def deploy_murano_ha_one_controller_tun(self):
"""Deploy cluster in HA mode with Murano and Neutron VXLAN
Scenario:
1. Create cluster. Set install Murano option
@ -262,14 +262,14 @@ class MuranoHAOneController(TestBasic):
7. Run OSTF Murano platform tests
Duration 40m
Snapshot: deploy_murano_ha_one_controller_gre
Snapshot: deploy_murano_ha_one_controller_tun
"""
self.env.revert_snapshot("ready_with_3_slaves")
data = {
'murano': True,
'net_provider': 'neutron',
'net_segment_type': 'gre',
'net_segment_type': settings.NEUTRON_SEGMENT['tun'],
'tenant': 'muranoSimple',
'user': 'muranoSimple',
'password': 'muranoSimple'
@ -324,7 +324,7 @@ class MuranoHAOneController(TestBasic):
cluster_id=cluster_id, test_sets=['tests_platform'],
test_name=test_name, timeout=60 * 20)
self.env.make_snapshot("deploy_murano_ha_one_controller_gre")
self.env.make_snapshot("deploy_murano_ha_one_controller_tun")
@test(groups=["services", "services.murano", "services_ha"])
@ -333,10 +333,10 @@ class MuranoHA(TestBasic):
Don't recommend to start tests without kvm.
"""
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["deploy_murano_ha_with_gre"])
groups=["deploy_murano_ha_with_tun"])
@log_snapshot_after_test
def deploy_murano_ha_with_gre(self):
"""Deploy cluster in ha mode with Murano and Neutron GRE
def deploy_murano_ha_with_tun(self):
"""Deploy cluster in ha mode with Murano and Neutron VXLAN
Scenario:
1. Create cluster. Set install Murano option
@ -348,7 +348,7 @@ class MuranoHA(TestBasic):
7. Run OSTF Murano platform tests
Duration 100m
Snapshot: deploy_murano_ha_with_gre
Snapshot: deploy_murano_ha_with_tun
"""
self.env.revert_snapshot("ready_with_5_slaves")
@ -356,7 +356,7 @@ class MuranoHA(TestBasic):
data = {
'murano': True,
'net_provider': 'neutron',
'net_segment_type': 'gre',
'net_segment_type': settings.NEUTRON_SEGMENT['tun'],
'tenant': 'muranoHA',
'user': 'muranoHA',
'password': 'muranoHA'
@ -413,7 +413,7 @@ class MuranoHA(TestBasic):
cluster_id=cluster_id, test_sets=['tests_platform'],
test_name=test_name, timeout=60 * 20)
self.env.make_snapshot("deploy_murano_ha_with_gre")
self.env.make_snapshot("deploy_murano_ha_with_tun")
class OSTFCeilometerHelper(TestBasic):
@ -781,7 +781,7 @@ class HeatHAOneController(TestBasic):
groups=["deploy_heat_ha_one_controller_neutron"])
@log_snapshot_after_test
def deploy_heat_ha_one_controller_neutron(self):
"""Deploy Heat cluster in HA mode with Neutron GRE
"""Deploy Heat cluster in HA mode with Neutron VXLAN
Scenario:
1. Create cluster
@ -801,7 +801,7 @@ class HeatHAOneController(TestBasic):
data = {
'ceilometer': True,
'net_provider': 'neutron',
'net_segment_type': 'gre',
'net_segment_type': settings.NEUTRON_SEGMENT['tun'],
'tenant': 'heatSimple',
'user': 'heatSimple',
'password': 'heatSimple'
@ -974,7 +974,7 @@ class HeatHA(TestBasic):
data = {
'ceilometer': True,
'net_provider': 'neutron',
'net_segment_type': 'gre',
'net_segment_type': settings.NEUTRON_SEGMENT['tun'],
'tenant': 'heatHA',
'user': 'heatHA',
'password': 'heatHA'

16
fuelweb_test/tests/tests_strength/test_huge_environments.py
View File

@ -153,10 +153,10 @@ class HugeEnvironments(base_test_case.TestBasic):
class HugeHaNeutron(base_test_case.TestBasic):
@test(depends_on=[base_test_case.SetupEnvironment.prepare_slaves_9],
groups=["huge_ha_neutron_gre_ceph_ceilometer_rados"])
groups=["huge_ha_neutron_tun_ceph_ceilometer_rados"])
@log_snapshot_after_test
def huge_ha_neutron_gre_ceph_ceilometer_rados(self):
"""Deploy cluster in HA mode with Neutron GRE, RadosGW
def huge_ha_neutron_tun_ceph_ceilometer_rados(self):
"""Deploy cluster in HA mode with Neutron VXLAN, RadosGW
Scenario:
1. Create cluster
@ -180,10 +180,10 @@ class HugeHaNeutron(base_test_case.TestBasic):
'objects_ceph': True,
'ceilometer': True,
'net_provider': 'neutron',
'net_segment_type': 'gre',
'tenant': 'haGreCephHugeScale',
'user': 'haGreCephHugeScale',
'password': 'haGreCephHugeScale'
'net_segment_type': settings.NEUTRON_SEGMENT['tun'],
'tenant': 'haVxlanCephHugeScale',
'user': 'haVxlanCephHugeScale',
'password': 'haVxlanCephHugeScale'
}
cluster_id = self.fuel_web.create_cluster(
@ -269,7 +269,7 @@ class HugeHaNeutron(base_test_case.TestBasic):
'volumes_lvm': False,
'objects_ceph': True,
'net_provider': 'neutron',
'net_segment_type': 'vlan',
'net_segment_type': settings.NEUTRON_SEGMENT['vlan'],
'tenant': 'haVlanCephHugeScale',
'user': 'haVlanCephHugeScale',
'password': 'haVlanCephHugeScale'

2
fuelweb_test/tests/tests_strength/test_neutron.py
View File

@ -113,7 +113,7 @@ class TestNeutronFailover(base_test_case.TestBasic):
mode=settings.DEPLOYMENT_MODE,
settings={
"net_provider": 'neutron',
"net_segment_type": 'gre'
"net_segment_type": settings.NEUTRON_SEGMENT['tun']
}
)
self.fuel_web.update_nodes(

21
fuelweb_test/tests/tests_upgrade/test_upgrade.py
View File

@ -192,7 +192,7 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
"""Upgrade ha deployed cluster
Scenario:
1. Revert snapshot with neutron gre ha env
1. Revert snapshot with Neutron GRE HA 6.1 env
2. Run upgrade on master
3. Check that upgrade was successful
4. Run network verification
@ -202,6 +202,7 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
8. Run OSTF
"""
#(ddmitriev)TODO: change the snapshot name to actual when reverting 7.0
if not self.env.d_env.has_snapshot('deploy_neutron_gre_ha'):
raise SkipTest()
@ -279,7 +280,7 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
"""Upgrade ha deployed cluster and restart containers
Scenario:
1. Revert snapshot with neutron gre ha env
1. Revert snapshot with Neutron GRE HA 6.1 env
2. Run upgrade on master
3. Check that upgrade was successful
4. Run patching and restart containers
@ -290,6 +291,7 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
9. Run OSTF
"""
#(ddmitriev)TODO: change the snapshot name to actual when reverting 7.0
if not self.env.d_env.has_snapshot('deploy_neutron_gre_ha'):
raise SkipTest()
@ -446,7 +448,7 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
test_sets=['ha', 'smoke', 'sanity'])
self.env.bootstrap_nodes(
self.env.d_env.nodes().slaves[3:9])
segment_type = 'vlan'
segment_type = hlp_data.NEUTRON_SEGMENT['vlan']
cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__,
mode=hlp_data.DEPLOYMENT_MODE,
@ -489,7 +491,7 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
"""Upgrade Fuel after rollback and deploy new cluster
Scenario:
1. Revert deploy_neutron_gre snapshot
1. Revert deploy_neutron_gre snapshot with 6.1 env
2. Upgrade with rollback
3. Run OSTF
4. Run network verification
@ -499,6 +501,7 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
8. Run OSTF for new cluster
9. Run network verification
"""
#(ddmitriev)TODO: change the snapshot name to actual when reverting 7.0
if not self.env.d_env.has_snapshot('deploy_neutron_gre'):
raise SkipTest()
@ -568,7 +571,7 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
mode=hlp_data.DEPLOYMENT_MODE,
settings={
'net_provider': 'neutron',
'net_segment_type': 'vlan'
'net_segment_type': hlp_data.NEUTRON_SEGMENT['vlan']
}
)
self.fuel_web.update_nodes(
@ -597,7 +600,7 @@ class RollbackFuelMaster(base_test_data.TestBasic):
"""Rollback manually ha deployed cluster
Scenario:
1. Revert snapshot with neutron gre ha env
1. Revert snapshot with Neutron GRE HA 6.1 env
2. Add raise exception to openstack.py file
3. Run upgrade on master
4. Check that rollback starts automatically
@ -608,6 +611,7 @@ class RollbackFuelMaster(base_test_data.TestBasic):
9. Run OSTF
"""
#(ddmitriev)TODO: change the snapshot name to actual when reverting 7.0
if not self.env.d_env.has_snapshot('deploy_neutron_gre_ha'):
raise SkipTest()
@ -662,7 +666,7 @@ class RollbackFuelMaster(base_test_data.TestBasic):
"""Rollback automatically ha one controller deployed cluster
Scenario:
1. Revert snapshot with deploy neutron gre env
1. Revert snapshot with deploy Neutron VXLAN env
2. Add raise exception to docker_engine.py file
3. Run upgrade on master
4. Check that rollback starts automatically
@ -739,7 +743,7 @@ class RollbackFuelMaster(base_test_data.TestBasic):
and delete node from cluster
Scenario:
1. Revert snapshot with deploy neutron gre env
1. Revert snapshot with deploy Neutron GRE 6.1 env
2. Add raise exception to docker_engine.py file
3. Run upgrade on master
4. Check that rollback starts automatically
@ -750,6 +754,7 @@ class RollbackFuelMaster(base_test_data.TestBasic):
9. Run OSTF
"""
#(ddmitriev)TODO: change the snapshot name to actual when reverting 7.0
if not self.env.d_env.has_snapshot('deploy_neutron_gre'):
raise SkipTest()