arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rearrange functions into separate modules

Browse Source
This commit is contained in:
Luciano Lo Giudice
2022-02-10 14:28:50 -03:00
parent c8302161a1
commit e751e4a989
3 changed files with 21 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zaza/openstack/charm_tests/ceph/tests.py
View File

@@ -35,7 +35,6 @@ import zaza.openstack.utilities.exceptions as zaza_exceptions
import zaza.openstack.utilities.generic as zaza_utils
import zaza.utilities.juju as juju_utils
import zaza.openstack.utilities.openstack as zaza_openstack
import zaza.openstack.utilities.juju as zaza_juju
class CephLowLevelTest(test_utils.OpenStackBaseTest):
@@ -558,8 +557,8 @@ class CephTest(test_utils.OpenStackBaseTest):
osds = [x.entity_id for x in zaza_model.get_units('ceph-osd')]
num_osds = self.get_num_osds(osds[0])
for unit in osds:
zaza_juju.add_storage(unit, 'cache-devices', 'cinder', 10)
loop_dev = zaza_juju.add_loop_device(unit, 10)
zaza_model.add_storage(unit, 'cache-devices', 'cinder', 10)
loop_dev = zaza_utils.add_loop_device(unit, 10)
action_obj = zaza_model.run_action(
unit_name=unit,
action_name='add-disk',

19
zaza/openstack/utilities/generic.py
View File

@@ -723,3 +723,22 @@ def get_leaders_and_non_leaders(application_name):
else:
non_leaders.append(unit)
return leader, non_leaders
def add_loop_device(unit, size=10):
"""Add a loopback device to a Juju unit.
:param unit: The unit name on which to create the device.
:type unit: str
:param size: The size in GB of the device.
:type size: int
:returns: The device name.
"""
loop_name = '/home/ubuntu/loop.img'
truncate = 'truncate --size {}GB {}'.format(size, loop_name)
losetup = 'losetup --find {}'.format(loop_name)
lofind = 'losetup -a | grep {} | cut -f1 -d ":"'.format(loop_name)
cmd = "sudo sh -c '{} && {} && {}'".format(truncate, losetup, lofind)
return model.run_on_unit(unit, cmd)

66
zaza/openstack/utilities/juju.py
View File

@@ -17,9 +17,7 @@
import logging
import functools
import subprocess
import zaza.model
import zaza.utilities.juju
@@ -312,67 +310,3 @@ def get_subordinate_units(unit_list, charm_name=None, status=None,
charm_name=charm_name,
status=status,
model_name=model_name)
def add_storage(unit, label, pool, size):
"""Add storage to a Juju unit.
:param unit: The unit name (i.e: ceph-osd/0)
:type unit: str
:param label: The storage label (i.e: osd-devices)
:type label: str
:param pool: The pool on which to allocate the storage (i.e: cinder)
:type pool: str
:size: The size in GB of the storage to attach.
:type size: int
:returns: The name of the allocated storage.
"""
rv = subprocess.check_output(['juju', 'add-storage', unit,
'{}={},{}'.format(label, pool,
str(size) + 'GB')],
stderr=subprocess.STDOUT)
return rv.decode('UTF-8').replace('added storage ', '').split(' ')[0]
def detach_storage(storage_name):
"""Detach previously allocated Juju storage."""
subprocess.check_call(['juju', 'detach-storage', storage_name])
def remove_storage(storage_name, force=False):
"""Remove Juju storage.
:param storage_name: The name of the previously allocated Juju storage.
:type storage_name: str
:param force: If False (default), require that the storage be detached
before it can be removed.
:type force: bool
"""
cmd = ['juju', 'remove-storage', storage_name]
if force:
cmd.append('--force')
subprocess.check_call(cmd)
def add_loop_device(unit, size=10):
"""Add a loopback device to a Juju unit.
:param unit: The unit name on which to create the device.
:type unit: str
:param size: The size in GB of the device.
:type size: int
:returns: The device name.
"""
loop_name = '/home/ubuntu/loop.img'
truncate = 'truncate --size {}GB {}'.format(size, loop_name)
losetup = 'losetup --find {}'.format(loop_name)
lofind = 'losetup -a | grep {} | cut -f1 -d ":"'.format(loop_name)
cmd = "sudo sh -c '{} && {} && {}'".format(truncate, losetup, lofind)
return zaza.model.run_on_unit(unit, cmd)