Refactor assert_cluster_ready, use networks_count=2 by default
Change-Id: I7d754bbcfb5905903d1a3b843d7acd068db59a97 Closes-bug: #1489813
This commit is contained in:
parent
73ed8d7c84
commit
b27468a3e9
|
@ -16,7 +16,6 @@ import json
|
|||
import re
|
||||
import time
|
||||
import traceback
|
||||
import yaml
|
||||
|
||||
from devops.error import DevopsCalledProcessError
|
||||
from devops.error import TimeoutError
|
||||
|
@ -27,29 +26,31 @@ from proboscis.asserts import assert_equal
|
|||
from proboscis.asserts import assert_false
|
||||
from proboscis.asserts import assert_is_not_none
|
||||
from proboscis.asserts import assert_true
|
||||
import yaml
|
||||
|
||||
from fuelweb_test.helpers import ceph
|
||||
from fuelweb_test.helpers import checkers
|
||||
from fuelweb_test.helpers.utils import run_on_remote
|
||||
from fuelweb_test import logwrap
|
||||
from fuelweb_test import logger
|
||||
from fuelweb_test import quiet_logger
|
||||
from fuelweb_test.helpers.decorators import custom_repo
|
||||
from fuelweb_test.helpers.decorators import check_repos_management
|
||||
from fuelweb_test.helpers.decorators import custom_repo
|
||||
from fuelweb_test.helpers.decorators import download_astute_yaml
|
||||
from fuelweb_test.helpers.decorators import download_packages_json
|
||||
from fuelweb_test.helpers.decorators import duration
|
||||
from fuelweb_test.helpers.decorators import retry
|
||||
from fuelweb_test.helpers.decorators import update_ostf
|
||||
from fuelweb_test.helpers.decorators import update_fuel
|
||||
from fuelweb_test.helpers.decorators import update_ostf
|
||||
from fuelweb_test.helpers.decorators import upload_manifests
|
||||
from fuelweb_test.helpers.security import SecurityChecks
|
||||
from fuelweb_test.helpers.utils import run_on_remote
|
||||
from fuelweb_test import logger
|
||||
from fuelweb_test import logwrap
|
||||
from fuelweb_test.models.nailgun_client import NailgunClient
|
||||
from fuelweb_test import ostf_test_mapping as map_ostf
|
||||
from fuelweb_test import quiet_logger
|
||||
import fuelweb_test.settings as help_data
|
||||
from fuelweb_test.settings import ATTEMPTS
|
||||
from fuelweb_test.settings import BONDING
|
||||
from fuelweb_test.settings import DNS_SUFFIX
|
||||
from fuelweb_test.settings import DEPLOYMENT_MODE_HA
|
||||
from fuelweb_test.settings import DNS_SUFFIX
|
||||
from fuelweb_test.settings import KVM_USE
|
||||
from fuelweb_test.settings import MULTIPLE_NETWORKS
|
||||
from fuelweb_test.settings import NEUTRON
|
||||
|
@ -62,13 +63,11 @@ from fuelweb_test.settings import OSTF_TEST_RETRIES_COUNT
|
|||
from fuelweb_test.settings import REPLACE_DEFAULT_REPOS
|
||||
from fuelweb_test.settings import REPLACE_DEFAULT_REPOS_ONLY_ONCE
|
||||
from fuelweb_test.settings import TIMEOUT
|
||||
from fuelweb_test.settings import VCENTER_IP
|
||||
from fuelweb_test.settings import VCENTER_USERNAME
|
||||
from fuelweb_test.settings import VCENTER_PASSWORD
|
||||
from fuelweb_test.settings import VCENTER_DATACENTER
|
||||
from fuelweb_test.settings import VCENTER_DATASTORE
|
||||
|
||||
import fuelweb_test.settings as help_data
|
||||
from fuelweb_test.settings import VCENTER_IP
|
||||
from fuelweb_test.settings import VCENTER_PASSWORD
|
||||
from fuelweb_test.settings import VCENTER_USERNAME
|
||||
|
||||
|
||||
class FuelWebClient(object):
|
||||
|
@ -90,7 +89,7 @@ class FuelWebClient(object):
|
|||
|
||||
@staticmethod
|
||||
@logwrap
|
||||
def get_cluster_status(os_conn, smiles_count, networks_count=1):
|
||||
def get_cluster_status(os_conn, smiles_count, networks_count=2):
|
||||
checkers.verify_service_list_api(os_conn, service_count=smiles_count)
|
||||
checkers.verify_glance_image_api(os_conn)
|
||||
checkers.verify_network_list_api(os_conn, networks_count)
|
||||
|
@ -126,7 +125,7 @@ class FuelWebClient(object):
|
|||
|
||||
@logwrap
|
||||
def assert_cluster_ready(self, os_conn, smiles_count,
|
||||
networks_count=1, timeout=300):
|
||||
networks_count=2, timeout=300):
|
||||
logger.info('Assert cluster services are UP')
|
||||
_wait(
|
||||
lambda: self.get_cluster_status(
|
||||
|
|
|
@ -110,8 +110,7 @@ class BackupRestoreHAOneController(HAOneControllerNeutronBase):
|
|||
self.fuel_web.get_public_vip(cluster_id),
|
||||
'neutronOneController', 'neutronOneController',
|
||||
'neutronOneController')
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5,
|
||||
networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5)
|
||||
|
||||
with self.env.d_env.get_admin_remote() as remote:
|
||||
# Execute master node backup
|
||||
|
|
|
@ -161,8 +161,7 @@ class CustomHostname(TestBasic):
|
|||
cluster_id, test_sets=['ha', 'smoke', 'sanity'])
|
||||
os_conn = os_actions.OpenStackActions(
|
||||
self.fuel_web.get_public_vip(cluster_id))
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=13, networks_count=1, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=13)
|
||||
|
||||
# Verify that new hostnames are applied on the nodes
|
||||
for node, custom_hostname in zip(
|
||||
|
|
|
@ -75,8 +75,7 @@ class OneNodeDeploy(TestBasic):
|
|||
self.fuel_web.deploy_cluster_wait(cluster_id)
|
||||
os_conn = os_actions.OpenStackActions(
|
||||
self.fuel_web.get_public_vip(cluster_id))
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=4,
|
||||
networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=4)
|
||||
self.fuel_web.run_single_ostf_test(
|
||||
cluster_id=cluster_id, test_sets=['sanity'],
|
||||
test_name=('fuel_health.tests.sanity.test_sanity_identity'
|
||||
|
@ -182,8 +181,7 @@ class HAOneControllerNeutron(HAOneControllerNeutronBase):
|
|||
|
||||
os_conn = os_actions.OpenStackActions(
|
||||
self.fuel_web.get_public_vip(cluster_id))
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5,
|
||||
networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5)
|
||||
ebtables = self.env.get_ebtables(
|
||||
cluster_id, self.env.d_env.nodes().slaves[:2])
|
||||
ebtables.restore_vlans()
|
||||
|
@ -243,15 +241,13 @@ class HAOneControllerNeutron(HAOneControllerNeutronBase):
|
|||
os_conn = os_actions.OpenStackActions(
|
||||
self.fuel_web.get_public_vip(cluster_id),
|
||||
data['user'], data['password'], data['tenant'])
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5,
|
||||
networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5)
|
||||
|
||||
self.fuel_web.update_nodes(
|
||||
cluster_id, {'slave-03': ['compute']}, True, False)
|
||||
self.fuel_web.deploy_cluster_wait(cluster_id)
|
||||
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=6,
|
||||
networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=6)
|
||||
|
||||
assert_equal(
|
||||
3, len(self.fuel_web.client.list_cluster_nodes(cluster_id)))
|
||||
|
@ -612,8 +608,7 @@ class HAOneControllerCinder(TestBasic):
|
|||
|
||||
os_conn = os_actions.OpenStackActions(
|
||||
self.fuel_web.get_public_vip(cluster_id))
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5,
|
||||
networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5)
|
||||
|
||||
self.fuel_web.verify_network(cluster_id)
|
||||
self.env.verify_network_configuration("slave-01")
|
||||
|
|
|
@ -50,8 +50,7 @@ class HAOneControllerNeutronBase(TestBasic):
|
|||
os_conn = os_actions.OpenStackActions(
|
||||
self.fuel_web.get_public_vip(cluster_id),
|
||||
data['user'], data['password'], data['tenant'])
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5,
|
||||
networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5)
|
||||
|
||||
self.fuel_web.verify_network(cluster_id)
|
||||
|
||||
|
|
|
@ -86,8 +86,7 @@ class SaharaHAOneController(TestBasic):
|
|||
os_conn = os_actions.OpenStackActions(
|
||||
self.fuel_web.get_public_vip(cluster_id),
|
||||
data['user'], data['password'], data['tenant'])
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=5, networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5)
|
||||
|
||||
LOGGER.debug('Verify Sahara service on controller')
|
||||
_ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip']
|
||||
|
@ -194,8 +193,7 @@ class SaharaHA(TestBasic):
|
|||
cluster_vip = self.fuel_web.get_public_vip(cluster_id)
|
||||
os_conn = os_actions.OpenStackActions(
|
||||
cluster_vip, data['user'], data['password'], data['tenant'])
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=13, networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=13)
|
||||
|
||||
LOGGER.debug('Verify Sahara service on all controllers')
|
||||
for slave in ["slave-01", "slave-02", "slave-03"]:
|
||||
|
@ -292,8 +290,7 @@ class MuranoHAOneController(TestBasic):
|
|||
os_conn = os_actions.OpenStackActions(
|
||||
self.fuel_web.get_public_vip(cluster_id),
|
||||
data['user'], data['password'], data['tenant'])
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=5, networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5)
|
||||
_ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip']
|
||||
checkers.verify_service(
|
||||
self.env.d_env.get_ssh_to_remote(_ip),
|
||||
|
@ -380,8 +377,7 @@ class MuranoHA(TestBasic):
|
|||
cluster_vip = self.fuel_web.get_public_vip(cluster_id)
|
||||
os_conn = os_actions.OpenStackActions(
|
||||
cluster_vip, data['user'], data['password'], data['tenant'])
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=13, networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=13)
|
||||
for slave in ["slave-01", "slave-02", "slave-03"]:
|
||||
_ip = self.fuel_web.get_nailgun_node_by_name(slave)['ip']
|
||||
checkers.verify_service(
|
||||
|
@ -834,8 +830,7 @@ class HeatHAOneController(TestBasic):
|
|||
os_conn = os_actions.OpenStackActions(
|
||||
self.fuel_web.get_public_vip(cluster_id),
|
||||
data['user'], data['password'], data['tenant'])
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=5, networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5)
|
||||
|
||||
_ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip']
|
||||
checkers.verify_service(
|
||||
|
@ -926,8 +921,7 @@ class HeatHA(TestBasic):
|
|||
cluster_vip = self.fuel_web.get_public_vip(cluster_id)
|
||||
os_conn = os_actions.OpenStackActions(
|
||||
cluster_vip, data['user'], data['password'], data['tenant'])
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=13, networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=13)
|
||||
|
||||
for slave in ["slave-01", "slave-02", "slave-03"]:
|
||||
_ip = self.fuel_web.get_nailgun_node_by_name(slave)['ip']
|
||||
|
|
|
@ -76,13 +76,7 @@ class TestHaFailoverBase(TestBasic):
|
|||
self.fuel_web.deploy_cluster_wait(cluster_id)
|
||||
public_vip = self.fuel_web.get_public_vip(cluster_id)
|
||||
os_conn = os_actions.OpenStackActions(public_vip)
|
||||
if network == 'neutron':
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=14, networks_count=2, timeout=300)
|
||||
else:
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=16, networks_count=1, timeout=300)
|
||||
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=14)
|
||||
self.fuel_web.verify_network(cluster_id)
|
||||
|
||||
self.env.make_snapshot(self.snapshot_name, is_make=True)
|
||||
|
@ -120,12 +114,7 @@ class TestHaFailoverBase(TestBasic):
|
|||
self.fuel_web.deploy_cluster_wait(cluster_id)
|
||||
public_vip = self.fuel_web.get_public_vip(cluster_id)
|
||||
os_conn = os_actions.OpenStackActions(public_vip)
|
||||
if network == 'neutron':
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=14, networks_count=2, timeout=300)
|
||||
else:
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=16, networks_count=1, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=14)
|
||||
self.fuel_web.verify_network(cluster_id)
|
||||
|
||||
for node in ['slave-0{0}'.format(slave) for slave in xrange(1, 4)]:
|
||||
|
|
|
@ -221,8 +221,7 @@ class HugeHaNeutron(base_test_case.TestBasic):
|
|||
data['user'],
|
||||
data['password'],
|
||||
data['tenant'])
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=15, networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=15)
|
||||
|
||||
self.fuel_web.run_ostf(cluster_id=cluster_id,
|
||||
test_sets=['ha', 'smoke', 'sanity'])
|
||||
|
@ -309,8 +308,7 @@ class HugeHaNeutron(base_test_case.TestBasic):
|
|||
data['user'],
|
||||
data['password'],
|
||||
data['tenant'])
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=15, networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=15)
|
||||
|
||||
self.fuel_web.run_ostf(cluster_id=cluster_id,
|
||||
test_sets=['ha', 'smoke', 'sanity'])
|
||||
|
|
|
@ -96,8 +96,7 @@ class DeployHAOneControllerMasterNodeFail(base_test_case.TestBasic):
|
|||
controller_ip = self.fuel_web.get_public_vip(cluster_id)
|
||||
|
||||
os_conn = os_actions.OpenStackActions(controller_ip)
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=5, networks_count=2, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=5)
|
||||
|
||||
self.fuel_web.verify_network(cluster_id)
|
||||
logger.info('PASS DEPLOYMENT')
|
||||
|
@ -162,13 +161,10 @@ class DeployHAOneControllerMasterNodeFail(base_test_case.TestBasic):
|
|||
|
||||
net_provider_data = {
|
||||
'ntp_list': settings.EXTERNAL_NTP,
|
||||
'dns_list': external_dns
|
||||
'dns_list': external_dns,
|
||||
"net_provider": 'neutron',
|
||||
"net_segment_type": settings.NEUTRON_SEGMENT_TYPE
|
||||
}
|
||||
if settings.NEUTRON_ENABLE:
|
||||
net_provider_data.update({
|
||||
"net_provider": 'neutron',
|
||||
"net_segment_type": settings.NEUTRON_SEGMENT_TYPE
|
||||
})
|
||||
|
||||
cluster_id = self.fuel_web.create_cluster(
|
||||
name=self.__class__.__name__,
|
||||
|
@ -188,12 +184,7 @@ class DeployHAOneControllerMasterNodeFail(base_test_case.TestBasic):
|
|||
self.fuel_web.deploy_cluster_wait(cluster_id)
|
||||
os_conn = os_actions.OpenStackActions(self.fuel_web.
|
||||
get_public_vip(cluster_id))
|
||||
if settings.NEUTRON_ENABLE:
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=14, networks_count=2, timeout=300)
|
||||
else:
|
||||
self.fuel_web.assert_cluster_ready(
|
||||
os_conn, smiles_count=16, networks_count=1, timeout=300)
|
||||
self.fuel_web.assert_cluster_ready(os_conn, smiles_count=14)
|
||||
|
||||
self.fuel_web.verify_network(cluster_id)
|
||||
self.fuel_web.run_ostf(cluster_id=cluster_id)
|
||||
|
|
Loading…
Reference in New Issue