x
/
tobiko
Code Issues Proposed changes

Merge "Delete server stacks after testing server creation"

This commit is contained in:
Zuul 2020-07-08 16:49:43 +00:00 committed by Gerrit Code Review
parent 3537153d3b 6a364bcc0f
commit a07a6d9db5
3 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tobiko/tests/faults/ha/cloud_disruptions.py
View File

@ -7,6 +7,7 @@ from oslo_log import log
import tobiko
from tobiko.shell import sh
from tobiko.openstack import tests
from tobiko.openstack import topology
from tobiko.tripleo import topology as tripleo_topology
from tobiko.openstack import keystone
@ -244,13 +245,13 @@ def check_iha_evacuation(failover_type=None, vm_type=None):
for iteration in range(2):
LOG.info(f'Begin IHA tests iteration {iteration}')
LOG.info('create 2 vms')
nova.create_multiple_unique_vms(n_vms=2)
tests.test_servers_creation(number_of_servers=2)
compute_host = nova.get_random_compute_with_vms_name()
vms_starting_state_df = nova.get_compute_vms_df(compute_host)
if vm_type == 'shutoff':
nova.stop_all_instances()
if vm_type == 'evac_image_vm':
evac_vm_stack = nova.random_vm_create_evacuable_image_tag()
evac_vm_stack = tests.test_evacuable_server_creation()
evac_vm_id = nova.get_stack_server_id(evac_vm_stack)
org_nova_evac_df = nova.vm_df(evac_vm_id, nova.get_vms_table())
nova.check_df_vms_ping(vms_starting_state_df)

3
tobiko/tests/faults/ha/test_cloud_recovery.py
View File

@ -3,6 +3,7 @@ from __future__ import absolute_import
import testtools
from tobiko.openstack import neutron
from tobiko.openstack import tests
from tobiko.tests.faults.ha import cloud_disruptions
from tobiko.tripleo import pacemaker
from tobiko.tripleo import processes
@ -31,7 +32,7 @@ def overcloud_health_checks(passive_checks_only=False):
# check vm create with ssh and ping checks
def check_vm_create():
nova.random_vm_create()
tests.test_server_creation()
# check cluster failed statuses

41
tobiko/tripleo/nova.py
View File

@ -1,7 +1,7 @@
from __future__ import absolute_import
import random
import time
import typing # noqa
from oslo_log import log
import pandas
@ -9,8 +9,6 @@ import pandas
import tobiko
from tobiko.shell import ping
from tobiko.openstack import nova
from tobiko.shell import sh
from tobiko.openstack import stacks
LOG = log.getLogger(__name__)
@ -194,42 +192,5 @@ def check_vm_evacuations(vms_df_old=None, vms_df_new=None, timeout=120,
'failed vm evacuations:\n{!s}', '\n'.join(failures))
# check vm create with ssh and ping checks
def random_vm_create(stack_name='stack{}'.format(
random.randint(0, 1000000)),
stack_template=stacks.CirrosServerStackFixture):
"""stack_name: unique stack name ,
so that each time a new vm is created"""
# create a vm
LOG.info(f'creating vm - {stack_name}')
stack = stack_template(
stack_name=stack_name)
tobiko.reset_fixture(stack)
stack.wait_for_create_complete()
tobiko.cleanup_fixture(stack.ssh_client)
# Test SSH connectivity to floating IP address
sh.get_hostname(ssh_client=stack.ssh_client)
# Test ICMP connectivity to floating IP address
ping.ping_until_received(
stack.floating_ip_address).assert_replied()
return stack
def random_vm_create_evacuable_image_tag():
return random_vm_create(stack_template=stacks.EvacuableServerStackFixture)
def random_vm_create_shutoff_state():
return nova.shutoff_server(random_vm_create().server_details)
def get_stack_server_id(stack):
return stack.server_details.id
def create_multiple_unique_vms(n_vms=2):
"""create n_vms(int)"""
for _ in range(n_vms):
stack_name = 'stack{}'.format(random.randint(0, 1000000))
random_vm_create(stack_name)