diff --git a/doc/base_tests.rst b/doc/base_tests.rst index d1d48acbe..ce4dd51d8 100644 --- a/doc/base_tests.rst +++ b/doc/base_tests.rst @@ -322,11 +322,6 @@ Test Ubuntu Cloud Archive .. automodule:: fuelweb_test.tests.tests_uca.test_uca :members: -Test Vcenter ------------- -.. automodule:: fuelweb_test.tests.test_vcenter - :members: - Test Ironic ----------- .. automodule:: fuelweb_test.tests.test_ironic_base diff --git a/doc/system_tests.rst b/doc/system_tests.rst index 38d3b56b9..0d07275a7 100644 --- a/doc/system_tests.rst +++ b/doc/system_tests.rst @@ -59,11 +59,6 @@ Strength actions .. automodule:: system_test.actions.strength_actions :members: -VCenter actions ---------------- -.. automodule:: system_test.actions.vcenter_actions - :members: - General tests ============= @@ -133,24 +128,6 @@ Example plugin v3 .. automodule:: system_test.tests.plugins.plugin_example.test_plugin_example_v3 :members: -vCenter tests -============= - -vCenter/DVS ------------ -.. automodule:: system_test.tests.vcenter.test_vcenter_dvs - :members: - -vCenter/DVS failover --------------------- -.. automodule:: system_test.tests.vcenter.test_vcenter_failover - :members: - -vCenter/DVS cluster actions ---------------------------- -.. automodule:: system_test.tests.vcenter.test_vcenter_cluster_actions - :members: - Helpers ======= diff --git a/fuelweb_test/helpers/utils.py b/fuelweb_test/helpers/utils.py index dd6a17841..b3a36d008 100644 --- a/fuelweb_test/helpers/utils.py +++ b/fuelweb_test/helpers/utils.py @@ -1182,9 +1182,9 @@ class SettingsChanger(object): 'repo_setup.uca_openstack_release', 'repo_setup.uca_repo_url', 'public_ssl.cert_source', 'public_ssl.hostname', 'operator_user.homedir', 'access.email', 'common.libvirt_type', - 'storage.images_vcenter', 'additional_components.ironic', - 'additional_components.ceilometer', 'workloads_collector.tenant', - 'access.user', 'workloads_collector.user', 'operator_user.name'] + 'additional_components.ironic', 'additional_components.ceilometer', + 'workloads_collector.tenant', 'access.user', + 'workloads_collector.user', 'operator_user.name'] def __init__(self, attrs=None): self._attrs = attrs['editable'] if attrs else None diff --git a/fuelweb_test/models/fuel_web_client.py b/fuelweb_test/models/fuel_web_client.py index 96cf2f8b2..f06c36dda 100644 --- a/fuelweb_test/models/fuel_web_client.py +++ b/fuelweb_test/models/fuel_web_client.py @@ -97,11 +97,6 @@ from fuelweb_test.settings import SSL_CN from fuelweb_test.settings import TIMEOUT from fuelweb_test.settings import UCA_ENABLED from fuelweb_test.settings import USER_OWNED_CERT -from fuelweb_test.settings import VCENTER_DATACENTER -from fuelweb_test.settings import VCENTER_DATASTORE -from fuelweb_test.settings import VCENTER_IP -from fuelweb_test.settings import VCENTER_PASSWORD -from fuelweb_test.settings import VCENTER_USERNAME from fuelweb_test.settings import UBUNTU_SERVICE_PROVIDER @@ -603,7 +598,7 @@ class FuelWebClient29(object): elif option in {'volumes_ceph', 'images_ceph', 'ephemeral_ceph', 'objects_ceph', 'osd_pool_size', 'volumes_lvm', - 'volumes_block_device', 'images_vcenter'}: + 'volumes_block_device'}: section = 'storage' elif option in {'tenant', 'password', 'user'}: section = 'access' @@ -681,11 +676,6 @@ class FuelWebClient29(object): hpv_data = attributes['editable']['common']['libvirt_type'] hpv_data['value'] = "kvm" - if help_data.VCENTER_USE: - logger.info('Enable Dual Hypervisors Mode') - hpv_data = attributes['editable']['common']['use_vcenter'] - hpv_data['value'] = True - if NOVA_QUOTAS_ENABLED: logger.info('Enable Nova quotas') nova_quotas = attributes['editable']['common']['nova_quota'] @@ -764,76 +754,6 @@ class FuelWebClient29(object): "with next attributes {0}".format(attributes)) self.client.update_cluster_attributes(cluster_id, attributes) - @logwrap - def vcenter_configure(self, cluster_id, vcenter_value=None, - multiclusters=None, vc_glance=None, - target_node_1='controllers', - target_node_2='controllers'): - - if not vcenter_value: - vcenter_value = { - "glance": { - "vcenter_username": "", - "datacenter": "", - "vcenter_host": "", - "vcenter_password": "", - "datastore": "", - "vcenter_insecure": True}, - "availability_zones": [ - {"vcenter_username": VCENTER_USERNAME, - "nova_computes": [ - {"datastore_regex": ".*", - "vsphere_cluster": "Cluster1", - "service_name": "vmcluster1", - "target_node": { - "current": {"id": target_node_1, - "label": target_node_1}, - "options": [{"id": "controllers", - "label": "controllers"}, ]}, - }, - - ], - "vcenter_host": VCENTER_IP, - "az_name": "vcenter", - "vcenter_password": VCENTER_PASSWORD, - "vcenter_insecure": True - - }], - "network": {"esxi_vlan_interface": "vmnic0"} - } - if multiclusters: - multiclusters =\ - vcenter_value["availability_zones"][0]["nova_computes"] - multiclusters.append( - {"datastore_regex": ".*", - "vsphere_cluster": "Cluster2", - "service_name": "vmcluster2", - "target_node": { - "current": {"id": target_node_2, - "label": target_node_2}, - "options": [{"id": "controllers", - "label": "controllers"}, ]}, - }) - if vc_glance: - vcenter_value["glance"]["vcenter_username"] = VCENTER_USERNAME - vcenter_value["glance"]["datacenter"] = VCENTER_DATACENTER - vcenter_value["glance"]["vcenter_host"] = VCENTER_IP - vcenter_value["glance"]["vcenter_password"] = VCENTER_PASSWORD - vcenter_value["glance"]["datastore"] = VCENTER_DATASTORE - - if help_data.VCENTER_USE: - logger.info('Configuring vCenter...') - vmware_attributes = \ - self.client.get_cluster_vmware_attributes(cluster_id) - vcenter_data = vmware_attributes['editable'] - vcenter_data['value'] = vcenter_value - logger.debug("Try to update cluster with next " - "vmware_attributes {0}".format(vmware_attributes)) - self.client.update_cluster_vmware_attributes(cluster_id, - vmware_attributes) - - logger.debug("Attributes of cluster were updated") - def add_local_ubuntu_mirror(self, cluster_id, name='Auxiliary', path=help_data.LOCAL_MIRROR_UBUNTU, suite='auxiliary', section='main', diff --git a/fuelweb_test/models/nailgun_client.py b/fuelweb_test/models/nailgun_client.py index 597645459..944b59e40 100644 --- a/fuelweb_test/models/nailgun_client.py +++ b/fuelweb_test/models/nailgun_client.py @@ -88,11 +88,6 @@ class NailgunClient(object): return self._get( url="/clusters/{}/attributes/".format(cluster_id)).json() - def get_cluster_vmware_attributes(self, cluster_id): - return self._get( - url="/clusters/{}/vmware_attributes/".format(cluster_id), - ).json() - @logwrap def update_cluster_attributes(self, cluster_id, attrs): return self._put( @@ -100,13 +95,6 @@ class NailgunClient(object): json=attrs ).json() - @logwrap - def update_cluster_vmware_attributes(self, cluster_id, attrs): - return self._put( - "/clusters/{}/vmware_attributes/".format(cluster_id), - json=attrs - ).json() - @logwrap def get_cluster(self, cluster_id): return self._get(url="/clusters/{}".format(cluster_id)).json() diff --git a/fuelweb_test/settings.py b/fuelweb_test/settings.py index 09f8ca3ed..71e5f1b87 100644 --- a/fuelweb_test/settings.py +++ b/fuelweb_test/settings.py @@ -368,28 +368,8 @@ PATCH_PATH = os.environ.get( 'PATCH_PATH', '/tmp/fuel-ostf') KVM_USE = get_var_as_bool('KVM_USE', False) -VCENTER_USE = get_var_as_bool('VCENTER_USE', False) DEBUG_MODE = get_var_as_bool('DEBUG_MODE', True) -# vCenter tests -VCENTER_IP = os.environ.get('VCENTER_IP') -VCENTER_USERNAME = os.environ.get('VCENTER_USERNAME') -VCENTER_PASSWORD = os.environ.get('VCENTER_PASSWORD') -VCENTER_CERT_BYPASS = get_var_as_bool('VCENTER_CERT_BYPASS', True) -VCENTER_CERT_URL = os.environ.get('VCENTER_CERT_URL') -VCENTER_DATACENTER = os.environ.get('VC_DATACENTER') -VCENTER_DATASTORE = os.environ.get('VC_DATASTORE') -VCENTER_GLANCE_IP = os.environ.get('VCENTER_GLANCE_IP') -VCENTER_GLANCE_USERNAME = os.environ.get('VCENTER_GLANCE_USERNAME') -VCENTER_GLANCE_PASSWORD = os.environ.get('VCENTER_GLANCE_PASSWORD') -VCENTER_GLANCE_CERT_BYPASS = get_var_as_bool('VCENTER_GLANCE_CERT_BYPASS', - True) -VCENTER_GLANCE_CERT_URL = os.environ.get('VCENTER_GLANCE_CERT_URL') -VMWARE_IMG_URL = os.environ.get('VMWARE_IMG_URL') -VMWARE_IMG_NAME = os.environ.get('VMWARE_IMG_NAME') -VMWARE_IMG_LOGIN = os.environ.get('VMWARE_IMG_LOGIN') -VMWARE_IMG_PASSWORD = os.environ.get('VMWARE_IMG_PASSWORD') - # Services tests SERVTEST_LOCAL_PATH = os.environ.get('SERVTEST_LOCAL_PATH', '/tmp') SERVTEST_USERNAME = os.environ.get('SERVTEST_USERNAME', 'admin') @@ -510,8 +490,6 @@ PLUGIN_PACKAGE_VERSION = os.environ.get('PLUGIN_PACKAGE_VERSION', '') CONTRAIL_PLUGIN_PATH = os.environ.get('CONTRAIL_PLUGIN_PATH') CONTRAIL_PLUGIN_PACK_UB_PATH = os.environ.get('CONTRAIL_PLUGIN_PACK_UB_PATH') CONTRAIL_PLUGIN_PACK_CEN_PATH = os.environ.get('CONTRAIL_PLUGIN_PACK_CEN_PATH') -DVS_PLUGIN_PATH = os.environ.get('DVS_PLUGIN_PATH') -DVS_PLUGIN_VERSION = os.environ.get('DVS_PLUGIN_VERSION') GLUSTER_PLUGIN_PATH = os.environ.get('GLUSTER_PLUGIN_PATH') GLUSTER_CLUSTER_ENDPOINT = os.environ.get('GLUSTER_CLUSTER_ENDPOINT') EXAMPLE_PLUGIN_PATH = os.environ.get('EXAMPLE_PLUGIN_PATH') diff --git a/fuelweb_test/tests/test_vcenter.py b/fuelweb_test/tests/test_vcenter.py deleted file mode 100644 index 5b2d26b32..000000000 --- a/fuelweb_test/tests/test_vcenter.py +++ /dev/null @@ -1,1744 +0,0 @@ -# Copyright 2014 Mirantis, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from proboscis import test -from proboscis.asserts import assert_true -from devops.helpers.ssh_client import SSHAuth -from devops.helpers.helpers import wait -from devops.error import TimeoutError - -from fuelweb_test.helpers.decorators import log_snapshot_after_test -from fuelweb_test import logger -from fuelweb_test.settings import DEPLOYMENT_MODE -from fuelweb_test.settings import SERVTEST_USERNAME -from fuelweb_test.settings import SERVTEST_PASSWORD -from fuelweb_test.settings import SERVTEST_TENANT -from fuelweb_test.settings import SSH_IMAGE_CREDENTIALS -from fuelweb_test.settings import iface_alias -from fuelweb_test.tests.base_test_case import SetupEnvironment -from fuelweb_test.tests.base_test_case import TestBasic -from fuelweb_test.helpers import os_actions - -cirros_auth = SSHAuth(**SSH_IMAGE_CREDENTIALS) - - -@test(groups=["vcenter"]) -class VcenterDeploy(TestBasic): - """VcenterDeploy.""" # TODO documentation - - def node_name(self, name_node): - return self.fuel_web.get_nailgun_node_by_name(name_node)['hostname'] - - @staticmethod - def create_vm(os_conn=None, vm_count=None): - # Get list of available images,flavors and hypervisors - images_list = os_conn.nova.images.list() - flavors_list = os_conn.nova.flavors.list() - hypervisors_list = os_conn.get_hypervisors() - # Create VMs on each of hypervisor - for image in images_list: - for i in range(0, vm_count): - if image.name == 'TestVM-VMDK': - os_conn.nova.servers.create( - flavor=flavors_list[0], - name='test_{0}_{1}'.format(image.name, i), image=image, - availability_zone='vcenter') - else: - os_conn.nova.servers.create( - flavor=flavors_list[0], - name='test_{0}_{1}'.format(image.name, i), image=image) - - # Wait for launch VMs - for hypervisor in hypervisors_list: - wait(lambda: os_conn.get_hypervisor_vms_count(hypervisor) != 0, - timeout=300, - timeout_msg='Timeout while waiting VM to be listed ' - 'in hypervisor') - - def configure_nova_vlan(self, cluster_id): - # Configure network interfaces. - # Public and Fixed networks are on the same interface - # because Nova will use the same vSwitch for PortGroups creating - # as a ESXi management interface is located in. - interfaces = { - iface_alias('eth0'): ["fuelweb_admin"], - iface_alias('eth1'): ["public", "fixed"], - iface_alias('eth2'): ["management", ], - iface_alias('eth3'): [], - iface_alias('eth4'): ["storage"] - } - - slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id) - for node in slave_nodes: - self.fuel_web.update_node_networks(node['id'], interfaces) - - # Configure Nova-Network VLanManager. - self.fuel_web.update_vlan_network_fixed( - cluster_id, amount=8, network_size=32) - - @test(depends_on=[SetupEnvironment.prepare_slaves_5], - groups=["vcenter_bvt"]) - @log_snapshot_after_test - def vcenter_bvt(self): - """Deploy environment in HA with cinder-vmware, compute-vmware, \ - vCenter as backend for glance and multiple clusters. - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Set VMWare vCenter/ESXi datastore for images (Glance) - 4. Add nodes with following roles: - controller - controller - controller + cinder-vmware - compute-vmware - compute + cinder - 5. Assign vCenter cluster(s) to: - controller - compute-vmware - 6. Deploy the cluster - 7. Run network verification - 8. Run OSTF - - Duration: 2h - - """ - self.env.revert_snapshot("ready_with_5_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE, - settings={'images_vcenter': True}) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['controller'], - 'slave-03': ['cinder-vmware', 'controller'], - 'slave-04': ['compute-vmware'], - 'slave-05': ['compute', 'cinder'] - } - ) - - # Configure VMWare vCenter settings - target_node_1 = self.node_name('slave-04') - self.configure_nova_vlan(cluster_id) - self.fuel_web.vcenter_configure( - cluster_id, multiclusters=True, vc_glance=True, - target_node_1=target_node_1 - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke', 'ha']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_1], - groups=["smoke", "vcenter_smoke"]) - @log_snapshot_after_test - def vcenter_smoke(self): - """Deploy dual hypervisors cluster with controller node only - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network FlatDHCP Manager as a network backend - 3. Add nodes with following roles: - controller - 4. Assign vCenter cluster(s) to: - controller - 5. Deploy the cluster - 6. Run OSTF - - Duration: 1h 40min - - """ - self.env.revert_snapshot("ready_with_1_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - {'slave-01': ['controller']}) - - # Configure VMWare vCenter settings - self.fuel_web.vcenter_configure(cluster_id) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke', 'ha']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_3], - groups=["vcenter_cindervmdk"]) - @log_snapshot_after_test - def vcenter_cindervmdk(self): - """Deploy environment with vCenter and CinderVMDK - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network FlatDHCP Manager as a network backend - 3. Add nodes with following roles: - controller - cinder-vmware - 4. Assign vCenter cluster(s) to: - controller - 5. Deploy the cluster - 6. Run network verification - 7. Run OSTF - - Duration: 1h 40min - - """ - self.env.revert_snapshot("ready_with_3_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['cinder-vmware'] - } - ) - - # Configure VMWare vCenter settings - self.fuel_web.vcenter_configure(cluster_id) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke', 'ha']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_3], - groups=["vcenter_cindervmdk_and_computevmware"]) - @log_snapshot_after_test - def vcenter_cindervmdk_and_computevmware(self): - """Deploy environment with vCenter, CinderVMDK and ComputeVMWare - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network FlatDHCP Manager as a network backend - 3. Add nodes with following roles: - controller - cinder-vmware - compute-vmware - 4. Assign vCenter cluster(s) to: - controller - 5. Deploy the cluster - 6. Run network verification - 7. Run OSTF - - Duration: 1h 40min - - """ - self.env.revert_snapshot("ready_with_3_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['cinder-vmware'], - 'slave-03': ['compute-vmware'] - } - ) - - # Configure VMWare vCenter settings - target_node_1 = self.node_name('slave-03') - self.fuel_web.vcenter_configure( - cluster_id, - target_node_1=target_node_1, - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke', 'ha']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_3], - groups=["vcenter_computevmware"]) - @log_snapshot_after_test - def vcenter_computevmware(self): - """Deploy environment with vCenter and compute-vmware - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network FlatDHCP Manager as a network backend - 3. Add nodes with following roles: - controller - compute-vmware - 4. Assign vCenter cluster(s) to: - compute-vmware - 5. Deploy the cluster - 6. Run network verification - 7. Run OSTF - - Duration: 1h 40min - - """ - self.env.revert_snapshot("ready_with_3_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['compute-vmware'] - } - ) - - # Configure VMWare vCenter settings - target_node_1 = self.node_name('slave-02') - self.fuel_web.vcenter_configure( - cluster_id, - target_node_1=target_node_1, - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_1], - groups=["vcenter_glance_backend"]) - @log_snapshot_after_test - def vcenter_glance_backend(self): - """Deploy environment with VMWare vCenter/ESXi datastore as backend / - for glance - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Set VMWare vCenter/ESXi datastore for images (Glance) - 4. Add nodes with following roles: - controller - 5. Assign vCenter cluster(s) to: - controller - 6. Deploy the cluster - 7. Run OSTF - - Duration: 1h 40min - - """ - self.env.revert_snapshot("ready_with_1_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE, - settings={'images_vcenter': True, - 'images_ceph': False}) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'] - } - ) - - # Configure VMWare vCenter settings - self.fuel_web.vcenter_configure(cluster_id, vc_glance=True) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_3], - groups=["vcenter_glance_backend_and_computevmware"]) - @log_snapshot_after_test - def vcenter_glance_backend_and_computevmware(self): - """Deploy environment with VMWare vCenter/ESXi datastore as backend / - for glance and compute-vmware - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Set VMWare vCenter/ESXi datastore for images (Glance) - 4. Add nodes with following roles: - controller - compute-vmware - 5. Assign vCenter cluster(s) to: - compute-vmware - 6. Deploy the cluster - 7. Run network verification - 8. Run OSTF - - Duration: ?h - - """ - self.env.revert_snapshot("ready_with_3_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE, - settings={'images_vcenter': True, - 'images_ceph': False}) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['compute-vmware'] - } - ) - - # Configure VMWare vCenter settings - target_node_1 = self.node_name('slave-02') - self.fuel_web.vcenter_configure( - cluster_id, - target_node_1=target_node_1, - vc_glance=True - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_3], - groups=["vcenter_multiple_cluster_with_computevmware"]) - @log_snapshot_after_test - def vcenter_multiple_cluster_with_computevmware(self): - """Deploy environment in DualHypervisors mode with cinder-vmware, \ - compute-vmware and multiple clusters. - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Add nodes with following roles: - controller - cinder-vmware - compute-vmware - 4. Assign vCenter cluster(s) to: - controller - compute-vmware - 5. Deploy the cluster - 6. Run network verification - 7. Run OSTF - - Duration 1h 40min - - """ - self.env.revert_snapshot("ready_with_3_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE - ) - - logger.debug("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['cinder-vmware'], - 'slave-03': ['compute-vmware'] - } - ) - - # Configure VMWare vCenter settings - target_node_2 = self.node_name('slave-03') - self.fuel_web.vcenter_configure( - cluster_id, - target_node_2=target_node_2, - multiclusters=True - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_5], - groups=["vcenter_ceph"]) - @log_snapshot_after_test - def vcenter_ceph(self): - """Deploy environment in HA with CephOSD as backend for Cinder and \ - Glance - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Set CephOSD as backend for Glance and Cinder - 4. Add nodes with following roles: - controller - compute - ceph-osd - ceph-osd - 5. Assign vCenter cluster(s) to: - controller - 6. Deploy the cluster - 7. Run network verification - 8. Run OSTF - - Duration: 2h 30min - - """ - self.env.revert_snapshot("ready_with_5_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE, - settings={'images_ceph': True, - 'volumes_ceph': True, - 'osd_pool_size': '2', - 'objects_ceph': True, - 'volumes_lvm': False}) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['compute'], - 'slave-03': ['ceph-osd'], - 'slave-04': ['ceph-osd'], - } - ) - - # Configure VMWare vCenter settings - self.fuel_web.vcenter_configure(cluster_id, multiclusters=True) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_9], - groups=["vcenter_computevmware_and_ceph"]) - @log_snapshot_after_test - def vcenter_computevmware_and_ceph(self): - """Deploy environment in DualHypervisors mode with Ceph as backend \ - for Cinder and Glance and compute-vmware nodes - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Set CephOSD as backend for Glance and Cinder - 4. Add nodes with following roles: - controller - compute-vmware - compute-vmware - compute - ceph-osd - ceph-osd - 5. Assign vCenter cluster(s) to: - compute-vmware - 6. Deploy the cluster - 7. Run network verification - 8. Run OSTF - - Duration: 2h - - """ - self.env.revert_snapshot("ready_with_9_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE, - settings={'images_ceph': True, - 'volumes_ceph': True, - 'osd_pool_size': '2', - 'volumes_lvm': False}) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['compute-vmware'], - 'slave-03': ['compute-vmware'], - 'slave-04': ['compute'], - 'slave-05': ['ceph-osd'], - 'slave-06': ['ceph-osd'] - } - ) - - # Configure VMWare vCenter settings - target_node_1 = self.node_name('slave-02') - target_node_2 = self.node_name('slave-03') - self.fuel_web.vcenter_configure( - cluster_id, - target_node_1=target_node_1, - target_node_2=target_node_2, - multiclusters=True - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_3], - groups=["vcenter_multiroles_cindervmdk_and_ceph"]) - @log_snapshot_after_test - def vcenter_multiroles_cindervmdk_and_ceph(self): - """Deploy environment in DualHypervisors mode with Ceph and nodes \ - with multiroles (combinations with CinderVMDK and CephOSD) - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Set CephOSD as backend for Glance and Cinder - 4. Add nodes with following roles: - controller + cinder-vmware + ceph-osd - compute + cinderVMDK + ceph-osd - 5. Assign vCenter cluster(s) to: - controller - 6. Deploy the cluster - 7. Run network verification - 8. Run OSTF - - Duration: 2h - - """ - self.env.revert_snapshot("ready_with_3_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE, - settings={'volumes_ceph': True, - 'osd_pool_size': '2', - 'volumes_lvm': False, - 'ephemeral_ceph': True}) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - {'slave-01': ['controller', 'cinder-vmware', 'ceph-osd'], - 'slave-02': ['compute', 'cinder-vmware', 'ceph-osd']}) - - self.configure_nova_vlan(cluster_id) - - # Configure VMWare vCenter settings - self.fuel_web.vcenter_configure(cluster_id) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke', 'ha']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_3], - groups=["vcenter_multiroles_cindervmdk_and_cinder"]) - @log_snapshot_after_test - def vcenter_multiroles_cindervmdk_and_cinder(self): - """Deploy environment in DualHypervisors mode with nodes \ - with multiroles (combinations with CinderVMDK and Cinder) - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Add nodes with following roles: - controller + cinder-vmware + cinder - compute + cinderVMDK + cinder - 4. Assign vCenter cluster(s) to: - controller - 5. Deploy the cluster - 6. Run network verification - 7. Run OSTF - - Duration: 2h - - """ - - self.env.revert_snapshot("ready_with_3_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller', 'cinder-vmware', 'cinder'], - 'slave-02': ['compute', 'cinder-vmware', 'cinder'] - } - ) - - self.configure_nova_vlan(cluster_id) - - # Configure VMWare vCenter settings - self.fuel_web.vcenter_configure(cluster_id) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke', 'ha']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_5], - groups=["vcenter_ceilometer"]) - @log_snapshot_after_test - def vcenter_ceilometer(self): - """Deploy environment with vCenter and Ceilometer enabled - - Scenario: - 1. Create cluster with vCenter and Ceilometer support - 2. Set Nova-Network FlatDHCP Manager as a network backend - 3. Add nodes with following roles: - controller - compute + cinder - cinder-vmware - mongo - 4. Assign vCenter cluster(s) to: - controller - 5. Deploy the cluster - 6. Run network verification - 7. Run OSTF - - Duration: 2h - - """ - self.env.revert_snapshot("ready_with_5_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE, - settings={'ceilometer': True}) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['compute', 'cinder'], - 'slave-03': ['cinder-vmware'], - 'slave-04': ['mongo'] - } - ) - - # Configure VMWare vCenter settings - self.fuel_web.vcenter_configure(cluster_id, multiclusters=True) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha', 'tests_platform'] - ) - - @test(depends_on=[SetupEnvironment.prepare_slaves_9], - groups=["vcenter_ceilometer_and_computevmware"]) - @log_snapshot_after_test - def vcenter_ceilometer_and_computevmware(self): - """Deploy environment with vCenter, Ceilometer enabled and\ - ComputeVMWare - - Scenario: - 1. Create cluster with vCenter and Ceilometer support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Add nodes with following roles: - controller - compute + cinder - cinder-vmware - compute-vmware - compute-vmware - mongo - 4. Assign vCenter cluster(s) to: - compute-vmware - 5. Deploy the cluster - 6. Run network verification - 7. Run OSTF - - Duration: 2h - - """ - self.env.revert_snapshot("ready_with_9_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE, - settings={'ceilometer': True}) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['compute', 'cinder'], - 'slave-03': ['cinder-vmware'], - 'slave-04': ['compute-vmware'], - 'slave-05': ['compute-vmware'], - 'slave-06': ['mongo'] - } - ) - - self.configure_nova_vlan(cluster_id) - - # Configure VMWare vCenter settings - target_node_1 = self.node_name('slave-04') - target_node_2 = self.node_name('slave-05') - self.fuel_web.vcenter_configure( - cluster_id, - target_node_1=target_node_1, - target_node_2=target_node_2, - multiclusters=True - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha', 'tests_platform'] - ) - - @test(depends_on=[SetupEnvironment.prepare_slaves_3], - groups=["vcenter_multiroles_ceilometer"]) - @log_snapshot_after_test - def vcenter_multiroles_ceilometer(self): - """Deploy environment with vCenter, Ceilometer and nodes with \ - multiroles (combinations with CinderVMDK, Cinder and MongoDB) - - Scenario: - 1. Create cluster with vCenter and Ceilometer support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Add nodes with following roles: - controller + cinder + cinder-vmware + mongo - compute + cinder + cinder-vmware + mongo - compute-vmware - 4. Assign vCenter cluster(s) to: - controller - compute-vmware - 5. Deploy the cluster - 6. Run network verification - 7. Run OSTF - - Duration: 2h - - """ - self.env.revert_snapshot("ready_with_3_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE, - settings={'ceilometer': True}) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller', 'cinder', 'cinder-vmware', 'mongo'], - 'slave-02': ['compute'], - 'slave-03': ['compute-vmware'] - } - ) - - self.configure_nova_vlan(cluster_id) - - # Configure VMWare vCenter settings - target_node_2 = self.node_name('slave-03') - self.fuel_web.vcenter_configure( - cluster_id, - target_node_2=target_node_2, - multiclusters=True - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha', 'tests_platform']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_9], - groups=["vcenter_add_delete_nodes"]) - @log_snapshot_after_test - def vcenter_add_delete_nodes(self): - """Deploy environment of vcenter+qemu nova vlan and default backend for - glance and with addition and deletion of nodes with different roles - - Scenario: - 1. Create cluster with vCenter support. - 2. Add 1 node with controller role. - 3. Set Nova-Network VlanManager as a network backend. - 4. Deploy the cluster. - 5. Run OSTF. - 6. Add 1 node with cinder role and redeploy cluster. - 7. Run OSTF. - 8. Remove 1 node with cinder role. - 9. Add 1 node with cinder-vmdk role and redeploy cluster. - 10. Run OSTF. - 11. Add 1 node with cinder role and redeploy cluster. - 12. Run OSTF. - 13. Remove nodes with roles: cinder-vmdk and cinder. - 14. Add 1 node with compute role and redeploy cluster. - 15. Run OSTF. - 16. Add 1 node with cinder role. - 17. Run OSTF. - 18. Remove node with cinder role. - 19. Add 1 node with cinder-vmdk role and redeploy cluster. - 20. Run OSTF. - 21. Add 1 node with compute role, 1 node with cinder role and - redeploy cluster. - 22. Run OSTF. - - Duration 5 hours - - """ - - self.env.revert_snapshot("ready_with_9_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE) - - logger.debug("cluster is {}".format(cluster_id)) - - # Add role controller for node 1 - self.fuel_web.update_nodes( - cluster_id, - {'slave-01': ['controller']} - ) - - # Configure network interfaces. - # Public and Fixed networks are on the same interface - # because Nova will use the same vSwitch for PortGroups creating - # as a ESXi management interface is located in. - interfaces = { - iface_alias('eth0'): ["fuelweb_admin"], - iface_alias('eth1'): ["public", "fixed"], - iface_alias('eth2'): ["management", ], - iface_alias('eth3'): [], - iface_alias('eth4'): ["storage"] - } - - self.configure_nova_vlan(cluster_id) - # Configure VMWare vCenter - self.fuel_web.vcenter_configure(cluster_id) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke']) - - # Add 1 node with cinder role and redeploy cluster - self.fuel_web.update_nodes( - cluster_id, - {'slave-02': ['cinder']} - ) - - slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id) - self.fuel_web.update_node_networks(slave_nodes[-1]['id'], interfaces) - - self.fuel_web.deploy_cluster_wait(cluster_id) - - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke']) - - # Remove 1 node with cinder role - self.fuel_web.update_nodes( - cluster_id, {'slave-02': ['cinder']}, False, True) - - # Add 1 node with cinder-vmware role and redeploy cluster - self.fuel_web.update_nodes( - cluster_id, - {'slave-03': ['cinder-vmware']} - ) - - slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id) - self.fuel_web.update_node_networks(slave_nodes[-1]['id'], interfaces) - - self.fuel_web.deploy_cluster_wait(cluster_id) - - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke']) - - # Add 1 node with cinder role and redeploy cluster - self.fuel_web.update_nodes( - cluster_id, - {'slave-02': ['cinder']} - ) - - slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id) - self.fuel_web.update_node_networks(slave_nodes[-1]['id'], interfaces) - - self.fuel_web.deploy_cluster_wait(cluster_id) - - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke']) - - # Remove nodes with roles: cinder-vmdk and cinder - self.fuel_web.update_nodes( - cluster_id, - {'slave-02': ['cinder'], - 'slave-03': ['cinder-vmware']}, False, True) - - # Add 1 node with compute role and redeploy cluster - self.fuel_web.update_nodes( - cluster_id, - {'slave-04': ['compute']} - ) - - slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id) - self.fuel_web.update_node_networks(slave_nodes[-1]['id'], interfaces) - - self.fuel_web.deploy_cluster_wait(cluster_id) - - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke']) - - # Add 1 node with cinder role and redeploy cluster - self.fuel_web.update_nodes( - cluster_id, - {'slave-03': ['cinder']} - ) - - slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id) - self.fuel_web.update_node_networks(slave_nodes[-1]['id'], interfaces) - - self.fuel_web.deploy_cluster_wait(cluster_id) - - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke']) - - # Remove node with cinder role - self.fuel_web.update_nodes( - cluster_id, - {'slave-03': ['cinder']}, False, True) - - # Add 1 node with cinder-vmdk role and redeploy cluster - self.fuel_web.update_nodes( - cluster_id, - {'slave-02': ['cinder-vmware']} - ) - - slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id) - self.fuel_web.update_node_networks(slave_nodes[-1]['id'], interfaces) - - self.fuel_web.deploy_cluster_wait(cluster_id) - - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke']) - - # Add 1 node with compute role and 1 node with cinder role and redeploy - # cluster - self.fuel_web.update_nodes( - cluster_id, - {'slave-03': ['compute'], - 'slave-05': ['cinder']} - ) - - slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id) - - for node_index in range(-1, -3, -1): - self.fuel_web.update_node_networks( - slave_nodes[node_index]['id'], interfaces - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['sanity', 'smoke', 'ha']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_9], - groups=["vcenter_delete_controler"]) - @log_snapshot_after_test - def vcenter_delete_controller(self): - """Deploy environment of vcenter+qemu nova vlan, default backend for - glance and deletion one node with controller role - - Scenario: - 1. Create cluster with vCenter support - 2. Add 4 nodes with Controller roles - 3. Add 2 nodes with compute role - 4. Add 1 node with cinder role - 5. Add 1 node with cinder-vmware role - 6. Add a node with compute-vmware role - 7. Set Nova-Network VlanManager as a network backend. - 8. Deploy the cluster - 9. Run OSTF. - 10. Remove 1 node with controller role and redeploy cluster. - 11. Run OSTF. - - Duration 3 hours - - """ - self.env.revert_snapshot("ready_with_9_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE) - - logger.debug("cluster is {}".format(cluster_id)) - - # Configure network interfaces. - # Public and Fixed networks are on the same interface - # because Nova will use the same vSwitch for PortGroups creating - # as a ESXi management interface is located in. - - # Assign role to node - self.fuel_web.update_nodes( - cluster_id, - {'slave-01': ['controller'], - 'slave-02': ['controller'], - 'slave-03': ['controller'], - 'slave-04': ['controller'], - 'slave-05': ['compute'], - 'slave-06': ['compute'], - 'slave-07': ['cinder'], - 'slave-08': ['cinder-vmware'], - 'slave-09': ['compute-vmware']}) - - self.configure_nova_vlan(cluster_id) - - target_node_1 = self.node_name('slave-09') - self.fuel_web.vcenter_configure( - cluster_id, - target_node_1=target_node_1 - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['smoke', 'sanity', 'ha'], - timeout=60 * 60) - - # Remove 1 node with controller role and redeploy cluster - self.fuel_web.update_nodes( - cluster_id, - {'slave-04': ['controller'], }, False, True) - - self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False) - - # TODO: Fix the function when bug #1457515 will be fixed. - self.fuel_web.run_ostf( - cluster_id=cluster_id, test_sets=['smoke', 'sanity', 'ha'], - should_fail=1, - failed_test_name=['Check that required services are running']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_5], - groups=["vcenter_ha_nova_flat_multiple_clusters"]) - @log_snapshot_after_test - def vcenter_ha_nova_flat_multiple_clusters(self): - """Deploy environment in HA with compute-vmware and multiple \ - clusters. Check network connection between VM's from different \ - hypervisors. - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network FlatDHCP Manager as a network backend - 3. Add nodes with following roles: - controller - controller - controller - compute - cinder-vmware - 4. Assign vCenter cluster(s) to: - controller - 5. Deploy the cluster - 6. Run network verification - 7. Run OSTF - 8. Create 2 VMs on each hypervisor - 9. Verify that VMs on different hypervisors should communicate - between each other - - Duration 112 min - - """ - self.env.revert_snapshot("ready_with_5_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE - ) - - logger.debug("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['controller'], - 'slave-03': ['controller'], - 'slave-04': ['compute', 'cinder'], - 'slave-05': ['cinder-vmware'] - } - ) - - # Configure VMWare vCenter settings - self.fuel_web.vcenter_configure(cluster_id, multiclusters=True) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha']) - - # TODO: Fix the function when bug #1457404 will be fixed. - os_ip = self.fuel_web.get_public_vip(cluster_id) - os_conn = os_actions.OpenStackActions( - os_ip, SERVTEST_USERNAME, - SERVTEST_PASSWORD, - SERVTEST_TENANT) - - try: - self.create_vm(os_conn=os_conn, vm_count=6) - except TimeoutError: - logger.warning("Tests failed to create VMs on each hypervisors," - " try add 4 VMs" - " and if it fails again - test will fails ") - self.create_vm(os_conn=os_conn, vm_count=4) - - # Verify that current state of each VMs is Active - srv_list = os_conn.get_servers() - for srv in srv_list: - assert_true(os_conn.get_instance_detail(srv).status != 'ERROR', - "Current state of Vm {0} is {1}".format( - srv.name, os_conn.get_instance_detail(srv).status)) - try: - # pylint: disable=undefined-loop-variable - wait( - lambda: - os_conn.get_instance_detail(srv).status == "ACTIVE", - timeout=60 * 60) - # pylint: enable=undefined-loop-variable - except TimeoutError: - logger.error( - "Current state of Vm {0} is {1}".format( - srv.name, os_conn.get_instance_detail(srv).status)) - # Get ip of VMs - srv_ip = [] - srv_list = os_conn.get_servers() - for srv in srv_list: - ip = srv.networks[srv.networks.keys()[0]][0] - srv_ip.append(ip) - - # VMs on different hypervisors should communicate between each other - for ip_1 in srv_ip: - primary_controller = self.fuel_web.get_nailgun_primary_node( - self.env.d_env.nodes().slaves[0]) - ssh = self.fuel_web.get_ssh_for_node(primary_controller.name) - logger.info("Connect to VM {0}".format(ip_1)) - for ip_2 in srv_ip: - if ip_1 != ip_2: - # Check server's connectivity - res = ssh.execute_through_host( - hostname=ip_1, - cmd="ping -q -c3 {}".format(ip_2), - auth=cirros_auth - ) - assert_true( - res['exit_code'] == 0, - "VM{0} not ping from Vm {1}, received {2} icmp".format( - ip_1, ip_2, res['stdout_str'])) - - @test(depends_on=[SetupEnvironment.prepare_slaves_5], - groups=["vcenter_ha_nova_vlan_multiple_clusters"]) - @log_snapshot_after_test - def vcenter_ha_nova_vlan_multiple_clusters(self): - """Deploy environment in HA with compute-vmware and multiple \ - clusters. Check network connection between VM's from different \ - hypervisors. - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Add nodes with following roles: - controller - controller - controller - compute - cinder-vmware - 4. Assign vCenter cluster(s) to: - controller - 5. Deploy the cluster - 6. Run network verification - 7. Run OSTF - 8. Create 2 VMs on each hypervisor - 9. Verify that VMs on different hypervisors should communicate - between each other - - Duration 112 min - - """ - self.env.revert_snapshot("ready_with_5_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE - ) - - logger.debug("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['controller'], - 'slave-03': ['controller'], - 'slave-04': ['compute', 'cinder'], - 'slave-05': ['cinder-vmware'] - } - ) - - # Configure VMWare vCenter settings - self.configure_nova_vlan(cluster_id) - self.fuel_web.vcenter_configure(cluster_id, multiclusters=True) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.verify_network(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha']) - - # TODO: Fix the function when bug #1457404 will be fixed. - os_ip = self.fuel_web.get_public_vip(cluster_id) - os_conn = os_actions.OpenStackActions( - os_ip, SERVTEST_USERNAME, - SERVTEST_PASSWORD, - SERVTEST_TENANT) - - try: - self.create_vm(os_conn=os_conn, vm_count=6) - except TimeoutError: - logger.warning("Tests failed to create VMs on each hypervisors," - " try add 4 VMs" - " and if it fails again - test will fails ") - self.create_vm(os_conn=os_conn, vm_count=4) - - # Verify that current state of each VMs is Active - srv_list = os_conn.get_servers() - for srv in srv_list: - assert_true(os_conn.get_instance_detail(srv).status != 'ERROR', - "Current state of Vm {0} is {1}".format( - srv.name, os_conn.get_instance_detail(srv).status)) - try: - # pylint: disable=undefined-loop-variable - wait( - lambda: - os_conn.get_instance_detail(srv).status == "ACTIVE", - timeout=60 * 60) - # pylint: enable=undefined-loop-variable - except TimeoutError: - logger.error( - "Current state of Vm {0} is {1}".format( - srv.name, os_conn.get_instance_detail(srv).status)) - # Get ip of VMs - srv_ip = [] - srv_list = os_conn.get_servers() - for srv in srv_list: - ip = srv.networks[srv.networks.keys()[0]][0] - srv_ip.append(ip) - - # VMs on different hypervisors should communicate between each other - for ip_1 in srv_ip: - primary_controller = self.fuel_web.get_nailgun_primary_node( - self.env.d_env.nodes().slaves[0]) - ssh = self.fuel_web.get_ssh_for_node(primary_controller.name) - logger.info("Connect to VM {0}".format(ip_1)) - for ip_2 in srv_ip: - if ip_1 != ip_2: - # Check server's connectivity - res = ssh.execute_through_host( - hostname=ip_1, - cmd="ping -q -c3 {}".format(ip_2), - auth=cirros_auth - ) - assert_true( - res['exit_code'] == 0, - "VM{0} not ping from Vm {1}, received {2} icmp".format( - ip_1, ip_2, res['stdout_str'])) - - @test(depends_on=[SetupEnvironment.prepare_slaves_5], - groups=["vcenter_ha_glance_backend_multiple_cluster"]) - @log_snapshot_after_test - def vcenter_ha_glance_backend_multiple_cluster(self): - """Deploy environment with nova-vlan in HA with multiple cluster \ - (Controller + ComputeVMWare), CinderVMDK, Cinder and VMWare \ - datastore as backend for Glance - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Set VMWare vCenter/ESXi datastore for images (Glance) - 4. Add nodes with following roles: - controller - controller - controller - compute + cinder - compute-vmware - 5. Assign vCenter cluster(s) to: - controller - compute-vmware - 6. Deploy the cluster - 7. Run network verification - 8. Run OSTF - - Duration: 2h 10min - - """ - self.env.revert_snapshot("ready_with_5_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE, - settings={'images_vcenter': True, - 'images_ceph': False}) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['controller'], - 'slave-03': ['controller'], - 'slave-04': ['compute', 'cinder'], - 'slave-05': ['compute-vmware'] - } - ) - - # Configure VMWare vCenter settings - self.configure_nova_vlan(cluster_id) - target_node_2 = self.node_name('slave-05') - self.fuel_web.vcenter_configure( - cluster_id, - vc_glance=True, - multiclusters=True, - target_node_2=target_node_2 - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha', 'tests_platform']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_9], - groups=["vcenter_ha_ceph"]) - @log_snapshot_after_test - def vcenter_ha_ceph(self): - """Deploy environment in HA with ComputeVMWare and Ceph \ - (Ceph RBD for volumes/images and RadosGW) - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Set Ceph as storage backend - 4. Add nodes with following roles: - controller - controller - controller - ceph-osd - ceph-osd - compute - compute-vmware - 5. Assign vCenter cluster(s) to: - controller - compute-vmware - 6. Deploy the cluster - 7. Run network verification - 8. Run OSTF - - Duration: 2h 10min - - """ - self.env.revert_snapshot("ready_with_9_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE, - settings={'images_ceph': True, - 'volumes_ceph': True, - 'osd_pool_size': '2', - 'objects_ceph': True, - 'volumes_lvm': False}) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['controller'], - 'slave-03': ['controller'], - 'slave-04': ['ceph-osd'], - 'slave-05': ['ceph-osd'], - 'slave-06': ['compute'], - 'slave-07': ['compute-vmware'] - } - ) - - # Configure VMWare vCenter settings - target_node_2 = self.node_name('slave-07') - self.fuel_web.vcenter_configure( - cluster_id, - multiclusters=True, - target_node_2=target_node_2 - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha', 'tests_platform']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_9], - groups=["vcenter_ha_cinder_and_ceph"]) - @log_snapshot_after_test - def vcenter_ha_cinder_and_ceph(self): - """Deploy environment in HA with Cinder and Ceph \ - (Ceph RBD for images/ephemeral volumes and RadosGW) - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network VLAN Manager as a network backend - 3. Set Ceph RBD for images/ephemeral volumes and RadosGW - 4. Add nodes with following roles: - controller - controller - controller - ceph-osd + cinder - ceph-osd + cinder-vmware - 5. Assign vCenter cluster(s) to: - controller - 6. Deploy the cluster - 7. Run network verification - 8. Run OSTF - - Duration: 2h 10min - - """ - self.env.revert_snapshot("ready_with_9_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE, - settings={'images_ceph': True, - 'volumes_ceph': False, - 'objects_ceph': True, - 'osd_pool_size': '2', - 'volumes_lvm': True}) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['controller'], - 'slave-03': ['controller'], - 'slave-04': ['ceph-osd', 'cinder'], - 'slave-05': ['ceph-osd', 'cinder-vmware'] - } - ) - - # Configure VMWare vCenter settings - self.configure_nova_vlan(cluster_id) - self.fuel_web.vcenter_configure(cluster_id) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha', 'tests_platform']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_5], - groups=["vcenter_ha_multiroles_cindervmdk_and_cinder"]) - @log_snapshot_after_test - def vcenter_ha_multiroles_cindervmdk_and_cinder(self): - """Deploy environment in HA with ComputeVMWare, Cinder and \ - check multiroles with CinderVMDK - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network FlatDHCP Manager as a network backend - 3. Add nodes with following roles: - controller - controller - controller + cinder + cinder-vmware - compute + cinder + cinder-vmware - compute-vmware - 4. Assign vCenter cluster(s) to: - controller - compute-vmware - 5. Deploy the cluster - 6. Run network verification - 7. Run OSTF - - Duration: 2h 10min - - """ - self.env.revert_snapshot("ready_with_5_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['controller'], - 'slave-03': ['controller', 'cinder', 'cinder-vmware'], - 'slave-04': ['compute', 'cinder', 'cinder-vmware'], - 'slave-05': ['compute-vmware'] - } - ) - - # Configure VMWare vCenter settings - target_node_2 = self.node_name('slave-05') - self.fuel_web.vcenter_configure( - cluster_id, - target_node_2=target_node_2, - multiclusters=True - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha', 'tests_platform']) - - @test(depends_on=[SetupEnvironment.prepare_slaves_5], - groups=["vcenter_ha_multiroles_cindervmdk_and_ceph"]) - @log_snapshot_after_test - def vcenter_ha_multiroles_cindervmdk_and_ceph(self): - """Deploy environment in HA with ComputeVMWare, Ceph and \ - check multiroles with CinderVMDK - - Scenario: - 1. Create cluster with vCenter support - 2. Set Nova-Network FlatDHCP Manager as a network backend - 3. Set Ceph as storage backend - 4. Add nodes with following roles: - controller - controller - controller + ceph-osd + cinder-vmware - compute + ceph-osd + cinder-vmware - compute-vmware - 5. Assign vCenter cluster(s) to: - controller - compute-vmware - 6. Deploy the cluster - 7. Run network verification - 8. Run OSTF - - Duration: 2h 10min - - """ - self.env.revert_snapshot("ready_with_5_slaves") - - # Configure cluster - cluster_id = self.fuel_web.create_cluster( - name=self.__class__.__name__, - mode=DEPLOYMENT_MODE, - settings={'images_ceph': True, - 'volumes_ceph': True, - 'osd_pool_size': '2', - 'objects_ceph': True, - 'volumes_lvm': False}) - - logger.info("cluster is {}".format(cluster_id)) - - # Assign roles to nodes - self.fuel_web.update_nodes( - cluster_id, - { - 'slave-01': ['controller'], - 'slave-02': ['controller'], - 'slave-03': ['controller', 'ceph-osd', 'cinder-vmware'], - 'slave-04': ['compute', 'ceph-osd', 'cinder-vmware'], - 'slave-05': ['compute-vmware'] - } - ) - - # Configure VMWare vCenter settings - target_node_2 = self.node_name('slave-05') - self.fuel_web.vcenter_configure( - cluster_id, - target_node_2=target_node_2, - multiclusters=True - ) - - self.fuel_web.deploy_cluster_wait(cluster_id) - self.fuel_web.run_ostf( - cluster_id=cluster_id, - test_sets=['sanity', 'smoke', 'ha', 'tests_platform']) diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/cluster_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/cluster_settings.yaml index 9ee7735a7..700beac9d 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/cluster_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/cluster_settings.yaml @@ -67,9 +67,6 @@ common: use_cow_images: type: checkbox value: true - use_vcenter: - type: hidden - value: false corosync: group: type: text @@ -378,9 +375,6 @@ storage: images_ceph: type: checkbox value: false - images_vcenter: - type: checkbox - value: false mon_key: type: hidden value: AQDzghZXAAAAABAAVi1udBHvkQbZbDgNnT7gXA== diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/controller.yaml index 4767f00c2..ba0dc3776 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/controller.yaml @@ -70,8 +70,6 @@ tasks: resources: [] - murano-cfapi: no_puppet_run: true -- vmware-vcenter: - no_puppet_run: true - ironic-compute: no_puppet_run: true - primary-openstack-network-agents-metadata: @@ -271,8 +269,6 @@ tasks: - primary-database: resources: - File[/root/.my.cnf] -- vcenter_compute_zones_create: - type: shell - openstack-haproxy-cinder: resources: - File[/etc/haproxy/conf.d/070-cinder-api.cfg] diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/idempotency/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/idempotency/controller.yaml index 739e8d90e..769f1dab8 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/idempotency/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/idempotency/controller.yaml @@ -49,8 +49,6 @@ tasks: - openstack-haproxy-aodh: null - murano-cfapi: no_puppet_run: true - - vmware-vcenter: - no_puppet_run: true - ironic-compute: no_puppet_run: true - primary-openstack-network-agents-metadata: null @@ -171,8 +169,6 @@ tasks: - primary-database: skip: - File[/root/.my.cnf] - - vcenter_compute_zones_create: - type: shell - openstack-haproxy-cinder: null - ntp-server: null - murano-keystone: diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/cluster_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/cluster_settings.yaml index 244b062e2..40bf1dd4a 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/cluster_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/cluster_settings.yaml @@ -64,9 +64,6 @@ common: use_cow_images: type: checkbox value: true - use_vcenter: - type: hidden - value: false corosync: group: type: text @@ -378,9 +375,6 @@ storage: images_ceph: type: checkbox value: false - images_vcenter: - type: checkbox - value: false mon_key: type: hidden value: AQDzghZXAAAAABAAVi1udBHvkQbZbDgNnT7gXA== diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/controller.yaml index 195ac8f61..ffe0ea153 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/controller.yaml @@ -71,8 +71,6 @@ tasks: resources: [] - murano-cfapi: no_puppet_run: true - - vmware-vcenter: - no_puppet_run: true - ironic-compute: resources: [] - primary-openstack-network-agents-metadata: @@ -278,8 +276,6 @@ tasks: resources: - File[mysql-config-file] - File[/root/.my.cnf] - - vcenter_compute_zones_create: - type: shell - openstack-haproxy-cinder: resources: - File[/etc/haproxy/conf.d/070-cinder-api.cfg] diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/idempotency/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/idempotency/controller.yaml index 2eb0a2030..ed3d30546 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/idempotency/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/idempotency/controller.yaml @@ -48,8 +48,6 @@ tasks: - openstack-haproxy-aodh: null - murano-cfapi: no_puppet_run: true - - vmware-vcenter: - no_puppet_run: true - ironic-compute: null - primary-openstack-network-agents-metadata: null - cinder-keystone: null @@ -164,8 +162,6 @@ tasks: - primary-database: skip: - File[/root/.my.cnf] - - vcenter_compute_zones_create: - type: shell - openstack-haproxy-cinder: null - ntp-server: null - murano-keystone: diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/cluster_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/cluster_settings.yaml index 9ee7735a7..700beac9d 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/cluster_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/cluster_settings.yaml @@ -67,9 +67,6 @@ common: use_cow_images: type: checkbox value: true - use_vcenter: - type: hidden - value: false corosync: group: type: text @@ -378,9 +375,6 @@ storage: images_ceph: type: checkbox value: false - images_vcenter: - type: checkbox - value: false mon_key: type: hidden value: AQDzghZXAAAAABAAVi1udBHvkQbZbDgNnT7gXA== diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/controller.yaml index 887dddf5f..d96b7079e 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/controller.yaml @@ -70,8 +70,6 @@ tasks: resources: [] - murano-cfapi: no_puppet_run: true -- vmware-vcenter: - no_puppet_run: true - ironic-compute: no_puppet_run: true - primary-openstack-network-agents-metadata: @@ -280,8 +278,6 @@ tasks: - primary-database: resources: - File[/root/.my.cnf] -- vcenter_compute_zones_create: - type: shell - openstack-haproxy-cinder: resources: - File[/etc/haproxy/conf.d/070-cinder-api.cfg] diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/idempotency/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/idempotency/controller.yaml index 0295b879f..44dec00b3 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/idempotency/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/idempotency/controller.yaml @@ -47,8 +47,6 @@ tasks: - openstack-haproxy-aodh: null - murano-cfapi: no_puppet_run: true - - vmware-vcenter: - no_puppet_run: true - ironic-compute: no_puppet_run: true - primary-openstack-network-agents-metadata: null @@ -165,8 +163,6 @@ tasks: - primary-database: skip: - File[/root/.my.cnf] - - vcenter_compute_zones_create: - type: shell - openstack-haproxy-cinder: null - ntp-server: null - murano-keystone: diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/cluster_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/cluster_settings.yaml index 10eeda0c6..c4eb20f83 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/cluster_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/cluster_settings.yaml @@ -67,9 +67,6 @@ common: use_cow_images: type: checkbox value: true - use_vcenter: - type: hidden - value: false corosync: group: type: text @@ -378,9 +375,6 @@ storage: images_ceph: type: checkbox value: false - images_vcenter: - type: checkbox - value: false mon_key: type: hidden value: AQDzghZXAAAAABAAVi1udBHvkQbZbDgNnT7gXA== diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/controller.yaml index 0b6118137..d44451898 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/controller.yaml @@ -71,8 +71,6 @@ tasks: resources: [] - murano-cfapi: no_puppet_run: true - - vmware-vcenter: - no_puppet_run: true - ironic-compute: no_puppet_run: true - primary-openstack-network-agents-metadata: @@ -302,8 +300,6 @@ tasks: - primary-database: resources: - File[/root/.my.cnf] - - vcenter_compute_zones_create: - type: shell - openstack-haproxy-cinder: resources: - File[/etc/haproxy/conf.d/070-cinder-api.cfg] diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/idempotency/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/idempotency/controller.yaml index 27a32eb86..ef1947554 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/idempotency/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/idempotency/controller.yaml @@ -48,8 +48,6 @@ tasks: - openstack-haproxy-aodh: null - murano-cfapi: no_puppet_run: true - - vmware-vcenter: - no_puppet_run: true - ironic-compute: no_puppet_run: true - primary-openstack-network-agents-metadata: null @@ -171,8 +169,6 @@ tasks: - primary-database: skip: - File[/root/.my.cnf] - - vcenter_compute_zones_create: - type: shell - openstack-haproxy-cinder: null - ntp-server: null - murano-keystone: diff --git a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/cluster_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/cluster_settings.yaml index 39d1764b9..7a1458646 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/cluster_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/cluster_settings.yaml @@ -67,9 +67,6 @@ common: use_cow_images: type: checkbox value: true - use_vcenter: - type: hidden - value: false corosync: group: type: text @@ -378,9 +375,6 @@ storage: images_ceph: type: checkbox value: false - images_vcenter: - type: checkbox - value: false mon_key: type: hidden value: AQDLzzFXAAAAABAAD8tvscw1K5KOBsEHbfxTGg== diff --git a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/controller_mongo.yaml b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/controller_mongo.yaml index 8ace294fc..ca94b3b5d 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/controller_mongo.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/controller_mongo.yaml @@ -51,8 +51,6 @@ tasks: resources: [] - murano-cfapi: no_puppet_run: true - - vmware-vcenter: - no_puppet_run: true - rabbitmq: resources: [] - ironic-compute: diff --git a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/primary-controller_mongo.yaml b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/primary-controller_mongo.yaml index 17b667656..1a823551a 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/primary-controller_mongo.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/primary-controller_mongo.yaml @@ -72,8 +72,6 @@ tasks: resources: [] - murano-cfapi: no_puppet_run: true - - vmware-vcenter: - no_puppet_run: true - ironic-compute: no_puppet_run: true - primary-openstack-network-agents-metadata: @@ -306,8 +304,6 @@ tasks: resources: - File[mysql-config-file] - File[/root/.my.cnf] - - vcenter_compute_zones_create: - type: shell - openstack-haproxy-cinder: resources: - File[/etc/haproxy/conf.d/070-cinder-api.cfg] diff --git a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/idempotency/controller_mongo.yaml b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/idempotency/controller_mongo.yaml index f44eea192..6c2b739e0 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/idempotency/controller_mongo.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/idempotency/controller_mongo.yaml @@ -33,8 +33,6 @@ tasks: - openstack-haproxy-aodh: null - murano-cfapi: no_puppet_run: true - - vmware-vcenter: - no_puppet_run: true - ceilometer-radosgw-user: null - ironic-compute: no_puppet_run: true diff --git a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/idempotency/primary-controller_mongo.yaml b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/idempotency/primary-controller_mongo.yaml index 5dadd1d44..3f864c0f2 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/idempotency/primary-controller_mongo.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/idempotency/primary-controller_mongo.yaml @@ -46,8 +46,6 @@ tasks: - openstack-haproxy-aodh: null - murano-cfapi: no_puppet_run: true - - vmware-vcenter: - no_puppet_run: true - ironic-compute: no_puppet_run: true - primary-openstack-network-agents-metadata: null @@ -162,8 +160,6 @@ tasks: - primary-database: skip: - File[/root/.my.cnf] - - vcenter_compute_zones_create: - type: shell - openstack-haproxy-cinder: null - ntp-server: null - murano-keystone: diff --git a/fuelweb_test/tests/tests_lcm/test_task_coverage.py b/fuelweb_test/tests/tests_lcm/test_task_coverage.py index 3f49a3a7e..bfe877fe4 100644 --- a/fuelweb_test/tests/tests_lcm/test_task_coverage.py +++ b/fuelweb_test/tests/tests_lcm/test_task_coverage.py @@ -26,9 +26,6 @@ from fuelweb_test.tests.tests_lcm.base_lcm_test import TASKS_BLACKLIST EXCLUDED_TASKS_FROM_COVERAGE = [ - "top-role-cinder-vmware", - "top-role-compute-vmware", - "vmware-vcenter", "generate_vms", "plugins_rsync", "plugins_setup_repositories", diff --git a/gates_tests/helpers/fuel_library_modules_mapping.yaml b/gates_tests/helpers/fuel_library_modules_mapping.yaml index ad866b4ac..8c591ba14 100644 --- a/gates_tests/helpers/fuel_library_modules_mapping.yaml +++ b/gates_tests/helpers/fuel_library_modules_mapping.yaml @@ -90,7 +90,6 @@ bvt_2: - vcsrepo - virtual_ips - xinetd - - vmware - wait_for_backend - wait_for_keystone_backends - wait_for_glance_backends diff --git a/packages_tests/deb/packages.yaml b/packages_tests/deb/packages.yaml index 372095eb0..28ed417b9 100644 --- a/packages_tests/deb/packages.yaml +++ b/packages_tests/deb/packages.yaml @@ -860,7 +860,6 @@ deployment: - neutron-plugin-plumgrid - neutron-plugin-ryu - neutron-plugin-ryu-agent - - neutron-plugin-vmware - neutron-plugin-vpn-agent - neutron-server - neutron-vpn-agent @@ -1602,7 +1601,6 @@ deployment: - ceph - cgroup-lite - cirros-testvm - - cirros-testvmware - cloud-init - cluster-glue - conntrack @@ -1831,7 +1829,6 @@ deployment: - python-oslo.i18n - python-oslo.serialization - python-oslo.utils - - python-oslo.vmware - python-osprofiler - python-pam - python-pecan diff --git a/packages_tests/rpm/packages.yaml b/packages_tests/rpm/packages.yaml index 796ee1da8..5814b7341 100644 --- a/packages_tests/rpm/packages.yaml +++ b/packages_tests/rpm/packages.yaml @@ -788,7 +788,6 @@ deployment: - openstack-neutron-openvswitch - openstack-neutron-plumgrid - openstack-neutron-ryu - - openstack-neutron-vmware - openstack-neutron-vpn-agent - python-neutron - dkms @@ -875,7 +874,6 @@ deployment: - cifs-utils - cirros-testvm - cirros-testvm-mellanox - - cirros-testvmware - cloud-init - cloud-utils - cloud-utils-growpart @@ -1291,7 +1289,6 @@ deployment: - python-openstackclient - python-oslo-config-doc - python-oslo-rootwrap - - python-oslo-vmware - python-osnagios - python-osprofiler - python-paste-deploy1.5 diff --git a/system_test/actions/__init__.py b/system_test/actions/__init__.py index 5669b5690..bc5099f11 100644 --- a/system_test/actions/__init__.py +++ b/system_test/actions/__init__.py @@ -14,7 +14,6 @@ from .base import BaseActions from .fuelmaster_actions import FuelMasterActions -from .vcenter_actions import VMwareActions from .strength_actions import StrengthActions from .strength_actions import FillRootActions @@ -22,7 +21,6 @@ from .strength_actions import FillRootActions __all__ = [ 'BaseActions', 'FuelMasterActions', - 'VMwareActions', 'StrengthActions', 'FillRootActions' ] diff --git a/system_test/actions/base.py b/system_test/actions/base.py index ab058a182..296a37831 100644 --- a/system_test/actions/base.py +++ b/system_test/actions/base.py @@ -15,8 +15,6 @@ from __future__ import division import time -import itertools - from proboscis import SkipTest from proboscis.asserts import assert_equal @@ -37,7 +35,6 @@ from system_test import deferred_decorator from system_test.actions.ostf_actions import HealthCheckActions from system_test.actions.plugins_actions import PluginsActions -from system_test.actions.vcenter_actions import VMwareActions from system_test.core.discover import load_yaml from system_test.helpers.decorators import make_snapshot_if_step_fail @@ -192,8 +189,7 @@ class PrepareActions(object): # noinspection PyUnresolvedReferences -class BaseActions(PrepareActions, HealthCheckActions, PluginsActions, - VMwareActions): +class BaseActions(PrepareActions, HealthCheckActions, PluginsActions): """Basic actions for acceptance cases For choosing action order use actions_order variable, set list of actions @@ -456,15 +452,6 @@ class BaseActions(PrepareActions, HealthCheckActions, PluginsActions, self._add_node([node]) elif node['action'] == 'delete': self._del_node([node]) - if 'compute-vmware' in node['roles']: - self.del_vmware_nova_compute() - elif node['action'] == 'reconfigure': - if node.get('vmware_vcenter'): - nova_computes = node['vmware_vcenter']['nova-compute'] - self.add_vmware_nova_compute(nova_computes) - if node.get('vmware_dvs'): - dvs_settings = node['vmware_dvs'] - self.update_dvs_plugin_settings(dvs_settings) else: logger.error("Unknown scale action: {}".format(node['action'])) self.scale_step += 1 @@ -539,66 +526,6 @@ class BaseActions(PrepareActions, HealthCheckActions, PluginsActions, "{}".format(node['action'])) self.power_step += 1 - def add_vmware_nova_compute(self, nova_computes): - vmware_attr = \ - self.fuel_web.client.get_cluster_vmware_attributes(self.cluster_id) - vcenter_data = vmware_attr['editable']['value']['availability_zones'][ - 0]["nova_computes"] - - comp_vmware_nodes = self.fuel_web.get_nailgun_cluster_nodes_by_roles( - self.cluster_id, ['compute-vmware'], role_status='pending_roles') - - comp_vmware_nodes = [n for n in comp_vmware_nodes if - n['pending_addition']] - - for instance in nova_computes: - cluster_name = instance['cluster'] - srv_name = instance['srv_name'] - datastore = instance['datastore'] - if instance['target_node'] == 'compute-vmware': - node = comp_vmware_nodes.pop() - target_node = node['hostname'] - else: - target_node = instance['target_node'] - - vcenter_data[:] = [n for n in vcenter_data if - cluster_name != n['vsphere_cluster']] - - vcenter_data.append( - {"vsphere_cluster": cluster_name, - "service_name": srv_name, - "datastore_regex": datastore, - "target_node": { - "current": {"id": target_node, - "label": target_node}, - "options": [{"id": target_node, - "label": target_node}, ]}, - } - ) - - logger.debug("Try to update cluster with next " - "vmware_attributes {0}".format(vmware_attr)) - self.fuel_web.client.update_cluster_vmware_attributes( - self.cluster_id, vmware_attr) - - def del_vmware_nova_compute(self): - vmware_attr = \ - self.fuel_web.client.get_cluster_vmware_attributes(self.cluster_id) - vcenter_data = vmware_attr['editable']['value']['availability_zones'][ - 0]["nova_computes"] - - comp_vmware_nodes = self.fuel_web.get_nailgun_cluster_nodes_by_roles( - self.cluster_id, ['compute-vmware']) - comp_vmware_nodes = [node for node in comp_vmware_nodes if - node['pending_deletion'] is True] - - for node, nova_comp in itertools.product(comp_vmware_nodes, - vcenter_data): - if node['hostname'] == nova_comp['target_node']['current']['id']: - vcenter_data.remove(nova_comp) - self.fuel_web.client.update_cluster_vmware_attributes(self.cluster_id, - vmware_attr) - @deferred_decorator([make_snapshot_if_step_fail]) @action def reset_cluster(self): diff --git a/system_test/actions/vcenter_actions.py b/system_test/actions/vcenter_actions.py deleted file mode 100644 index 5e40e8f3c..000000000 --- a/system_test/actions/vcenter_actions.py +++ /dev/null @@ -1,1081 +0,0 @@ -# Copyright 2016 Mirantis, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE_2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import itertools -from random import randrange -from time import sleep - -from devops.helpers import helpers -from devops.helpers.ssh_client import SSHAuth -from proboscis import SkipTest -from proboscis.asserts import assert_equal -from proboscis.asserts import assert_not_equal -from proboscis.asserts import assert_true -import requests - -from fuelweb_test.helpers.os_actions import OpenStackActions -from fuelweb_test.helpers.ssh_manager import SSHManager -from fuelweb_test.settings import NEUTRON -from fuelweb_test.settings import SERVTEST_PASSWORD -from fuelweb_test.settings import SERVTEST_TENANT -from fuelweb_test.settings import SERVTEST_USERNAME -from fuelweb_test.settings import SSH_IMAGE_CREDENTIALS -from system_test import action -from system_test import deferred_decorator -from system_test import logger -from system_test.helpers.decorators import make_snapshot_if_step_fail - - -cirros_auth = SSHAuth(**SSH_IMAGE_CREDENTIALS) - - -# pylint: disable=no-member -# noinspection PyUnresolvedReferences -class VMwareActions(object): - """VMware vCenter/DVS related actions.""" - - plugin_version = None - vms_to_ping = [] # instances which should ping each other - vip_contr = None # controller with VIP resources - primary_ctlr_ng = None # nailgun primary controller - os_conn = None - vcenter_az = 'vcenter' - cinder_az = 'vcenter-cinder' - vmware_image = 'TestVM-VMDK' - net_name = 'admin_internal_net' - sg_name = 'default' - image_name = None - image_url = None - image_creds = None - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def configure_dvs_plugin(self): - """Configure DVS plugin.""" - msg = "Plugin couldn't be enabled. Check plugin version. Test aborted" - assert_true( - self.fuel_web.check_plugin_exists( - self.cluster_id, - self.plugin_name), - msg) - - dvs_settings = self.full_config['template']['cluster_template'][ - 'settings']['vmware_dvs'] - self.update_dvs_plugin_settings(dvs_settings) - - def update_dvs_plugin_settings(self, dvs_settings): - """Update plugin settings - :param dvs_settings: dict - """ - - options = { - 'vmware_dvs_fw_driver/value': dvs_settings['dvs_fw_driver'], - 'vmware_dvs_net_maps/value': dvs_settings['dvswitch_name'] - } - - self.fuel_web.update_plugin_settings( - self.cluster_id, self.plugin_name, self.plugin_version, options, - enabled=True) - - @staticmethod - def config_attr_vcenter(vmware_attr, vc_user, vc_host, vc_az, vc_pwd, - ca_bypass, ca_file): - """Update and return the dictionary with vCenter attributes.""" - logger.info('Configuring vCenter...') - - vc_values = vmware_attr['editable']['value']['availability_zones'][0] - computes = vc_values['nova_computes'][:] - - az_params = { - "vcenter_username": vc_user, - "nova_computes": computes, - "vcenter_host": vc_host, - "az_name": vc_az, - "vcenter_password": vc_pwd, - "vcenter_insecure": ca_bypass, - "vcenter_ca_file": ca_file - } - - vc_values.update(az_params) - return vmware_attr - - def config_attr_glance(self, vmware_attr, host, user, pwd, dc, ds, - ca_bypass, ca_file): - """Update and return the dictionary with Glance attributes.""" - cluster_attr = self.fuel_web.client.get_cluster_attributes( - self.cluster_id) - cluster_attr['editable']['storage']['images_vcenter']['value'] = True - self.fuel_web.client.update_cluster_attributes(self.cluster_id, - cluster_attr) - - vcenter_value = { - "glance": { - "vcenter_host": host, - "vcenter_username": user, - "vcenter_password": pwd, - "datacenter": dc, - "datastore": ds, - "vcenter_insecure": ca_bypass, - "ca_file": ca_file - } - } - - vmware_attr['editable']['value'].update(vcenter_value) - return vmware_attr - - def config_attr_computes(self, vmware_attr, clusters): - """Configure Nova Computes for VMware. - - :param clusters: dictionary with string keys: cluster name (cluster), - service name (srv_name), datastore regex (datastore), - target node (target_node) - """ - nodes = self.fuel_web.client.list_cluster_nodes(self.cluster_id) - comp_vmware_nodes = [node for node in nodes if {'compute-vmware'} <= - set(node['pending_roles'] + node['roles'])] - - vc_values = vmware_attr['editable']['value'] - vc_values["availability_zones"][0]["nova_computes"] = [] - - for cluster in clusters: - cluster_name = cluster['cluster'] - srv_name = cluster['srv_name'] - datastore = cluster['datastore'] - if cluster['target_node'] == 'compute-vmware': - node = comp_vmware_nodes.pop() - target_node = node['hostname'] - else: - target_node = cluster['target_node'] - - vc_values["availability_zones"][0]["nova_computes"].append({ - "vsphere_cluster": cluster_name, - "service_name": srv_name, - "datastore_regex": datastore, - "target_node": { - "current": { - "id": target_node, - "label": target_node - }, - "options": [{ - "id": target_node, - "label": target_node - }] - } - }) - - vmware_attr.update(vc_values) - return vmware_attr - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def configure_vcenter(self): - """Configure vCenter settings.""" - vmware_vcenter = self.env_settings['vmware_vcenter'] - vmware_attr = self.fuel_web.client.get_cluster_vmware_attributes( - self.cluster_id) - - settings = vmware_vcenter['settings'] - cert_data = {} - if not settings['ca_bypass']: - file_url = settings['ca_file'] - r = requests.get(file_url) - cert_data["content"] = r.text - cert_data["name"] = file_url.split('/')[-1] - vmware_attr = self.config_attr_vcenter(vmware_attr=vmware_attr, - vc_user=settings['user'], - vc_host=settings['host'], - vc_az=settings['az'], - vc_pwd=settings['pwd'], - ca_bypass=settings['ca_bypass'], - ca_file=cert_data) - - glance = vmware_vcenter['glance'] - if glance['enable']: - cert_data = {} - if not glance['ca_bypass']: - file_url = glance['ca_file'] - r = requests.get(file_url) - cert_data["content"] = r.text - cert_data["name"] = file_url.split('/')[-1] - vmware_attr = \ - self.config_attr_glance(vmware_attr=vmware_attr, - host=glance['host'], - user=glance['user'], - pwd=glance['pwd'], - dc=glance['datacenter'], - ds=glance['datastore'], - ca_bypass=glance['ca_bypass'], - ca_file=cert_data) - - vmware_attr = self.config_attr_computes( - vmware_attr=vmware_attr, clusters=vmware_vcenter['nova-compute']) - - self.fuel_web.client.update_cluster_vmware_attributes( - self.cluster_id, vmware_attr) - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def configure_vcenter_incorrect(self): - """Configure vCenter settings with incorrect data.""" - vmware_vcenter = self.env_settings['vmware_vcenter'] - vmware_attr = self.fuel_web.client.get_cluster_vmware_attributes( - self.cluster_id) - - vmware_attr = self.config_attr_vcenter(vmware_attr=vmware_attr, - vc_user='user', - vc_host='8.8.8.8', - vc_az='az', - vc_pwd='pwd', - ca_bypass=True, - ca_file='') - - glance = vmware_vcenter['glance'] - if glance['enable']: - vmware_attr = self.config_attr_glance(vmware_attr=vmware_attr, - host='8.8.8.8', - user='user', - pwd='pwd', - dc='dc', - ds='!@#$%^&*()', - ca_bypass=True, - ca_file='') - - clusters = [{ - 'cluster': 'Cluster1!', - 'srv_name': 'any', - 'datastore': '!@#$%^&*()', - 'target_node': 'controllers' - }, { - 'cluster': 'Cluster2!', - 'srv_name': 'any2', - 'datastore': '!@#$%^&*()', - 'target_node': 'compute-vmware' - }] - - vmware_attr = self.config_attr_computes(vmware_attr=vmware_attr, - clusters=clusters) - - self.fuel_web.client.update_cluster_vmware_attributes( - self.cluster_id, vmware_attr) - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def set_custom_node_names(self): - """Set custom node names.""" - custom_hostnames = [] - for node in self.fuel_web.client.list_cluster_nodes(self.cluster_id): - custom_hostname = "{0}-{1}".format( - node['pending_roles'][0], randrange(0, 0xffff)) - custom_hostnames.append(custom_hostname) - self.fuel_web.client.set_hostname(node['id'], custom_hostname) - - @staticmethod - def get_nova_conf_dict(az, nova): - """Return nova conf_dict. - - :param az: vcenter az (api), dict - :param nova: nova (api), dict - :return: dict - """ - conf_dict = { - 'host': 'vcenter-{}'.format(nova['service_name']), - 'cluster_name': nova['vsphere_cluster'], - 'datastore_regex': nova['datastore_regex'], - 'host_username': az['vcenter_username'], - 'host_password': az['vcenter_password'], - 'host_ip': az['vcenter_host'], - 'insecure': az['vcenter_insecure'] - } - return conf_dict - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def check_nova_conf(self): - """Verify nova-compute vmware configuration.""" - nodes = self.fuel_web.client.list_cluster_nodes(self.cluster_id) - vmware_attr = self.fuel_web.client.get_cluster_vmware_attributes( - self.cluster_id) - az = vmware_attr['editable']['value']['availability_zones'][0] - nova_computes = az['nova_computes'] - - data = [] - ctrl_nodes = self.fuel_web.get_nailgun_cluster_nodes_by_roles( - self.cluster_id, ["controller"]) - for nova in nova_computes: - target_node = nova['target_node']['current']['id'] - conf_dict = self.get_nova_conf_dict(az, nova) - if target_node == 'controllers': - conf_path = '/etc/nova/nova-compute.d/vmware-vcenter_{0}.' \ - 'conf'.format(nova['service_name']) - for node in ctrl_nodes: - params = (node['hostname'], node['ip'], conf_path, - conf_dict) - data.append(params) - else: - conf_path = '/etc/nova/nova-compute.conf' - for node in nodes: - if node['hostname'] == target_node: - params = (node['hostname'], node['ip'], conf_path, - conf_dict) - data.append(params) - - for hostname, ip, conf_path, conf_dict in data: - logger.info("Check nova conf of {0}".format(hostname)) - self.check_config(ip, conf_path, conf_dict) - - @staticmethod - def get_cinder_conf_dict(settings): - """Return cinder-vmware conf_dict. - - :param settings: vcenter settings (api), dict - :return: dict - """ - conf_dict = { - 'vmware_host_ip': settings['vcenter_host'], - 'vmware_host_username': settings['vcenter_username'], - 'vmware_host_password': settings['vcenter_password'], - 'vmware_insecure': settings['vcenter_insecure'] - } - return conf_dict - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def check_cinder_conf(self): - """Verify cinder-vmware configuration.""" - vmware_attr = self.fuel_web.client.get_cluster_vmware_attributes( - self.cluster_id) - az = vmware_attr['editable']['value']['availability_zones'][0] - - nodes = self.fuel_web.get_nailgun_cluster_nodes_by_roles( - self.cluster_id, ["cinder-vmware"]) - if not nodes: - raise SkipTest() - - conf_path = '/etc/cinder/cinder.d/vmware-vcenter.conf' - conf_dict = self.get_cinder_conf_dict(az) - data = [(n['hostname'], n['ip']) for n in nodes] - - for hostname, ip in data: - logger.info("Check cinder conf of {0}".format(hostname)) - self.check_config(ip, conf_path, conf_dict) - - @staticmethod - def get_glance_conf_dict(settings): - """Return vmware glance backend conf_dict. - - :param settings: glance settings (api), dict - :return: dict - """ - datastore = "{0}:{1}".format(settings['datacenter'], - settings['datastore']) - conf_dict = { - 'vmware_server_host': settings['vcenter_host'], - 'vmware_server_username': settings['vcenter_username'], - 'vmware_server_password': settings['vcenter_password'], - 'vmware_datastores': datastore, - 'vmware_insecure': settings['vcenter_insecure'] - } - return conf_dict - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def check_glance_conf(self): - """Verify vmware glance backend configuration.""" - cluster_attr = self.fuel_web.client.get_cluster_attributes( - self.cluster_id) - if not cluster_attr['editable']['storage']['images_vcenter']['value']: - raise SkipTest() - - vmware_attr = self.fuel_web.client.get_cluster_vmware_attributes( - self.cluster_id) - glance_settings = vmware_attr['editable']['value']['glance'] - - ctrl_nodes = self.fuel_web.get_nailgun_cluster_nodes_by_roles( - self.cluster_id, ["controller"]) - - conf_path = '/etc/glance/glance-api.conf' - conf_dict = self.get_glance_conf_dict(glance_settings) - data = [(n['hostname'], n['ip']) for n in ctrl_nodes] - - for hostname, ip in data: - logger.info("Check glance conf of {0}".format(hostname)) - self.check_config(ip, conf_path, conf_dict) - - @staticmethod - def check_config(host, path, settings): - """Return vmware glance backend conf_dict. - - :param host: host url or ip, string - :param path: config path, string - :param settings: settings, dict - """ - for key in settings.keys(): - cmd = 'grep {1} {0} | grep -i "{2}"'.format(path, key, - settings[key]) - logger.debug('CMD: {}'.format(cmd)) - SSHManager().check_call(host, cmd) - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def check_nova_srv(self): - """Verify nova-compute service for each vSphere cluster.""" - vmware_attr = self.fuel_web.client.get_cluster_vmware_attributes( - self.cluster_id) - az = vmware_attr['editable']['value']['availability_zones'][0] - nova_computes = az['nova_computes'] - - ctrl_nodes = self.fuel_web.get_nailgun_cluster_nodes_by_roles( - self.cluster_id, ["controller"]) - for nova in nova_computes: - srv_name = nova['service_name'] - cmd = '. openrc; nova-manage service describe_resource ' \ - 'vcenter-{}'.format(srv_name) - logger.debug('CMD: {}'.format(cmd)) - SSHManager().execute_on_remote(ctrl_nodes[0]['ip'], - cmd) - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def check_cinder_vmware_srv(self): - """Verify cinder-vmware service.""" - ctrl_nodes = self.fuel_web.get_nailgun_cluster_nodes_by_roles( - self.cluster_id, ["controller"]) - cmd = '. openrc; cinder-manage service list | grep vcenter | ' \ - 'grep ":-)"' - logger.debug('CMD: {}'.format(cmd)) - SSHManager().execute_on_remote(ctrl_nodes[0]['ip'], cmd) - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def deploy_changes(self): - """Deploy environment.""" - if self.cluster_id is None: - raise SkipTest("The cluster_id is not specified, can not deploy") - - self.fuel_web.deploy_cluster_wait(self.cluster_id, - check_services=False) - - @action - def create_and_attach_empty_volume(self): - """Create and attach to instance empty volume.""" - mount_point = '/dev/sdb' - - public_ip = self.fuel_web.get_public_vip(self.cluster_id) - os_conn = OpenStackActions(public_ip) - - vol = os_conn.create_volume(availability_zone=self.cinder_az) - image = os_conn.get_image(self.vmware_image) - net = os_conn.get_network(self.net_name) - sg = os_conn.get_security_group(self.sg_name) - vm = os_conn.create_server(image=image, - availability_zone=self.vcenter_az, - security_groups=[sg], - net_id=net['id'], - timeout=210) - floating_ip = os_conn.assign_floating_ip(vm) - helpers.wait(lambda: helpers.tcp_ping(floating_ip.ip, 22), timeout=180, - timeout_msg="Node {ip} is not accessible by SSH.".format( - ip=floating_ip.ip)) - - logger.info("Attaching volume via cli") - ctrl_nodes = self.fuel_web.get_nailgun_cluster_nodes_by_roles( - self.cluster_id, ["controller"]) - cmd = '. openrc; nova volume-attach {srv_id} {volume_id} {mount}' \ - ''.format(srv_id=vm.id, volume_id=vol.id, mount=mount_point) - logger.debug('CMD: {}'.format(cmd)) - SSHManager().execute_on_remote(ctrl_nodes[0]['ip'], cmd) - - helpers.wait( - lambda: os_conn.get_volume_status(vol) == "in-use", - timeout=30, timeout_msg="Volume doesn't reach 'in-use' state") - - vm.reboot() - sleep(10) - helpers.wait(lambda: helpers.tcp_ping(floating_ip.ip, 22), timeout=180, - timeout_msg="Node {ip} is not accessible by SSH.".format( - ip=floating_ip.ip)) - - controller = self.fuel_web.get_nailgun_cluster_nodes_by_roles( - self.cluster_id, ["controller"])[0] - with self.fuel_web.get_ssh_for_nailgun_node(controller) as remote: - cmd = 'sudo /sbin/fdisk -l | grep {}'.format(mount_point) - res = remote.execute_through_host( - hostname=floating_ip.ip, - cmd=cmd, - auth=cirros_auth - ) - logger.debug('OUTPUT: {}'.format(res['stdout_str'])) - assert_equal(res['exit_code'], 0, "Attached volume is not found") - - os_conn.delete_instance(vm) - os_conn.verify_srv_deleted(vm) - os_conn.delete_volume(vol) - - @action - def create_bootable_volume_and_run_instance(self): - """Create bootable volume and launch instance from it.""" - public_ip = self.fuel_web.get_public_vip(self.cluster_id) - os_conn = OpenStackActions(public_ip) - - image = os_conn.get_image(self.vmware_image) - vol = os_conn.create_volume(image_id=image.id, - availability_zone=self.cinder_az) - block_device_mapping = {'vda': vol.id} - - net = os_conn.get_network(self.net_name) - vm = os_conn.create_server(availability_zone=self.vcenter_az, - image=False, - net_id=net['id'], - block_device_mapping=block_device_mapping, - timeout=210) - floating_ip = os_conn.assign_floating_ip(vm) - helpers.wait(lambda: helpers.tcp_ping(floating_ip.ip, 22), timeout=180, - timeout_msg="Node {ip} is not accessible by SSH.".format( - ip=floating_ip.ip)) - - os_conn.delete_instance(vm) - os_conn.verify_srv_deleted(vm) - os_conn.delete_volume_and_wait(vol) - - @action - def check_vmware_service_actions(self): - """Disable vmware host (cluster) and check instance creation on - enabled cluster.""" - public_ip = self.fuel_web.get_public_vip(self.cluster_id) - os_conn = OpenStackActions(public_ip) - - services = os_conn.get_nova_service_list() - vmware_services = [] - for service in services: - if service.binary == 'nova-compute' and \ - service.zone == self.vcenter_az: - vmware_services.append(service) - os_conn.disable_nova_service(service) - - image = os_conn.get_image(self.vmware_image) - sg = os_conn.get_security_group(self.sg_name) - net = os_conn.get_network(self.net_name) - - for service in vmware_services: - logger.info("Check {}".format(service.host)) - os_conn.enable_nova_service(service) - vm = os_conn.create_server(image=image, timeout=210, - availability_zone=self.vcenter_az, - net_id=net['id'], security_groups=[sg]) - vm_host = getattr(vm, 'OS-EXT-SRV-ATTR:host') - assert_true(service.host == vm_host, 'Instance was launched on a' - ' disabled vmware cluster') - os_conn.delete_instance(vm) - os_conn.verify_srv_deleted(vm) - os_conn.disable_nova_service(service) - - @action - def upload_image(self): - """Upload vmdk image.""" - controller = self.fuel_web.get_nailgun_cluster_nodes_by_roles( - self.cluster_id, ["controller"])[0] - - cmd_add_img = 'glance image-create --name {0!r} --disk-format vmdk ' \ - '--container-format bare --file {1!r} ' \ - '--property hypervisor_type=vmware ' \ - '--property vmware_adaptertype=lsiLogic ' \ - '--property vmware_disktype=sparse' \ - ''.format(self.image_name, self.image_name) - cmd = '. openrc; test -f {0} || (wget -q {1} && {2})'.format( - self.image_name, self.image_url, cmd_add_img) - SSHManager().execute_on_remote(controller['ip'], cmd) - - public_ip = self.fuel_web.get_public_vip(self.cluster_id) - os_conn = OpenStackActions(public_ip) - image = os_conn.get_image(self.image_name) - - helpers.wait(lambda: os_conn.get_image(image.name).status == 'active', - timeout=60 * 2, timeout_msg='Image is not active') - - @action - def check_instance_creation(self): - """Create instance and check connection.""" - public_ip = self.fuel_web.get_public_vip(self.cluster_id) - os_conn = OpenStackActions(public_ip) - - flavor = os_conn.get_flavor_by_name('m1.small') - if self.image_name: - image = os_conn.get_image(self.image_name) - else: - image = os_conn.get_image(self.vmware_image) - sg = os_conn.get_security_group(self.sg_name) - net = os_conn.get_network(self.net_name) - vm = os_conn.create_server(image=image, - availability_zone=self.vcenter_az, - net_id=net['id'], security_groups=[sg], - flavor_id=flavor.id, timeout=900) - floating_ip = os_conn.assign_floating_ip(vm) - helpers.wait(lambda: helpers.tcp_ping(floating_ip.ip, 22), timeout=210, - timeout_msg="Node {ip} is not accessible by SSH.".format( - ip=floating_ip.ip)) - - os_conn.delete_instance(vm) - os_conn.verify_srv_deleted(vm) - - @action - def create_instance_with_vmxnet3_adapter(self): - """Create instance with vmxnet3 adapter.""" - public_ip = self.fuel_web.get_public_vip(self.cluster_id) - os_conn = OpenStackActions(public_ip) - - image = os_conn.get_image(self.image_name) - os_conn.update_image(image, - properties={"hw_vif_model": "VirtualVmxnet3"}) - flavor = os_conn.get_flavor_by_name('m1.small') - sg = os_conn.get_security_group(self.sg_name) - net = os_conn.get_network(self.net_name) - vm = os_conn.create_server(image=image, - availability_zone=self.vcenter_az, - net_id=net['id'], security_groups=[sg], - flavor_id=flavor.id, timeout=900) - floating_ip = os_conn.assign_floating_ip(vm) - helpers.wait(lambda: helpers.tcp_ping(floating_ip.ip, 22), timeout=210, - timeout_msg="Node {ip} is not accessible by SSH.".format( - ip=floating_ip.ip)) - - controller = self.fuel_web.get_nailgun_cluster_nodes_by_roles( - self.cluster_id, ["controller"])[0] - with self.fuel_web.get_ssh_for_nailgun_node(controller) as remote: - cmd = '/usr/bin/lshw -class network | grep vmxnet3' - res = remote.execute_through_host( - hostname=floating_ip.ip, - cmd=cmd, - auth=self.image_creds - ) - logger.debug('OUTPUT: {}'.format(res['stdout_str'])) - assert_equal(res['exit_code'], 0, "VMxnet3 driver is not found") - - os_conn.delete_instance(vm) - os_conn.verify_srv_deleted(vm) - - @action - def check_batch_instance_creation(self): - """Create several instance simultaneously.""" - count = 10 - vm_name = 'vcenter_vm' - - public_ip = self.fuel_web.get_public_vip(self.cluster_id) - os_conn = OpenStackActions(public_ip) - - image = os_conn.get_image(self.vmware_image) - net = os_conn.get_network(self.net_name) - sg = os_conn.get_security_group(self.sg_name) - os_conn.create_server(name=vm_name, image=image, - availability_zone=self.vcenter_az, - net_id=net['id'], security_groups=[sg], - min_count=count, timeout=210) - - for i in range(1, count + 1): - vm = os_conn.get_server_by_name('{name}-{index}'.format( - name=vm_name, index=i)) - logger.info("Check state for {} instance".format(vm.name)) - helpers.wait( - lambda: os_conn.get_instance_detail(vm).status == "ACTIVE", - timeout=180, timeout_msg="Instance state is not active" - ) - - for i in range(1, count + 1): - vm = os_conn.get_server_by_name('{name}-{index}'.format( - name=vm_name, index=i)) - os_conn.delete_instance(vm) - os_conn.verify_srv_deleted(vm) - - @action - def create_instance_with_different_disktype(self): - """Create instances with different disk type.""" - public_ip = self.fuel_web.get_public_vip(self.cluster_id) - os_conn = OpenStackActions(public_ip) - - image = os_conn.get_image(self.vmware_image) - net = os_conn.get_network(self.net_name) - - os_conn.update_image(image, - properties={"vmware_disktype": "sparse"}) - vm = os_conn.create_server(image=image, - availability_zone=self.vcenter_az, - net_id=net['id'], timeout=210) - os_conn.delete_instance(vm) - os_conn.verify_srv_deleted(vm) - - os_conn.update_image(image, - properties={"vmware_disktype": "preallocated "}) - vm = os_conn.create_server(image=image, - availability_zone=self.vcenter_az, - net_id=net['id'], timeout=210) - os_conn.delete_instance(vm) - os_conn.verify_srv_deleted(vm) - - os_conn.update_image(image, - properties={"vmware_disktype": "thin "}) - vm = os_conn.create_server(image=image, - availability_zone=self.vcenter_az, - net_id=net['id'], timeout=210) - os_conn.delete_instance(vm) - os_conn.verify_srv_deleted(vm) - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def check_neutron_public(self): - """Check that public network was assigned to all nodes.""" - cluster = self.fuel_web.client.get_cluster(self.cluster_id) - assert_equal(str(cluster['net_provider']), NEUTRON) - os_conn = OpenStackActions( - self.fuel_web.get_public_vip(self.cluster_id)) - self.fuel_web.check_fixed_network_cidr( - self.cluster_id, os_conn) - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def check_gw_on_vmware_nodes(self): - """Check that default gw != fuel node ip.""" - vmware_nodes = [] - vmware_nodes.extend(self.fuel_web.get_nailgun_cluster_nodes_by_roles( - self.cluster_id, ["compute-vmware"])) - vmware_nodes.extend(self.fuel_web.get_nailgun_cluster_nodes_by_roles( - self.cluster_id, ["cinder-vmware"])) - logger.debug('Fuel ip is {0}'.format(self.fuel_web.admin_node_ip)) - for node in vmware_nodes: - cmd = "ip route | grep default | awk '{print $3}'" - gw_ip = SSHManager().execute_on_remote(node['ip'], cmd) - logger.debug('Default gw for node {0} is {1}'.format( - node['name'], gw_ip['stdout_str'])) - assert_not_equal(gw_ip['stdout_str'], self.fuel_web.admin_node_ip) - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def config_idatastore(self): - """Reconfigure vCenter settings with incorrect regex of Datastore.""" - vmware_vcenter = self.env_settings['vmware_vcenter'] - instances = vmware_vcenter['nova-compute'] - - vmware_attr = \ - self.fuel_web.client.get_cluster_vmware_attributes(self.cluster_id) - vcenter_data = vmware_attr['editable'] - for i in range(len(instances)): - vcenter_data['value']['availability_zones'][0]['nova_computes'][i][ - 'datastore_regex'] = '!@#$%^&*()' - - self.fuel_web.client.update_cluster_vmware_attributes(self.cluster_id, - vmware_attr) - logger.info("Datastore regex settings have been updated") - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def config_idc_glance(self): - """Reconfigure vCenter settings with incorrect Glance Datacenter.""" - vmware_attr = \ - self.fuel_web.client.get_cluster_vmware_attributes(self.cluster_id) - vcenter_data = vmware_attr['editable'] - vcenter_data['value']['glance']['datacenter'] = '!@#$%^&*()' - - self.fuel_web.client.update_cluster_vmware_attributes(self.cluster_id, - vmware_attr) - logger.info("Glance datacenter settings have been updated") - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def config_ids_glance(self): - """Reconfigure vCenter settings with incorrect Glance Datastore.""" - vmware_attr = \ - self.fuel_web.client.get_cluster_vmware_attributes(self.cluster_id) - vcenter_data = vmware_attr['editable'] - vcenter_data['value']['glance']['datastore'] = '!@#$%^&*()' - - self.fuel_web.client.update_cluster_vmware_attributes(self.cluster_id, - vmware_attr) - - logger.info("Glance datastore settings have been updated") - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def delete_instances(self): - """Delete created instances.""" - for srv in self.vms_to_ping: - logger.info('Started: delete existing VM "{}"'.format(srv.name)) - self.os_conn.nova.servers.delete(srv) - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def create_instances(self): - """Create instances with nova az and vcenter az.""" - os_ip = self.fuel_web.get_public_vip(self.cluster_id) - self.os_conn = OpenStackActions( - os_ip, SERVTEST_USERNAME, - SERVTEST_PASSWORD, - SERVTEST_TENANT - ) - vcenter_az = self.env_settings['vmware_vcenter']['settings']['az'] - net = self.os_conn.get_network(self.net_name) - sec_group = self.os_conn.create_sec_group_for_ssh() - - inst_count = 1 # amount of VMs to create on each az - vc_inst_name_prefix = 'vcenter-test' - vc_image = self.os_conn.get_image('TestVM-VMDK') - nova_inst_name_prefix = 'nova-test' - nova_image = self.os_conn.get_image('TestVM') - - logger.info( - 'Started: create {num} VM(s) with net="{net}", az="{az}", ' - 'image="{image}"'.format(num=inst_count, net=net['name'], - az=vcenter_az, image='TestVM-VMDK') - ) - self.os_conn.create_server( - name=vc_inst_name_prefix, - net_id=net['id'], - availability_zone=vcenter_az, - image=vc_image, - timeout=210, - security_groups=[sec_group], - min_count=inst_count - ) - - logger.info( - 'Started: create {num} VM(s) with net="{net}", az="{az}", ' - 'image="{image}"'.format(num=inst_count, net=net['name'], - az='nova', image='TestVM') - ) - self.os_conn.create_server( - name=nova_inst_name_prefix, - net_id=net['id'], - image=nova_image, - security_groups=[sec_group], - availability_zone='nova', - min_count=inst_count - ) - - servers = self.os_conn.nova.servers.list() - self.vms_to_ping = [srv for srv in servers if - srv.name.startswith(vc_inst_name_prefix) or - srv.name.startswith(nova_inst_name_prefix)] - - def _get_controller_with_vip(self): - """Return name of controller with VIPs.""" - for node in self.env.d_env.nodes().slaves: - ng_node = self.fuel_web.get_nailgun_node_by_devops_node(node) - if ng_node['online'] and 'controller' in ng_node['roles']: - hosts_vip = self.fuel_web.get_pacemaker_resource_location( - ng_node['devops_name'], 'vip__management') - logger.info('Now primary controller is ' - '{}'.format(hosts_vip[0].name)) - return hosts_vip[0].name - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def hard_reset_primary(self): - """Hard reboot of primary controller.""" - self.vip_contr = self._get_controller_with_vip() - - self.primary_ctlr_ng = self.fuel_web.get_nailgun_primary_node( - self.env.d_env.nodes().slaves[0]) - - self.fuel_web.cold_restart_nodes([self.primary_ctlr_ng]) - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def shutdown_primary(self): - """Shut down primary controller.""" - self.vip_contr = self._get_controller_with_vip() - - self.primary_ctlr_ng = self.fuel_web.get_nailgun_primary_node( - self.env.d_env.nodes().slaves[0]) - - self.primary_ctlr_ng.destroy() - - timeout = 60 * 10 - logger.info('Wait offline status for ' - '{ctrlr}'.format(ctrlr=self.primary_ctlr_ng.name)) - - helpers.wait(lambda: self.fuel_web.get_nailgun_node_by_devops_node( - self.primary_ctlr_ng)['online'] is not True, - timeout=timeout, - timeout_msg="Primary controller is still online") - logger.info('Primary controller is offline') - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def safe_reboot_primary(self): - """Safe reboot primary controller.""" - self.vip_contr = self._get_controller_with_vip() - - self.primary_ctlr_ng = self.fuel_web.get_nailgun_primary_node( - self.env.d_env.nodes().slaves[0]) - - self.fuel_web.warm_restart_nodes([self.primary_ctlr_ng]) - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def check_up_vips(self): - """Ensure that VIPs are moved to another controller.""" - vip_contr = self._get_controller_with_vip() - - assert_true(vip_contr and vip_contr != self.vip_contr, - 'VIPs have not been moved to another controller') - logger.info('VIPs have been moved to another controller') - - # @deferred_decorator([make_snapshot_if_step_fail]) - @action - def turn_on_primary(self): - """Turn on primary controller.""" - self.primary_ctlr_ng.start() - logger.info('Started: turn on primary controller ' - '{name}'.format(name=self.primary_ctlr_ng.name)) - - timeout = 60 * 10 - logger.info('Wait online status for ' - '{name}'.format(name=self.primary_ctlr_ng.name)) - - helpers.wait(lambda: self.fuel_web.get_nailgun_node_by_devops_node( - self.primary_ctlr_ng)['online'], timeout=timeout, - timeout_msg="Primary controller is still offline") - logger.info('Primary controller is online') - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def vcenter_ostf(self): - """Run vCenter OSTF tests.""" - self.fuel_web.run_ostf( - cluster_id=self.cluster_id, - test_sets=['smoke'], - should_fail=getattr(self, 'ostf_tests_should_failed', 0), - failed_test_name=getattr(self, 'failed_test_name', None)) - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def ostf_with_haproxy_fail(self): - """Run OSTF tests (one should fail).""" - self.fuel_web.run_ostf( - self.cluster_id, - test_sets=['sanity', 'smoke', 'ha'], - should_fail=1, - failed_test_name=['Check state of haproxy backends on controllers'] - ) - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def fail_ostf(self): - """Run OSTF tests (must fail).""" - try: - self.fuel_web.run_ostf( - self.cluster_id, - test_sets=['sanity', 'smoke', 'ha']) - failed = False - except AssertionError: - failed = True - assert_true(failed, 'OSTF passed with incorrect parameters') - logger.info('OSTF failed') - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def fail_deploy_cluster(self): - """Deploy environment (must fail).""" - try: - self.fuel_web.deploy_cluster_wait(self.cluster_id) - failed = False - except AssertionError: - failed = True - assert_true(failed, 'Deploy passed with incorrect parameters') - logger.info('Deploy failed') - - def ping_from_instance(self, src_floating_ip, dst_ip, primary, - size=56, count=1): - """Verify ping between instances. - - :param src_floating_ip: floating ip address of instance - :param dst_ip: destination ip address - :param primary: name of the primary controller - :param size: number of data bytes to be sent - :param count: number of packets to be sent - """ - - with self.fuel_web.get_ssh_for_node(primary) as ssh: - command = "ping -s {0} -c {1} {2}".format(size, count, - dst_ip) - ping = ssh.execute_through_host( - hostname=src_floating_ip, - cmd=command, - auth=cirros_auth - ) - - logger.info("Ping result is {}".format(ping['stdout_str'])) - return 0 == ping['exit_code'] - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def check_vm_connect(self): - """Ensure connectivity between VMs.""" - if self.vip_contr: - primary_ctrl_name = self._get_controller_with_vip() - else: - primary_ctrl_name = self.fuel_web.get_nailgun_primary_node( - self.env.d_env.nodes().slaves[0]).name - - private_ips = {} - floating_ips = {} - - for srv in self.vms_to_ping: - floating = self.os_conn.assign_floating_ip(srv) - floating_ips[srv] = floating.ip - logger.info("Floating address {0} was associated with instance " - "{1}".format(floating_ips[srv], srv.name)) - - private_ips[srv] = self.os_conn.get_nova_instance_ip( - srv, net_name=self.net_name) - - for vm in itertools.combinations(self.vms_to_ping, 2): - logger.info('Try to ping from {src} ({src_vm}) to {dst} ' - '({dst_vm})'.format(src=floating_ips[vm[0]], - dst=private_ips[vm[1]], - src_vm=vm[0].name, - dst_vm=vm[1].name)) - - assert_true(self.ping_from_instance(floating_ips[vm[0]], - private_ips[vm[1]], - primary_ctrl_name), - 'Ping between VMs failed') - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def wait_ha_services(self): - """Wait for HA services.""" - self.fuel_web.assert_ha_services_ready(self.cluster_id) - - def mcollective_nodes_online(self): - nodes_uids = set( - [str(node['id']) for node in - self.fuel_web.client.list_cluster_nodes(self.cluster_id)] - ) - ssh_manager = SSHManager() - out = ssh_manager.execute_on_remote( - ip=ssh_manager.admin_ip, - cmd='mco find', - assert_ec_equal=[0, 1] - )['stdout_str'] - ready_nodes_uids = set(out.split('\n')) - unavailable_nodes = nodes_uids - ready_nodes_uids - logger.debug('Nodes {0} are not reacheable via' - ' mcollective'.format(unavailable_nodes)) - return not unavailable_nodes - - @deferred_decorator([make_snapshot_if_step_fail]) - @action - def wait_mcollective(self): - """Wait for mcollective online status of nodes.""" - helpers.wait(lambda: self.mcollective_nodes_online(), timeout=60 * 5, - timeout_msg="Cluster nodes don't become available " - "via mcollective in allotted time.") diff --git a/system_test/tests/vcenter/__init__.py b/system_test/tests/vcenter/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/system_test/tests/vcenter/test_vcenter_cluster_actions.py b/system_test/tests/vcenter/test_vcenter_cluster_actions.py deleted file mode 100644 index 8dba5f782..000000000 --- a/system_test/tests/vcenter/test_vcenter_cluster_actions.py +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 2016 Mirantis, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE_2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from fuelweb_test.settings import DVS_PLUGIN_PATH -from fuelweb_test.settings import DVS_PLUGIN_VERSION - -from system_test import testcase -from system_test.actions import BaseActions -from system_test.actions import VMwareActions -from system_test.tests import ActionTest - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.vcenter_redeploy_successful_cluster']) -class RedeploySuccessfulWithVMware(ActionTest, BaseActions, VMwareActions): - """Reset and redeploy cluster with vCenter after successful deployment. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Run OSTF - 9. Reset cluster - 10. Check networks - 11. Redeploy cluster - 12. Run OSTF - - Duration 3h 00min - Snapshot cluster_actions_redeploy_successful - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'health_check', - 'reset_cluster', - 'wait_mcollective', - 'network_check', - 'deploy_cluster', - 'health_check' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.vcenter_redeploy_stopped_cluster']) -class RedeployAfterStopWithVMware(ActionTest, BaseActions, VMwareActions): - """Stop and redeploy cluster with vCenter with new parameters. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings with incorrect values - 7. Stop on cluster deploy (needs env variable PROGRESS_TO_STOP=50) - 8. Configure vmware settings (depends on yaml config) - 9. Check networks - 10. Deploy cluster - 11. Run OSTF - - Duration 3h 00min - Snapshot cluster_actions_redeploy_stopped - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter_incorrect', - 'stop_on_deploy', - 'wait_mcollective', - 'configure_vcenter', - 'network_check', - 'deploy_cluster', - 'health_check', - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.vcenter_redeploy_failed_cluster']) -class RedeployFailedWithVMware(ActionTest, BaseActions, VMwareActions): - """Redeploy cluster with vCenter after failed deployment. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings with incorrect values - 7. Deploy the cluster (deploy should fail) - 8. Configure vmware settings (depends on yaml config) - 9. Redeploy cluster - 10. Run OSTF - - Duration 3h 00min - Snapshot cluster_actions_redeploy_failed - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter_incorrect', - 'fail_deploy_cluster', - 'configure_vcenter', - 'deploy_cluster', - 'health_check' - ] diff --git a/system_test/tests/vcenter/test_vcenter_dvs.py b/system_test/tests/vcenter/test_vcenter_dvs.py deleted file mode 100644 index 4880aef4c..000000000 --- a/system_test/tests/vcenter/test_vcenter_dvs.py +++ /dev/null @@ -1,583 +0,0 @@ -# Copyright 2015 Mirantis, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE_2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from devops.helpers.ssh_client import SSHAuth - -from fuelweb_test.settings import DVS_PLUGIN_PATH -from fuelweb_test.settings import DVS_PLUGIN_VERSION -from fuelweb_test.settings import VMWARE_IMG_LOGIN -from fuelweb_test.settings import VMWARE_IMG_NAME -from fuelweb_test.settings import VMWARE_IMG_PASSWORD -from fuelweb_test.settings import VMWARE_IMG_URL - -from system_test import testcase -from system_test.actions import BaseActions -from system_test.actions import VMwareActions -from system_test.tests import ActionTest - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.deploy_vcenter_dvs_run_ostf']) -class DeployWithVMware(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and dvs plugin. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Run OSTF - - Duration 2h 00min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'health_check_sanity_smoke_ha' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.scale_vcenter_dvs']) -class ScaleWithVMware(ActionTest, BaseActions, VMwareActions): - """Deploy and scale cluster with vCenter and dvs plugin. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Run network verification - 8. Deploy the cluster - 9. Add/Delete nodes - 10. Redeploy cluster - 11. Run OSTF - - Duration 3h 00min - Snapshot scale_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'network_check', - 'deploy_cluster', - 'scale_node', - 'deploy_changes', - 'check_nova_conf', - 'health_check_sanity_smoke_ha' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.deploy_vcenter_dvs_run_platform_ostf']) -class DeployWithVMwareRunPlatformOSTF(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and dvs plugin. Run platform OSTF. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Run OSTF - 9. Run OSTF (platform tests) - - Duration 2h 20min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'network_check', - 'deploy_cluster', - 'health_check_sanity_smoke_ha', - 'health_check_platform' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.deploy_with_custom_hostname']) -class DeployWithCustomHostname(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and custom hostname. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Set custom hostname for nodes - 7. Configure vmware settings (depends on yaml config) - 8. Deploy the cluster - 9. Run OSTF - - Duration 1h 40min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'set_custom_node_names', - 'configure_vcenter', - 'deploy_cluster', - 'health_check_sanity_smoke_ha' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.check_vcenter_configs']) -class CheckNovaConfig(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and custom hostname. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Check nova configuration (vCenter) - 9. Run OSTF - - Duration 1h 40min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'check_nova_conf', - 'check_cinder_conf', - 'check_glance_conf', - 'health_check_sanity_smoke_ha' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.check_nova_srv']) -class CheckNovaSrv(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and custom hostname. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Check nova services (vCenter) - 9. Run OSTF - - Duration 1h 40min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'check_nova_srv', - 'health_check_sanity_smoke_ha' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.check_cinder_srv']) -class CheckCinderVmwareSrv(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and custom hostname. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Check vmware cinder service - 9. Run OSTF - - Duration 1h 40min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'check_cinder_vmware_srv', - 'health_check_sanity_smoke_ha' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.attach_empty_volume']) -class AttachEmptyVol(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and dvs plugin. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Create and attach to instance empty volume - - Duration 2h 00min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'create_and_attach_empty_volume' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.bootable_vol']) -class BootableVol(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and dvs plugin. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Create bootable volume and launch instance from it - - Duration 2h 00min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'create_bootable_volume_and_run_instance' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.disable_enable_compute_service']) -class DisableEnableVMwareServices(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and dvs plugin. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Disable/enable vmware compute hosts and run instance - - Duration 2h 00min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'check_vmware_service_actions' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.upload_image']) -class UploadImage(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and dvs plugin. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Upload ubuntu cloud image - 9. Launch instance - - Duration 2h 00min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - image_name = VMWARE_IMG_NAME - image_url = VMWARE_IMG_URL - image_creds = SSHAuth(VMWARE_IMG_LOGIN, VMWARE_IMG_PASSWORD) - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'upload_image', - 'check_instance_creation' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.vmxnet3']) -class Vmxnet3(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and dvs plugin. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Upload ubuntu cloud image - 9. Launch instance with vmware vmxnet3 adapter - - Duration 2h 00min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - image_name = VMWARE_IMG_NAME - image_url = VMWARE_IMG_URL - image_creds = SSHAuth(VMWARE_IMG_LOGIN, VMWARE_IMG_PASSWORD) - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'upload_image', - 'create_instance_with_vmxnet3_adapter' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.create_batch_of_instances']) -class CreateBatchInstances(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and dvs plugin. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Create several instances simultaneously - - Duration 2h 00min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'check_batch_instance_creation' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.diff_disk_types']) -class DiffDiskTypes(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and dvs plugin. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Create instances with different disk type - - Duration 2h 00min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'create_instance_with_different_disktype' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.neutron_public_net']) -class DeployNeutronPublicNet(ActionTest, BaseActions, VMwareActions): - """Deploy cluster with vCenter and dvs plugin. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Run OSTF - - Duration 2h 00min - Snapshot deploy_vcenter_dvs - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'check_neutron_public', - 'check_gw_on_vmware_nodes' - ] diff --git a/system_test/tests/vcenter/test_vcenter_failover.py b/system_test/tests/vcenter/test_vcenter_failover.py deleted file mode 100644 index 0f083c9b5..000000000 --- a/system_test/tests/vcenter/test_vcenter_failover.py +++ /dev/null @@ -1,372 +0,0 @@ -# Copyright 2015 Mirantis, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE_2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from fuelweb_test.settings import DVS_PLUGIN_PATH -from fuelweb_test.settings import DVS_PLUGIN_VERSION - -from system_test import testcase -from system_test.actions import BaseActions -from system_test.actions import VMwareActions -from system_test.tests import ActionTest - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.vcenter_reset_ctrl']) -class HardResetPrimaryWithVMware(ActionTest, BaseActions, VMwareActions): - """Hard reset primary controller and check vCenter functionality. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Create instances on Nova and vCenter - 9. Hard reset primary controller - 10. Wait 5-10 minutes - 11. Verify networks - 12. Ensure that VIPs are moved to other controller - 13. Ensure connectivity between VMs - 14. Run OSTF tests - - Duration 3h 00min - Snapshot vcenter_reset_ctrl - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'create_instances', - 'hard_reset_primary', - 'wait_ha_services', - 'network_check', - 'check_up_vips', - 'check_vm_connect', - 'delete_instances', - 'health_check' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.vcenter_shutdown_ctrl']) -class ShutdownPrimaryWithVMware(ActionTest, BaseActions, VMwareActions): - """Shutdown primary controller and check vCenter functionality. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Create instances on Nova and vCenter - 9. Add nodes (depends on yaml config) - 10 Deploy changes - 11. Shutdown primary controller - 12. Verify networks - 13. Ensure that VIPs are moved to other controller - 14. Ensure connectivity between VMs - 15. Run OSTF tests (one should fail) - 16. Turn on primary controller - 17. Wait 5-10 minutes - 18. Verify networks - 19. Run OSTF tests - - Duration 3h 00min - Snapshot vcenter_shutdown_ctrl - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'create_instances', - 'scale_node', - 'deploy_changes', - 'shutdown_primary', - 'network_check', - 'check_up_vips', - 'check_vm_connect', - 'delete_instances', - 'ostf_with_haproxy_fail', - 'turn_on_primary', - 'wait_ha_services', - 'network_check', - 'health_check' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.vcenter_reboot_ctrl']) -class SafeRebootPrimaryWithVMware(ActionTest, BaseActions, VMwareActions): - """Safe reboot primary controller and check vCenter functionality. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Create instances on Nova and vCenter - 9. Safe reboot primary controller - 10. Wait 5-10 minutes - 11. Verify networks - 12. Ensure that VIPs are moved to other controller - 13. Ensure connectivity between VMs - 14. Run OSTF tests - - Duration 3h 00min - Snapshot vcenter_reboot_ctrl - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'create_instances', - 'safe_reboot_primary', - 'wait_ha_services', - 'network_check', - 'check_up_vips', - 'check_vm_connect', - 'delete_instances', - 'health_check' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.vcenter_shutdown_cindervmware']) -class ShutdownCinderNodeWithVMware(ActionTest, BaseActions, VMwareActions): - """Shutdown one of CinderVMDK node. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Create instances on KVM and vCenter - 9. Run all OSTF tests - 10. Shutdown one of CinderVMDK node (depends on yaml config) - 11. Run vCenter OSTF tests - 12. Power on CinderVMDK node and wait for it to load (depends on yaml) - 13. Run vCenter OSTF tests - 14. Shutdown another CinderVMDK node (depends on yaml config) - 15. Run vCenter OSTF tests - 16. Power on CinderVMDK node and wait for it to load (depends on yaml) - 17. Run all OSTF tests - - Duration 3h 00min - Snapshot vcenter_shutdown_cindervmware - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'create_instances', - 'health_check_sanity_smoke_ha', - 'manage_nodes_power', - 'vcenter_ostf', - 'manage_nodes_power', - 'vcenter_ostf', - 'manage_nodes_power', - 'vcenter_ostf', - 'manage_nodes_power', - 'delete_instances', - 'health_check_sanity_smoke_ha' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.vcenter_reboot_cindervmware']) -class RebootCinderNodeWithVMware(ActionTest, BaseActions, VMwareActions): - """Restart CinderVMware node. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster - 8. Reboot CinderVMware node (depends on yaml config) - 9. Check CinderVMware services. - - Duration 3h 00min - Snapshot vcenter_reboot_cindervmware - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'deploy_cluster', - 'manage_nodes_power', - 'check_cinder_vmware_srv', - 'health_check' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.vcenter_iname_glance_ds']) -class DeployINameDSWithVMware(ActionTest, BaseActions, VMwareActions): - """Deploy with controller and incorrect name of vCenter Glance Datastore. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster (Deploy should fail) - - Duration 3h 00min - Snapshot vcenter_iname_glance_ds - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'config_ids_glance', - 'fail_deploy_cluster' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.vcenter_iname_glance_dc']) -class DeployINameDCWithVMware(ActionTest, BaseActions, VMwareActions): - """Deploy with controller and incorrect name of vCenter Glance Datacenter. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Deploy the cluster (Deploy should fail) - - Duration 3h 00min - Snapshot vcenter_iname_glance_dc - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'config_idc_glance', - 'fail_deploy_cluster' - ] - - -@testcase(groups=['system_test', - 'system_test.vcenter', - 'system_test.vcenter.vcenter_idatastore']) -class DeployIDSWithVMware(ActionTest, BaseActions, VMwareActions): - """Deploy with controller and not correct regex of vCenter Datastore. - - Scenario: - 1. Upload plugin to the master node - 2. Install plugin - 3. Create cluster - 4. Configure dvs settings (depends on yaml config) - 5. Add nodes (depends on yaml config) - 6. Configure vmware settings (depends on yaml config) - 7. Redefine vmware settings with incorrect ds - 8. Deploy the cluster - 9. Run OSTF tests (should fail) - - Duration 2h 00min - Snapshot vcenter_idatastore - """ - - plugin_name = "fuel-plugin-vmware-dvs" - plugin_path = DVS_PLUGIN_PATH - plugin_version = DVS_PLUGIN_VERSION - - actions_order = [ - 'prepare_env_with_plugin', - 'create_env', - 'configure_dvs_plugin', - 'add_nodes', - 'configure_vcenter', - 'config_idatastore', - 'deploy_cluster', - 'fail_ostf' - ] diff --git a/system_test/tests_templates/cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml b/system_test/tests_templates/cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml deleted file mode 100644 index bedd34c32..000000000 --- a/system_test/tests_templates/cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dvswitch_name: !os_env DVS_NAME, "Cluster1:Cluster1:dvUplink1;dvUplink2:dvUplink3" -dvs_fw_driver: false diff --git a/system_test/tests_templates/cluster_configs/settings/vmware/dvs/dvs_main.yaml b/system_test/tests_templates/cluster_configs/settings/vmware/dvs/dvs_main.yaml deleted file mode 100644 index f9b10b73a..000000000 --- a/system_test/tests_templates/cluster_configs/settings/vmware/dvs/dvs_main.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dvswitch_name: !os_env DVS_NAME, "Cluster1:Cluster1:dvUplink1;dvUplink2:dvUplink3\nCluster2:Cluster2:dvUplink1;dvUplink2:dvUplink3" -dvs_fw_driver: false diff --git a/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/1cluster_comp-vmware.yaml b/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/1cluster_comp-vmware.yaml deleted file mode 100644 index 2e905e65c..000000000 --- a/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/1cluster_comp-vmware.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- cluster: Cluster1 - srv_name: srv_cluster1 - datastore: .* - target_node: compute-vmware \ No newline at end of file diff --git a/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/1cluster_ctrl.yaml b/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/1cluster_ctrl.yaml deleted file mode 100644 index b6a50e997..000000000 --- a/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/1cluster_ctrl.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- cluster: Cluster1 - srv_name: srv_cluster1 - datastore: .* - target_node: controllers \ No newline at end of file diff --git a/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/2clusters_comp-vmware.yaml b/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/2clusters_comp-vmware.yaml deleted file mode 100644 index 697c61c09..000000000 --- a/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/2clusters_comp-vmware.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- cluster: Cluster1 - srv_name: srv_cluster1 - datastore: .* - target_node: compute-vmware -- cluster: Cluster2 - srv_name: srv_cluster2 - datastore: .* - target_node: compute-vmware \ No newline at end of file diff --git a/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/2clusters_ctrl.yaml b/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/2clusters_ctrl.yaml deleted file mode 100644 index 9bf824231..000000000 --- a/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/2clusters_ctrl.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- cluster: Cluster1 - srv_name: srv_cluster1 - datastore: .* - target_node: controllers -- cluster: Cluster2 - srv_name: srv_cluster2 - datastore: .* - target_node: controllers \ No newline at end of file diff --git a/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml b/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml deleted file mode 100644 index 8d55f6213..000000000 --- a/system_test/tests_templates/cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- cluster: Cluster1 - srv_name: srv_cluster1 - datastore: .* - target_node: controllers -- cluster: Cluster2 - srv_name: srv_cluster2 - datastore: .* - target_node: compute-vmware \ No newline at end of file diff --git a/system_test/tests_templates/cluster_configs/settings/vmware/vcenter_glance.yaml b/system_test/tests_templates/cluster_configs/settings/vmware/vcenter_glance.yaml deleted file mode 100644 index 5eaca8974..000000000 --- a/system_test/tests_templates/cluster_configs/settings/vmware/vcenter_glance.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -enable: true -host: !os_env VCENTER_GLANCE_IP, 172.16.0.254 -user: !os_env VCENTER_GLANCE_USERNAME, administrator@vsphere.local -pwd: !os_env VCENTER_GLANCE_PASSWORD, Qwer!1234 -datacenter: !os_env VCENTER_DATACENTER, Datacenter -datastore: !os_env VCENTER_DATASTORE, nfs -ca_bypass: !os_env VCENTER_GLANCE_CERT_BYPASS, True -ca_file: !os_env VCENTER_GLANCE_CERT_URL, None \ No newline at end of file diff --git a/system_test/tests_templates/cluster_configs/settings/vmware/vcenter_ifaces.yaml b/system_test/tests_templates/cluster_configs/settings/vmware/vcenter_ifaces.yaml deleted file mode 100644 index 7518d3ffb..000000000 --- a/system_test/tests_templates/cluster_configs/settings/vmware/vcenter_ifaces.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- eth0: - - admin -- eth1: - - public -- eth2: - - management -- eth3: - - private -- eth4: - - storage diff --git a/system_test/tests_templates/cluster_configs/settings/vmware/vcenter_main.yaml b/system_test/tests_templates/cluster_configs/settings/vmware/vcenter_main.yaml deleted file mode 100644 index a5d5360d8..000000000 --- a/system_test/tests_templates/cluster_configs/settings/vmware/vcenter_main.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -az: vcenter -host: !os_env VCENTER_IP, 172.16.0.254 -user: !os_env VCENTER_USERNAME, administrator@vsphere.local -pwd: !os_env VCENTER_PASSWORD, Qwer!1234 -ca_bypass: !os_env VCENTER_CERT_BYPASS, True -ca_file: !os_env VCENTER_CERT_URL, None \ No newline at end of file diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_cindervmware.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_cindervmware.yaml deleted file mode 100644 index 8952ffb6d..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_cindervmware.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -template: - name: 3 controllers, 1 compute + cinder, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 6 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_add_cindervmware - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 3 - - - roles: - - compute - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - scale_nodes: - - - roles: - - cinder-vmware - count: 1 - action: add \ No newline at end of file diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_cluster_to_ctrl.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_cluster_to_ctrl.yaml deleted file mode 100644 index 9c1a2aa2c..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_cluster_to_ctrl.yaml +++ /dev/null @@ -1,45 +0,0 @@ ---- -template: - name: 1 controller, 1 cinder-vmware on Neutron/VLAN with DVS plugin - slaves: 2 - cluster_template: - name: vcenter_add_cluster_to_ctrl - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/1cluster_ctrl.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - scale_nodes: - - - action: reconfigure - vmware_vcenter: - nova-compute: - - cluster: Cluster2 - srv_name: srv_cluster2 - datastore: .* - target_node: controllers - vmware_dvs: - dvswitch_name: !os_env DVS_NAME, Cluster1:Cluster1;Cluster2:Cluster2 - dvs_fw_driver: false diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_computevmware.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_computevmware.yaml deleted file mode 100644 index 8c2ea71c9..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_computevmware.yaml +++ /dev/null @@ -1,52 +0,0 @@ ---- -template: - name: 1 controller, 1 compute + cinder, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 3 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_add_computevmware - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/1cluster_ctrl.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - scale_nodes: - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - action: add - - action: reconfigure - vmware_vcenter: - nova-compute: - - cluster: Cluster2 - srv_name: srv_cluster2 - datastore: .* - target_node: compute-vmware - vmware_dvs: - dvswitch_name: !os_env DVS_NAME, "Cluster1:Cluster1:dvUplink1;dvUplink2:dvUplink3\nCluster2:Cluster2:dvUplink1;dvUplink2:dvUplink3" - dvs_fw_driver: false \ No newline at end of file diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_controller.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_controller.yaml deleted file mode 100644 index 159e6f43d..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_controller.yaml +++ /dev/null @@ -1,50 +0,0 @@ ---- -template: - name: 1 controller, 1 compute + cinder, 1 cinder-vmware, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 6 - cluster_template: - name: vcenter_add_controller - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml - glance: - !include cluster_configs/settings/vmware/vcenter_glance.yaml - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - scale_nodes: - - - roles: - - controller - count: 2 - action: add \ No newline at end of file diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ceilometer_and_computevmware.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ceilometer_and_computevmware.yaml deleted file mode 100644 index 4d7568251..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ceilometer_and_computevmware.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -template: - name: 1 controller + mongo, 1 compute + cinder, 1 cinder-vmware, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 4 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_ceilometer_and_computevmware - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/ceilometer.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - - mongo - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ceph_and_computevmware.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ceph_and_computevmware.yaml deleted file mode 100644 index ff8e7dad8..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ceph_and_computevmware.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -template: - name: 1 controller, 1 compute, 1 compute-vmware, 2 ceph-osd on Neutron/VLAN with DVS plugin - slaves: 5 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_ceph_and_computevmware - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cephImgVolRados.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/1cluster_comp-vmware.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - ceph-osd - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 2 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_cindervmdk_and_computevmware.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_cindervmdk_and_computevmware.yaml deleted file mode 100644 index 984981d0e..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_cindervmdk_and_computevmware.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -template: - name: 1 controller, 1 cinder-vmware, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 3 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_cindervmdk_and_computevmware - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/1cluster_comp-vmware.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_computevmware.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_computevmware.yaml deleted file mode 100644 index 9fba8662d..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_computevmware.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -template: - name: 1 controller, 2 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 3 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_computevmware - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_comp-vmware.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 2 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_delete_cindervmware.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_delete_cindervmware.yaml deleted file mode 100644 index e36e6bd9c..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_delete_cindervmware.yaml +++ /dev/null @@ -1,51 +0,0 @@ ---- -template: - name: 3 controllers, 1 compute + cinder, 1 cinder-vmware, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 6 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_delete_cindervmware - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 3 - - - roles: - - compute - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - scale_nodes: - - - roles: - - cinder-vmware - count: 1 - action: delete \ No newline at end of file diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_delete_computevmware.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_delete_computevmware.yaml deleted file mode 100644 index 160c6322e..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_delete_computevmware.yaml +++ /dev/null @@ -1,51 +0,0 @@ ---- -template: - name: 1 controller, 1 compute + cinder, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 3 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_delete_computevmware - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - scale_nodes: - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - action: delete - - action: reconfigure - vmware_dvs: - dvswitch_name: !os_env DVS_NAME, "Cluster1:Cluster1:dvUplink1;dvUplink2:dvUplink3" - dvs_fw_driver: false \ No newline at end of file diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_delete_controller.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_delete_controller.yaml deleted file mode 100644 index 18f11a247..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_delete_controller.yaml +++ /dev/null @@ -1,50 +0,0 @@ ---- -template: - name: 4 controllers, 1 compute + cinder, 1 cinder-vmware, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 7 - cluster_template: - name: vcenter_delete_controller - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml - glance: - !include cluster_configs/settings/vmware/vcenter_glance.yaml - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 4 - - - roles: - - compute - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - scale_nodes: - - - roles: - - controller - count: 1 - action: delete \ No newline at end of file diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_dvs_bvt.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_dvs_bvt.yaml deleted file mode 100644 index 3af021374..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_dvs_bvt.yaml +++ /dev/null @@ -1,45 +0,0 @@ ---- -template: - name: 3 controllers, 1 compute + cinder, 1 cinder-vmware, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 6 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_dvs_bvt - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml - glance: - !include cluster_configs/settings/vmware/vcenter_glance.yaml - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 3 - - - roles: - - compute - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_dvs_failover.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_dvs_failover.yaml deleted file mode 100644 index 86856622e..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_dvs_failover.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -template: - name: 5 nodes on Neutron/VLAN with DVS plugin (3 controllers, 1 compute + cinder, 1 cinder-vmware) - slaves: 5 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_dvs_failover - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 3 - - roles: - - compute - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 \ No newline at end of file diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_dvs_smoke.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_dvs_smoke.yaml deleted file mode 100644 index 58dad864d..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_dvs_smoke.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -template: - name: 1 Controller on Neutron/VLAN with DVS plugin - slaves: 1 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_dvs_smoke - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/1cluster_ctrl.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_glance_backend.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_glance_backend.yaml deleted file mode 100644 index ac1f94035..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_glance_backend.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -template: - name: 1 Controller on Neutron/VLAN with DVS plugin and Glance - slaves: 1 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_glance_backend - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/1cluster_ctrl.yaml - glance: - !include cluster_configs/settings/vmware/vcenter_glance.yaml - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_glance_backend_and_computevmware.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_glance_backend_and_computevmware.yaml deleted file mode 100644 index c6fbc299c..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_glance_backend_and_computevmware.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -template: - name: 1 controller, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 2 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_glance_backend_and_computevmware - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/1cluster_comp-vmware.yaml - glance: - !include cluster_configs/settings/vmware/vcenter_glance.yaml - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_glance_vmware_roles.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_glance_vmware_roles.yaml deleted file mode 100644 index ed3765173..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_glance_vmware_roles.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -template: - name: 1 controller, 1 cinder-vmware, 1 compute-vmware on Neutron/VLAN with DVS plugin and Glance - slaves: 3 - cluster_template: - name: vcenter_glance_vmware_roles - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml - glance: - !include cluster_configs/settings/vmware/vcenter_glance.yaml - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_ceilometer.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_ceilometer.yaml deleted file mode 100644 index 85e2c0d25..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_ceilometer.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -template: - name: 3 controller + mongo, 1 compute + cinder, 1 cinder-vmware on Neutron/VLAN with DVS plugin - slaves: 5 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_ha_ceilometer - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/ceilometer.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - - mongo - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 3 - - - roles: - - compute - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_ceph.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_ceph.yaml deleted file mode 100644 index 0d97b8b63..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_ceph.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -template: - name: 3 controller, 1 compute, 2 ceph-osd on Neutron/VLAN with DVS plugin - slaves: 6 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_ha_ceph - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - volume-lvm: false - volume-ceph: true - image-ceph: true - rados-ceph: true - ephemeral-ceph: true - replica-ceph: 2 - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 3 - - - roles: - - compute - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - ceph-osd - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 2 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_cinder_and_ceph.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_cinder_and_ceph.yaml deleted file mode 100644 index d78113f61..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_cinder_and_ceph.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -template: - name: 3 controller, 1 ceph-osd + cinder-vmware, 1 ceph-osd + cinder on Neutron/VLAN with DVS plugin - slaves: 5 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_ha_cinder_and_ceph - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - volume-lvm: true - volume-ceph: false - image-ceph: true - rados-ceph: true - ephemeral-ceph: true - replica-ceph: 2 - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 3 - - - roles: - - ceph-osd - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - ceph-osd - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_multiple_clusters.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_multiple_clusters.yaml deleted file mode 100644 index e1615b04e..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_multiple_clusters.yaml +++ /dev/null @@ -1,40 +0,0 @@ ---- -template: - name: 3 controllers, 1 compute + cinder, 1 cinder-vmware on Neutron/VLAN with DVS plugin - slaves: 5 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_ha_multiple_clusters - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 3 - - - roles: - - compute - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_ceilometer.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_ceilometer.yaml deleted file mode 100644 index 90f8b9927..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_ceilometer.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -template: - name: 1 controller + cinder-vmware + cinder + mongo, 1 compute, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 3 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_multiroles_ceilometer - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/ceilometer.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - - cinder-vmware - - cinder - - mongo - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_cindervmdk_and_ceph.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_cindervmdk_and_ceph.yaml deleted file mode 100644 index 6f5be5bf6..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_cindervmdk_and_ceph.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -template: - name: 1 controller + cinder-vmware + ceph, 1 compute + cinder-vmware + ceph on Neutron/VLAN with DVS plugin - slaves: 2 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_multiroles_cindervmdk_and_ceph - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cephImgVolRados.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - - cinder-vmware - - ceph-osd - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute - - cinder-vmware - - ceph-osd - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_cindervmdk_and_cinder.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_cindervmdk_and_cinder.yaml deleted file mode 100644 index 9ea411471..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_cindervmdk_and_cinder.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -template: - name: 1 controller + cinder-vmware + cinder, 1 compute + cinder-vmware + cinder on Neutron/VLAN with DVS plugin - slaves: 2 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_multiroles_cindervmdk_and_cinder - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - - cinder-vmware - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute - - cinder-vmware - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_computevmware_cindervmware.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_computevmware_cindervmware.yaml deleted file mode 100644 index f01751058..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_computevmware_cindervmware.yaml +++ /dev/null @@ -1,35 +0,0 @@ ---- -template: - name: 1 controller, 1 compute-vmware + cinder-vmware on Neutron/VLAN with DVS plugin - slaves: 2 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_multiroles_computevmware_cindervmware - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_mv_cluster_compute_to_compute.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_mv_cluster_compute_to_compute.yaml deleted file mode 100644 index 796ad144a..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_mv_cluster_compute_to_compute.yaml +++ /dev/null @@ -1,52 +0,0 @@ ---- -template: - name: 1 controller, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 3 - cluster_template: - name: vcenter_mv_cluster_compute_to_compute - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/1cluster_comp-vmware.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - scale_nodes: - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - action: add - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - action: delete - - action: reconfigure - vmware_vcenter: - nova-compute: - - cluster: Cluster1 - srv_name: srv_cluster1 - datastore: .* - target_node: compute-vmware diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_mv_cluster_compute_to_ctrl.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_mv_cluster_compute_to_ctrl.yaml deleted file mode 100644 index 98ba08666..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_mv_cluster_compute_to_ctrl.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- -template: - name: 1 controller, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 2 - cluster_template: - name: vcenter_mv_cluster_compute_to_ctrl - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/1cluster_comp-vmware.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - scale_nodes: - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - action: delete - - action: reconfigure - vmware_vcenter: - nova-compute: - - cluster: Cluster1 - srv_name: srv_cluster1 - datastore: .* - target_node: controllers diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_mv_cluster_ctrl_to_compute.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_mv_cluster_ctrl_to_compute.yaml deleted file mode 100644 index 2e547ce12..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_mv_cluster_ctrl_to_compute.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- -template: - name: 1 controller, 1 cinder-vmware, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 3 - cluster_template: - name: vcenter_mv_cluster_ctrl_to_compute - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/1cluster_ctrl.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - scale_nodes: - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - action: add - - action: reconfigure - vmware_vcenter: - nova-compute: - - cluster: Cluster1 - srv_name: srv_cluster1 - datastore: .* - target_node: compute-vmware diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_reboot_cvm.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_reboot_cvm.yaml deleted file mode 100644 index d4f2b1d3a..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_reboot_cvm.yaml +++ /dev/null @@ -1,40 +0,0 @@ ---- -template: - name: 1 controller, 1 cinder-vmware on Neutron/VLAN with DVS plugin - slaves: 2 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_reboot_cindervmware - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/1cluster_ctrl.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - manage_nodes_power: - - - roles: - - cinder-vmware - node_number: 0 - action: reboot_warm \ No newline at end of file diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_shutdown_cvm.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_shutdown_cvm.yaml deleted file mode 100644 index d4484058e..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_shutdown_cvm.yaml +++ /dev/null @@ -1,57 +0,0 @@ ---- -template: - name: 1 controller, 1 compute + cinder, 2 cinder-vmware on Neutron/VLAN with DVS plugin - slaves: 4 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_shutdown_cindervmware - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/1cluster_ctrl.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - roles: - - compute - - cinder - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 2 - - - manage_nodes_power: - - - roles: - - cinder-vmware - node_number: 0 - action: power_off_warm - - - roles: - - cinder-vmware - node_number: 0 - action: power_on_warm - - - roles: - - cinder-vmware - node_number: 1 - action: power_off_warm - - - roles: - - cinder-vmware - node_number: 1 - action: power_on_warm \ No newline at end of file diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_vmware_roles.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_vmware_roles.yaml deleted file mode 100644 index 6a2414d09..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_vmware_roles.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -template: - name: 1 controller, 1 cinder-vmware, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 3 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_roles - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - - cluster: Cluster1 - srv_name: srv_cluster1 - datastore: n.* - target_node: controllers - - cluster: Cluster2 - srv_name: srv_cluster2 - datastore: nf.* - target_node: compute-vmware - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vmware_roles_local_ds.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vmware_roles_local_ds.yaml deleted file mode 100644 index aa1a5f372..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vmware_roles_local_ds.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -template: - name: 1 controller, 1 cinder-vmware, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 3 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_roles_local_ds - release: ubuntu - network: - !include cluster_configs/networks/neutron_vlan.yaml - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - - cluster: Cluster1 - srv_name: srv_cluster1 - datastore: datastore.* - target_node: controllers - - cluster: Cluster2 - srv_name: srv_cluster2 - datastore: datastore.* - target_node: compute-vmware - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 diff --git a/system_test/tests_templates/tests_configs/vcenter_dvs/vmware_roles_pub_ip.yaml b/system_test/tests_templates/tests_configs/vcenter_dvs/vmware_roles_pub_ip.yaml deleted file mode 100644 index d61241d89..000000000 --- a/system_test/tests_templates/tests_configs/vcenter_dvs/vmware_roles_pub_ip.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -template: - name: 1 controller, 1 cinder-vmware, 1 compute-vmware on Neutron/VLAN with DVS plugin - slaves: 3 - devops_settings: !include devops_configs/vcenter_ha_default.yaml - cluster_template: - name: vcenter_roles_pub_ip - release: ubuntu - network: - provider: neutron - segment-type: vlan - pubip-to-all: true - settings: - components: - !include cluster_configs/settings/components/wo_components.yaml - storages: - !include cluster_configs/settings/storages/cinder_only.yaml - vmware_vcenter: - settings: - !include cluster_configs/settings/vmware/vcenter_main.yaml - nova-compute: - !include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl_comp-vmware.yaml - glance: - enable: false - vmware_dvs: - !include cluster_configs/settings/vmware/dvs/dvs_main.yaml - nodes: - - roles: - - controller - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - cinder-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1 - - - roles: - - compute-vmware - iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml - count: 1