From 2d50636eaa90c85e41232fbd6e0e5193db46d1c9 Mon Sep 17 00:00:00 2001 From: Dennis Dmitriev Date: Thu, 8 Oct 2015 11:38:26 +0300 Subject: [PATCH] Use Fuel default network provider instead of hardcoded in tests - Remove 'NEUTRON_ENABLE' - Remove redundant configuring of 'network_provider' from tests. Keep it only for tests where a special segment type should be used. - NEUTRON_SEGMENT_TYPE makes sense only if a test not configure custom network settings. If not set - defaults from Fuel should be used. - nova-network is going to be removed from Fuel, so vcenter tests are outdated because vcenter will be moving to a plugin. Change-Id: I68c6728832569e5bc92a52ad5dd7676b6924ee48 Related-Bug:#1503752 --- fuelweb_test/models/fuel_web_client.py | 17 ++++++- fuelweb_test/settings.py | 7 ++- .../test_plugin_elasticsearch.py | 5 -- .../plugins/plugin_emc/test_plugin_emc.py | 9 ---- .../test_fuel_plugin_example.py | 9 ---- .../plugin_glusterfs/test_plugin_glusterfs.py | 20 -------- .../plugin_influxdb/test_plugin_influxdb.py | 5 -- .../plugins/plugin_lbaas/test_plugin_lbaas.py | 9 ---- .../test_plugin_lma_collector.py | 4 -- .../test_plugin_lma_infra_alerting.py | 4 -- .../plugin_reboot/test_plugin_reboot_task.py | 9 ---- .../test_plugin_vip_reservation.py | 13 ------ .../plugin_zabbix/test_plugin_zabbix.py | 35 -------------- fuelweb_test/tests/test_ceph.py | 46 +++++++------------ fuelweb_test/tests/test_custom_hostname.py | 12 ----- fuelweb_test/tests/test_environment_action.py | 14 ------ fuelweb_test/tests/test_ha_one_controller.py | 32 +++---------- .../tests/test_ha_one_controller_base.py | 3 -- fuelweb_test/tests/test_net_templates.py | 6 +-- .../tests/test_node_reinstallation.py | 5 -- fuelweb_test/tests/test_pullrequest.py | 12 +---- fuelweb_test/tests/test_ubuntu_bootstrap.py | 3 -- fuelweb_test/tests/test_zabbix.py | 2 - .../tests/tests_patching/test_patching.py | 2 - .../test_cic_maintenance_mode.py | 2 - .../tests_strength/test_failover_base.py | 9 ---- .../test_master_node_failover.py | 6 --- .../tests/tests_strength/test_restart.py | 5 -- 28 files changed, 43 insertions(+), 262 deletions(-) diff --git a/fuelweb_test/models/fuel_web_client.py b/fuelweb_test/models/fuel_web_client.py index ee0fd8bdd..be2e33d85 100644 --- a/fuelweb_test/models/fuel_web_client.py +++ b/fuelweb_test/models/fuel_web_client.py @@ -66,6 +66,7 @@ from fuelweb_test.settings import KVM_USE from fuelweb_test.settings import MULTIPLE_NETWORKS from fuelweb_test.settings import NEUTRON from fuelweb_test.settings import NEUTRON_SEGMENT +from fuelweb_test.settings import NEUTRON_SEGMENT_TYPE from fuelweb_test.settings import NODEGROUPS from fuelweb_test.settings import OPENSTACK_RELEASE from fuelweb_test.settings import OPENSTACK_RELEASE_UBUNTU @@ -435,10 +436,22 @@ class FuelWebClient(object): } if "net_provider" in settings: + data.update({'net_provider': settings["net_provider"]}) + + if "net_segment_type" in settings: + data.update({'net_segment_type': settings["net_segment_type"]}) + + # NEUTRON_SEGMENT_TYPE should not override any option + # configured from test, in case if test is going to set only + # 'net_provider' for a cluster. + if (NEUTRON_SEGMENT_TYPE and + "net_provider" not in settings and + "net_segment_type" not in settings): data.update( { - 'net_provider': settings["net_provider"], - 'net_segment_type': settings["net_segment_type"], + 'net_provider': NEUTRON, + 'net_segment_type': NEUTRON_SEGMENT[ + NEUTRON_SEGMENT_TYPE] } ) diff --git a/fuelweb_test/settings.py b/fuelweb_test/settings.py index f5479e1ae..68e792f90 100644 --- a/fuelweb_test/settings.py +++ b/fuelweb_test/settings.py @@ -257,6 +257,9 @@ NEUTRON_SEGMENT = { 'tun': 'tun' } +NEUTRON_SEGMENT_TYPE = NEUTRON_SEGMENT.get( + os.environ.get('NEUTRON_SEGMENT_TYPE', None), None) + USE_ALL_DISKS = get_var_as_bool('USE_ALL_DISKS', True) UPLOAD_MANIFESTS = get_var_as_bool('UPLOAD_MANIFESTS', False) @@ -391,10 +394,6 @@ ATTEMPTS = int(os.environ.get('ATTEMPTS', 5)) # Create snapshots as last step in test-case MAKE_SNAPSHOT = get_var_as_bool('MAKE_SNAPSHOT', False) -NEUTRON_ENABLE = get_var_as_bool('NEUTRON_ENABLE', False) -NEUTRON_SEGMENT_TYPE = os.environ.get('NEUTRON_SEGMENT_TYPE', - NEUTRON_SEGMENT["vlan"]) - FUEL_SETTINGS_YAML = os.environ.get('FUEL_SETTINGS_YAML', '/etc/fuel/astute.yaml') # TarBall data for updates and upgrades diff --git a/fuelweb_test/tests/plugins/plugin_elasticsearch/test_plugin_elasticsearch.py b/fuelweb_test/tests/plugins/plugin_elasticsearch/test_plugin_elasticsearch.py index ac636f573..2fbb03cd4 100644 --- a/fuelweb_test/tests/plugins/plugin_elasticsearch/test_plugin_elasticsearch.py +++ b/fuelweb_test/tests/plugins/plugin_elasticsearch/test_plugin_elasticsearch.py @@ -23,7 +23,6 @@ from fuelweb_test.helpers.decorators import log_snapshot_after_test from fuelweb_test.helpers import checkers from fuelweb_test.settings import DEPLOYMENT_MODE from fuelweb_test.settings import ELASTICSEARCH_KIBANA_PLUGIN_PATH -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 @@ -70,10 +69,6 @@ class TestElasticsearchPlugin(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE, - } ) plugin_name = 'elasticsearch_kibana' diff --git a/fuelweb_test/tests/plugins/plugin_emc/test_plugin_emc.py b/fuelweb_test/tests/plugins/plugin_emc/test_plugin_emc.py index 7a39989f2..39320b58f 100644 --- a/fuelweb_test/tests/plugins/plugin_emc/test_plugin_emc.py +++ b/fuelweb_test/tests/plugins/plugin_emc/test_plugin_emc.py @@ -115,18 +115,9 @@ class EMCPlugin(TestBasic): remote, plugin=os.path.basename(CONF.EMC_PLUGIN_PATH)) - settings = None - - if CONF.NEUTRON_ENABLE: - settings = { - "net_provider": 'neutron', - "net_segment_type": CONF.NEUTRON_SEGMENT_TYPE - } - cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=CONF.DEPLOYMENT_MODE, - settings=settings ) attr = self.fuel_web.client.get_cluster_attributes(cluster_id) diff --git a/fuelweb_test/tests/plugins/plugin_example/test_fuel_plugin_example.py b/fuelweb_test/tests/plugins/plugin_example/test_fuel_plugin_example.py index 1a71b7edd..2d988f42a 100644 --- a/fuelweb_test/tests/plugins/plugin_example/test_fuel_plugin_example.py +++ b/fuelweb_test/tests/plugins/plugin_example/test_fuel_plugin_example.py @@ -23,7 +23,6 @@ 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 @@ -157,10 +156,6 @@ class ExamplePlugin(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } ) plugin_name = 'fuel_plugin_example_v3' @@ -298,10 +293,6 @@ class ExamplePlugin(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } ) plugin_name = 'fuel_plugin_example' diff --git a/fuelweb_test/tests/plugins/plugin_glusterfs/test_plugin_glusterfs.py b/fuelweb_test/tests/plugins/plugin_glusterfs/test_plugin_glusterfs.py index c5c7e8a86..f3c4808a8 100644 --- a/fuelweb_test/tests/plugins/plugin_glusterfs/test_plugin_glusterfs.py +++ b/fuelweb_test/tests/plugins/plugin_glusterfs/test_plugin_glusterfs.py @@ -22,8 +22,6 @@ from fuelweb_test.helpers import checkers from fuelweb_test.settings import DEPLOYMENT_MODE from fuelweb_test.settings import GLUSTER_CLUSTER_ENDPOINT from fuelweb_test.settings import GLUSTER_PLUGIN_PATH -from fuelweb_test.settings import NEUTRON_ENABLE -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 @@ -77,18 +75,9 @@ class GlusterfsPlugin(TestBasic): remote, plugin=os.path.basename(GLUSTER_PLUGIN_PATH)) - settings = None - - if NEUTRON_ENABLE: - settings = { - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } - cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings=settings ) plugin_name = 'external_glusterfs' @@ -164,18 +153,9 @@ class GlusterfsPlugin(TestBasic): remote, plugin=os.path.basename(GLUSTER_PLUGIN_PATH)) - settings = None - - if NEUTRON_ENABLE: - settings = { - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } - cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings=settings ) plugin_name = 'external_glusterfs' diff --git a/fuelweb_test/tests/plugins/plugin_influxdb/test_plugin_influxdb.py b/fuelweb_test/tests/plugins/plugin_influxdb/test_plugin_influxdb.py index f4b43acc8..34d6dfcd2 100644 --- a/fuelweb_test/tests/plugins/plugin_influxdb/test_plugin_influxdb.py +++ b/fuelweb_test/tests/plugins/plugin_influxdb/test_plugin_influxdb.py @@ -23,7 +23,6 @@ from fuelweb_test.helpers.decorators import log_snapshot_after_test from fuelweb_test.helpers import checkers from fuelweb_test.settings import DEPLOYMENT_MODE from fuelweb_test.settings import INFLUXDB_GRAFANA_PLUGIN_PATH -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 @@ -66,10 +65,6 @@ class TestInfluxdbPlugin(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE, - } ) plugin_name = 'influxdb_grafana' diff --git a/fuelweb_test/tests/plugins/plugin_lbaas/test_plugin_lbaas.py b/fuelweb_test/tests/plugins/plugin_lbaas/test_plugin_lbaas.py index fcc968f2c..ad00351b2 100644 --- a/fuelweb_test/tests/plugins/plugin_lbaas/test_plugin_lbaas.py +++ b/fuelweb_test/tests/plugins/plugin_lbaas/test_plugin_lbaas.py @@ -24,7 +24,6 @@ from fuelweb_test.helpers import checkers from fuelweb_test import logger from fuelweb_test.settings import DEPLOYMENT_MODE_SIMPLE from fuelweb_test.settings import LBAAS_PLUGIN_PATH -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 @@ -127,10 +126,6 @@ class LbaasPlugin(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE_SIMPLE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE, - } ) plugin_name = 'lbaas' @@ -211,10 +206,6 @@ class LbaasPlugin(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE_SIMPLE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE, - } ) plugin_name = 'lbaas' diff --git a/fuelweb_test/tests/plugins/plugin_lma_collector/test_plugin_lma_collector.py b/fuelweb_test/tests/plugins/plugin_lma_collector/test_plugin_lma_collector.py index eb44d8c28..62262f4bc 100644 --- a/fuelweb_test/tests/plugins/plugin_lma_collector/test_plugin_lma_collector.py +++ b/fuelweb_test/tests/plugins/plugin_lma_collector/test_plugin_lma_collector.py @@ -84,10 +84,6 @@ class TestLmaCollectorPlugin(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=conf.DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": conf.NEUTRON_SEGMENT_TYPE, - } ) influxdb_user = "influxdb" diff --git a/fuelweb_test/tests/plugins/plugin_lma_infra_alerting/test_plugin_lma_infra_alerting.py b/fuelweb_test/tests/plugins/plugin_lma_infra_alerting/test_plugin_lma_infra_alerting.py index 436311fcf..0b9afd6f9 100644 --- a/fuelweb_test/tests/plugins/plugin_lma_infra_alerting/test_plugin_lma_infra_alerting.py +++ b/fuelweb_test/tests/plugins/plugin_lma_infra_alerting/test_plugin_lma_infra_alerting.py @@ -146,10 +146,6 @@ class TestLmaInfraAlertingPlugin(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=conf.DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": conf.NEUTRON_SEGMENT_TYPE, - } ) plugins = [ diff --git a/fuelweb_test/tests/plugins/plugin_reboot/test_plugin_reboot_task.py b/fuelweb_test/tests/plugins/plugin_reboot/test_plugin_reboot_task.py index 1a8239850..0aa3317dc 100644 --- a/fuelweb_test/tests/plugins/plugin_reboot/test_plugin_reboot_task.py +++ b/fuelweb_test/tests/plugins/plugin_reboot/test_plugin_reboot_task.py @@ -20,7 +20,6 @@ from proboscis import test from fuelweb_test.helpers import checkers from fuelweb_test import logger from fuelweb_test.settings import DEPLOYMENT_MODE -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 from fuelweb_test.helpers.fuel_actions import FuelPluginBuilder @@ -85,10 +84,6 @@ class RebootPlugin(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } ) # get plugins from fuel and enable our one msg = "Plugin couldn't be enabled. Check plugin version. Test aborted" @@ -215,10 +210,6 @@ class RebootPlugin(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } ) # get plugins from fuel and enable it msg = "Plugin couldn't be enabled. Check plugin version. Test aborted" diff --git a/fuelweb_test/tests/plugins/plugin_vip_reservation/test_plugin_vip_reservation.py b/fuelweb_test/tests/plugins/plugin_vip_reservation/test_plugin_vip_reservation.py index cdb526929..8b286cbd2 100644 --- a/fuelweb_test/tests/plugins/plugin_vip_reservation/test_plugin_vip_reservation.py +++ b/fuelweb_test/tests/plugins/plugin_vip_reservation/test_plugin_vip_reservation.py @@ -21,7 +21,6 @@ from proboscis import test from fuelweb_test.helpers import checkers from fuelweb_test import logger from fuelweb_test.settings import DEPLOYMENT_MODE -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 from fuelweb_test.helpers.fuel_actions import FuelPluginBuilder @@ -92,10 +91,6 @@ class VipReservation(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } ) # get plugins from fuel and enable our one msg = "Plugin couldn't be enabled. Check plugin version. Test aborted" @@ -221,10 +216,6 @@ class VipReservation(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } ) # get plugins from fuel and enable our one msg = "Plugin couldn't be enabled. Check plugin version. Test aborted" @@ -347,10 +338,6 @@ class VipReservation(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } ) # get plugins from fuel and enable our one msg = "Plugin couldn't be enabled. Check plugin version. Test aborted" diff --git a/fuelweb_test/tests/plugins/plugin_zabbix/test_plugin_zabbix.py b/fuelweb_test/tests/plugins/plugin_zabbix/test_plugin_zabbix.py index a48f0d932..54ebef947 100644 --- a/fuelweb_test/tests/plugins/plugin_zabbix/test_plugin_zabbix.py +++ b/fuelweb_test/tests/plugins/plugin_zabbix/test_plugin_zabbix.py @@ -174,17 +174,9 @@ class ZabbixPlugin(TestBasic): remote, plugin=os.path.basename(conf.ZABBIX_PLUGIN_PATH)) - settings = None - if conf.NEUTRON_ENABLE: - settings = { - "net_provider": "neutron", - "net_segment_type": conf.NEUTRON_SEGMENT_TYPE - } - cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=conf.DEPLOYMENT_MODE, - settings=settings ) zabbix_username = 'admin' @@ -263,18 +255,9 @@ class ZabbixPlugin(TestBasic): remote, plugin=os.path.basename(plugin)) - settings = None - - if conf.NEUTRON_ENABLE: - settings = { - "net_provider": "neutron", - "net_segment_type": conf.NEUTRON_SEGMENT_TYPE - } - cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=conf.DEPLOYMENT_MODE, - settings=settings ) zabbix_username = 'admin' @@ -387,18 +370,9 @@ class ZabbixPlugin(TestBasic): remote, plugin=os.path.basename(plugin)) - settings = None - - if conf.NEUTRON_ENABLE: - settings = { - "net_provider": "neutron", - "net_segment_type": conf.NEUTRON_SEGMENT_TYPE - } - cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=conf.DEPLOYMENT_MODE, - settings=settings ) zabbix_username = 'admin' @@ -478,18 +452,9 @@ class ZabbixPlugin(TestBasic): remote, plugin=os.path.basename(plugin)) - settings = None - - if conf.NEUTRON_ENABLE: - settings = { - "net_provider": "neutron", - "net_segment_type": conf.NEUTRON_SEGMENT_TYPE - } - cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=conf.DEPLOYMENT_MODE, - settings=settings ) zabbix_username = 'admin' diff --git a/fuelweb_test/tests/test_ceph.py b/fuelweb_test/tests/test_ceph.py index 79ebf747a..5340a396f 100644 --- a/fuelweb_test/tests/test_ceph.py +++ b/fuelweb_test/tests/test_ceph.py @@ -29,8 +29,6 @@ from fuelweb_test.helpers.decorators import log_snapshot_after_test from fuelweb_test.helpers.ovs import ovs_get_tag_by_port from fuelweb_test import ostf_test_mapping as map_ostf from fuelweb_test import settings -from fuelweb_test.settings import NEUTRON_ENABLE -from fuelweb_test.settings import NEUTRON_SEGMENT_TYPE from fuelweb_test import logger from fuelweb_test.tests.base_test_case import SetupEnvironment from fuelweb_test.tests.base_test_case import TestBasic @@ -67,11 +65,10 @@ class CephCompact(TestBasic): 'volumes_lvm': False, 'tenant': 'ceph1', 'user': 'ceph1', - 'password': 'ceph1' + 'password': 'ceph1', + 'net_provider': 'neutron', + 'net_segment_type': settings.NEUTRON_SEGMENT['vlan'] } - if NEUTRON_ENABLE: - data["net_provider"] = 'neutron' - data["net_segment_type"] = settings.NEUTRON_SEGMENT['vlan'] cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, @@ -250,27 +247,22 @@ class CephHA(TestBasic): self.env.revert_snapshot("ready") self.env.bootstrap_nodes( self.env.d_env.nodes().slaves[:6]) - csettings = {} - if settings.NEUTRON_ENABLE: - csettings = { - "net_provider": 'neutron', - "net_segment_type": settings.NEUTRON_SEGMENT['vlan'] - } - csettings.update( - { - 'volumes_ceph': True, - 'images_ceph': True, - 'volumes_lvm': False, - 'tenant': 'cephHA', - 'user': 'cephHA', - 'password': 'cephHA', - 'osd_pool_size': "3" - } - ) + + data = { + 'volumes_ceph': True, + 'images_ceph': True, + 'volumes_lvm': False, + 'tenant': 'cephHA', + 'user': 'cephHA', + 'password': 'cephHA', + 'osd_pool_size': "3", + 'net_provider': 'neutron', + 'net_segment_type': settings.NEUTRON_SEGMENT['vlan'] + } cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=settings.DEPLOYMENT_MODE, - settings=csettings + settings=data ) self.fuel_web.update_nodes( cluster_id, @@ -481,8 +473,6 @@ class CephRadosGW(TestBasic): 'volumes_ceph': True, 'images_ceph': True, 'objects_ceph': True, - 'net_provider': 'neutron', - 'net_segment_type': NEUTRON_SEGMENT_TYPE, 'tenant': 'rados', 'user': 'rados', 'password': 'rados' @@ -578,8 +568,6 @@ class VmBackedWithCephMigrationBasic(TestBasic): 'images_ceph': True, 'ephemeral_ceph': True, 'volumes_lvm': False, - 'net_provider': 'neutron', - 'net_segment_type': NEUTRON_SEGMENT_TYPE, } ) @@ -841,8 +829,6 @@ class CheckCephPartitionsAfterReboot(TestBasic): 'images_ceph': True, 'ephemeral_ceph': True, 'volumes_lvm': False, - 'net_provider': 'neutron', - 'net_segment_type': NEUTRON_SEGMENT_TYPE, } ) diff --git a/fuelweb_test/tests/test_custom_hostname.py b/fuelweb_test/tests/test_custom_hostname.py index bb8402366..d2b4a5721 100644 --- a/fuelweb_test/tests/test_custom_hostname.py +++ b/fuelweb_test/tests/test_custom_hostname.py @@ -55,10 +55,6 @@ class CustomHostname(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=settings.DEPLOYMENT_MODE_HA, - settings={ - 'net_provider': 'neutron', - 'net_segment_type': settings.NEUTRON_SEGMENT_TYPE, - } ) self.fuel_web.update_nodes( cluster_id, @@ -125,10 +121,6 @@ class CustomHostname(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=settings.DEPLOYMENT_MODE, - settings={ - 'net_provider': 'neutron', - 'net_segment_type': settings.NEUTRON_SEGMENT_TYPE - } ) self.fuel_web.update_nodes( cluster_id, @@ -276,10 +268,6 @@ class CustomHostname(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=settings.DEPLOYMENT_MODE, - settings={ - 'net_provider': 'neutron', - 'net_segment_type': settings.NEUTRON_SEGMENT_TYPE - } ) self.fuel_web.update_nodes(cluster_id, {'slave-01': ['controller']}) diff --git a/fuelweb_test/tests/test_environment_action.py b/fuelweb_test/tests/test_environment_action.py index 371689075..2b69870e6 100644 --- a/fuelweb_test/tests/test_environment_action.py +++ b/fuelweb_test/tests/test_environment_action.py @@ -60,8 +60,6 @@ class EnvironmentAction(base_test_case.TestBasic): 'tenant': 'stop_deploy', 'user': 'stop_deploy', 'password': 'stop_deploy', - "net_provider": 'neutron', - "net_segment_type": hlp_data.NEUTRON_SEGMENT_TYPE } ) self.fuel_web.update_nodes( @@ -121,10 +119,6 @@ class EnvironmentAction(base_test_case.TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=hlp_data.DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": hlp_data.NEUTRON_SEGMENT_TYPE - } ) self.fuel_web.update_nodes( cluster_id, @@ -187,10 +181,6 @@ class EnvironmentAction(base_test_case.TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=hlp_data.DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": hlp_data.NEUTRON_SEGMENT_TYPE - } ) self.fuel_web.update_nodes( cluster_id, @@ -245,10 +235,6 @@ class EnvironmentActionOnHA(base_test_case.TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=hlp_data.DEPLOYMENT_MODE_HA, - settings={ - "net_provider": 'neutron', - "net_segment_type": hlp_data.NEUTRON_SEGMENT_TYPE - } ) self.fuel_web.update_nodes( cluster_id, diff --git a/fuelweb_test/tests/test_ha_one_controller.py b/fuelweb_test/tests/test_ha_one_controller.py index dc1b97e7b..3b0dfc7da 100644 --- a/fuelweb_test/tests/test_ha_one_controller.py +++ b/fuelweb_test/tests/test_ha_one_controller.py @@ -65,10 +65,6 @@ class OneNodeDeploy(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } ) logger.info('cluster is %s' % str(cluster_id)) self.fuel_web.update_nodes( @@ -223,8 +219,6 @@ class HAOneControllerNeutron(HAOneControllerNeutronBase): 'tenant': 'neutronAddCompute', 'user': 'neutronAddCompute', 'password': 'neutronAddCompute', - 'net_provider': 'neutron', - 'net_segment_type': NEUTRON_SEGMENT_TYPE } cluster_id = self.fuel_web.create_cluster( @@ -362,8 +356,6 @@ class MultiroleControllerCinder(TestBasic): 'tenant': 'multirolecinder', 'user': 'multirolecinder', 'password': 'multirolecinder', - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE } cluster_id = self.fuel_web.create_cluster( @@ -414,10 +406,6 @@ class MultiroleComputeCinder(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } ) self.fuel_web.update_nodes( cluster_id, @@ -493,8 +481,6 @@ class MultiroleMultipleServices(TestBasic): name=self.__class__.__name__, mode=DEPLOYMENT_MODE, settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE, 'sahara': True, 'murano': True, 'ceilometer': True, @@ -550,18 +536,18 @@ class FloatingIPs(TestBasic): # Test should be re-worked for neutron according to LP#1481322 self.env.revert_snapshot("ready_with_3_slaves") - settings = { + csettings = { 'tenant': 'floatingip', 'user': 'floatingip', 'password': 'floatingip', - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE + 'net_provider': 'neutron', + 'net_segment_type': NEUTRON_SEGMENT_TYPE, } cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings=settings + settings=csettings, ) self.fuel_web.update_nodes( cluster_id, @@ -584,9 +570,9 @@ class FloatingIPs(TestBasic): os_conn = os_actions.OpenStackActions( self.fuel_web.get_public_vip(cluster_id), - user=settings['user'], - passwd=settings['password'], - tenant=settings['tenant']) + user=csettings['user'], + passwd=csettings['password'], + tenant=csettings['tenant']) # assert ips expected_ips = self.fuel_web.get_floating_ranges()[1][0] @@ -641,10 +627,6 @@ class NodeMultipleInterfaces(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } ) self.fuel_web.update_nodes( cluster_id, diff --git a/fuelweb_test/tests/test_ha_one_controller_base.py b/fuelweb_test/tests/test_ha_one_controller_base.py index 80f23c89a..32088f0ef 100644 --- a/fuelweb_test/tests/test_ha_one_controller_base.py +++ b/fuelweb_test/tests/test_ha_one_controller_base.py @@ -14,7 +14,6 @@ from fuelweb_test.helpers import os_actions from fuelweb_test.settings import DEPLOYMENT_MODE -from fuelweb_test.settings import NEUTRON_SEGMENT_TYPE from fuelweb_test.tests.base_test_case import TestBasic @@ -29,8 +28,6 @@ class HAOneControllerNeutronBase(TestBasic): 'tenant': 'neutronOneController', 'user': 'neutronOneController', 'password': 'neutronOneController', - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE } cluster_id = self.fuel_web.create_cluster( diff --git a/fuelweb_test/tests/test_net_templates.py b/fuelweb_test/tests/test_net_templates.py index 56aeb629e..4813a8c9a 100644 --- a/fuelweb_test/tests/test_net_templates.py +++ b/fuelweb_test/tests/test_net_templates.py @@ -63,8 +63,6 @@ class TestNetworkTemplates(TestNetworkTemplatesBase): name=self.__class__.__name__, mode=DEPLOYMENT_MODE_HA, settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT[NEUTRON_SEGMENT_TYPE], 'tenant': 'netTemplate', 'user': 'netTemplate', 'password': 'netTemplate', @@ -151,8 +149,6 @@ class TestNetworkTemplates(TestNetworkTemplatesBase): 'volumes_lvm': False, 'ephemeral_ceph': True, 'objects_ceph': True, - 'net_provider': 'neutron', - 'net_segment_type': NEUTRON_SEGMENT[NEUTRON_SEGMENT_TYPE], 'tenant': 'netTemplate', 'user': 'netTemplate', 'password': 'netTemplate', @@ -416,7 +412,7 @@ class TestNetworkTemplates(TestNetworkTemplatesBase): mode=DEPLOYMENT_MODE_HA, settings={ "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT[NEUTRON_SEGMENT_TYPE], + "net_segment_type": NEUTRON_SEGMENT_TYPE, 'tenant': 'netTemplate', 'user': 'netTemplate', 'password': 'netTemplate', diff --git a/fuelweb_test/tests/test_node_reinstallation.py b/fuelweb_test/tests/test_node_reinstallation.py index 266ac3166..be3d6820e 100644 --- a/fuelweb_test/tests/test_node_reinstallation.py +++ b/fuelweb_test/tests/test_node_reinstallation.py @@ -23,7 +23,6 @@ from fuelweb_test.helpers.decorators import log_snapshot_after_test from fuelweb_test.helpers import os_actions from fuelweb_test import logger from fuelweb_test.settings import DEPLOYMENT_MODE -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 @@ -63,8 +62,6 @@ class NodeReinstallationEnv(TestBasic): mode=DEPLOYMENT_MODE, settings={ 'ceilometer': True, - 'net_provider': 'neutron', - 'net_segment_type': NEUTRON_SEGMENT_TYPE, } ) @@ -105,8 +102,6 @@ class NodeReinstallationEnv(TestBasic): mode=DEPLOYMENT_MODE, settings={ 'ceilometer': True, - 'net_provider': 'neutron', - 'net_segment_type': NEUTRON_SEGMENT_TYPE, } ) diff --git a/fuelweb_test/tests/test_pullrequest.py b/fuelweb_test/tests/test_pullrequest.py index d06dee550..f069c307a 100644 --- a/fuelweb_test/tests/test_pullrequest.py +++ b/fuelweb_test/tests/test_pullrequest.py @@ -15,8 +15,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.settings import DEPLOYMENT_MODE from fuelweb_test.tests.base_test_case import SetupEnvironment from fuelweb_test.tests.base_test_case import TestBasic @@ -43,18 +42,9 @@ class TestPullRequest(TestBasic): """ self.env.revert_snapshot("ready_with_3_slaves") - settings = None - - if NEUTRON_ENABLE: - settings = { - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT['tun'] - } - cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings=settings ) self.fuel_web.update_nodes( cluster_id, diff --git a/fuelweb_test/tests/test_ubuntu_bootstrap.py b/fuelweb_test/tests/test_ubuntu_bootstrap.py index ce5422416..1aab2fd48 100644 --- a/fuelweb_test/tests/test_ubuntu_bootstrap.py +++ b/fuelweb_test/tests/test_ubuntu_bootstrap.py @@ -22,7 +22,6 @@ from fuelweb_test.helpers.decorators import log_snapshot_after_test from fuelweb_test.helpers.utils import run_on_remote from fuelweb_test import settings from fuelweb_test import logger -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 @@ -115,8 +114,6 @@ class UbuntuBootstrap(TestBasic): 'tenant': 'stop_deploy', 'user': 'stop_deploy', 'password': 'stop_deploy', - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE } ) self.fuel_web.update_nodes( diff --git a/fuelweb_test/tests/test_zabbix.py b/fuelweb_test/tests/test_zabbix.py index 46d977f2f..694bca98e 100644 --- a/fuelweb_test/tests/test_zabbix.py +++ b/fuelweb_test/tests/test_zabbix.py @@ -73,8 +73,6 @@ class HAOneControllerZabbix(TestBasic): 'tenant': 'admin', 'user': 'admin', 'password': 'admin', - 'net_provider': 'neutron', - 'net_segment_type': hlp.NEUTRON_SEGMENT_TYPE, } ) self.fuel_web.update_nodes( diff --git a/fuelweb_test/tests/tests_patching/test_patching.py b/fuelweb_test/tests/tests_patching/test_patching.py index 3e103316d..0e3e67563 100644 --- a/fuelweb_test/tests/tests_patching/test_patching.py +++ b/fuelweb_test/tests/tests_patching/test_patching.py @@ -436,8 +436,6 @@ class PatchingMasterTests(TestBasic): name=self.__class__.__name__, mode=settings.DEPLOYMENT_MODE, settings={ - "net_provider": 'neutron', - "net_segment_type": settings.NEUTRON_SEGMENT_TYPE, 'tenant': 'patchingMaster', 'user': 'patchingMaster', 'password': 'patchingMaster' diff --git a/fuelweb_test/tests/tests_strength/test_cic_maintenance_mode.py b/fuelweb_test/tests/tests_strength/test_cic_maintenance_mode.py index ef8fc6172..662f57356 100644 --- a/fuelweb_test/tests/tests_strength/test_cic_maintenance_mode.py +++ b/fuelweb_test/tests/tests_strength/test_cic_maintenance_mode.py @@ -53,8 +53,6 @@ class CICMaintenanceMode(TestBasic): self.env.revert_snapshot("ready_with_5_slaves") data = { 'ceilometer': True, - 'net_provider': 'neutron', - 'net_segment_type': settings.NEUTRON_SEGMENT_TYPE } cluster_id = self.fuel_web.create_cluster( diff --git a/fuelweb_test/tests/tests_strength/test_failover_base.py b/fuelweb_test/tests/tests_strength/test_failover_base.py index 5c95e824e..4e9dbc2f2 100644 --- a/fuelweb_test/tests/tests_strength/test_failover_base.py +++ b/fuelweb_test/tests/tests_strength/test_failover_base.py @@ -39,7 +39,6 @@ from fuelweb_test.settings import DEPLOYMENT_MODE from fuelweb_test.settings import DNS from fuelweb_test.settings import DNS_SUFFIX from fuelweb_test.settings import DOWNLOAD_LINK -from fuelweb_test.settings import NEUTRON_SEGMENT_TYPE from fuelweb_test.settings import OPENSTACK_RELEASE from fuelweb_test.settings import OPENSTACK_RELEASE_UBUNTU from fuelweb_test.settings import REPEAT_COUNT @@ -57,15 +56,9 @@ class TestHaFailoverBase(TestBasic): self.env.bootstrap_nodes( self.env.d_env.nodes().slaves[5:6]) - settings = { - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } - cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings=settings ) self.fuel_web.update_nodes( cluster_id, @@ -95,8 +88,6 @@ class TestHaFailoverBase(TestBasic): 'volumes_ceph': True, 'images_ceph': True, 'volumes_lvm': False, - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE } cluster_id = self.fuel_web.create_cluster( diff --git a/fuelweb_test/tests/tests_strength/test_master_node_failover.py b/fuelweb_test/tests/tests_strength/test_master_node_failover.py index 3b23586b8..fc017fdbf 100644 --- a/fuelweb_test/tests/tests_strength/test_master_node_failover.py +++ b/fuelweb_test/tests/tests_strength/test_master_node_failover.py @@ -80,10 +80,6 @@ class DeployHAOneControllerMasterNodeFail(base_test_case.TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=settings.DEPLOYMENT_MODE, - settings={ - 'net_provider': 'neutron', - 'net_segment_type': settings.NEUTRON_SEGMENT_TYPE - } ) self.fuel_web.update_nodes( cluster_id, @@ -165,8 +161,6 @@ class DeployHAOneControllerMasterNodeFail(base_test_case.TestBasic): net_provider_data = { 'ntp_list': settings.EXTERNAL_NTP, 'dns_list': external_dns, - "net_provider": 'neutron', - "net_segment_type": settings.NEUTRON_SEGMENT_TYPE } cluster_id = self.fuel_web.create_cluster( diff --git a/fuelweb_test/tests/tests_strength/test_restart.py b/fuelweb_test/tests/tests_strength/test_restart.py index 89987023d..9470a20c6 100644 --- a/fuelweb_test/tests/tests_strength/test_restart.py +++ b/fuelweb_test/tests/tests_strength/test_restart.py @@ -17,7 +17,6 @@ from fuelweb_test.helpers.decorators import log_snapshot_after_test from fuelweb_test import logger from fuelweb_test import ostf_test_mapping as map_ostf from fuelweb_test.settings import DEPLOYMENT_MODE -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 @@ -230,10 +229,6 @@ class HAOneControllerNeutronRestart(TestBasic): cluster_id = self.fuel_web.create_cluster( name=self.__class__.__name__, mode=DEPLOYMENT_MODE, - settings={ - "net_provider": 'neutron', - "net_segment_type": NEUTRON_SEGMENT_TYPE - } ) self.fuel_web.update_nodes( cluster_id,