openstack
/
kolla-cli
Code Issues Proposed changes

Updates to fix py27 / tox tests 

Work needed to get the py27 tests to run in the CI.

Implements: blueprint initial-testing

Change-Id: I2375d092c43f6a00e575f303f8e62b969365b149
This commit is contained in:
Zuul 2018-04-19 18:09:27 +00:00 committed by Steve Noyes
parent 3b811ba49f
commit 010b8929cf
18 changed files with 154 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -3,6 +3,8 @@
check:
jobs:
- openstack-tox-pep8
- openstack-tox-py27
gate:
jobs:
- openstack-tox-pep8
- openstack-tox-py27

12
README.rst
View File

@ -11,17 +11,11 @@ The following steps can be used to build / run the kolla-cli
* python setup.py install
* mkdir /usr/share/kolla-ansible
* cp -r kolla-ansible/ansible to /usr/share/kolla
* mkdir /etc/kolla
* mkdir /etc/kolla/kolla-cli
* mkdir /etc/kolla/kolla-cli/ansible
* mkdir -p /etc/kolla/kolla-cli/ansible
* touch /etc/kolla/kolla-cli/ansible/inventory.json
* mkdir /var/log/kolla-cli
* touch /var/log/kolla-cli/kolla.log
* cp -r openstack-kolla/etc/kolla/* to /etc/kolla
* mkdir /usr/share/kolla-ansible/kolla-cli
* touch /usr/share/kolla-ansible/kolla-cli/ansible.lock
* mkdir /usr/share/kolla-ansible/kolla-cli/tools
* mkdir -p /usr/share/kolla-ansible/kolla-cli/tools
* mkdir /usr/share/kolla-ansible/kolla-cli/ansible
* touch /usr/share/kolla-ansible/kolla-cli/ansible.lock
* cp kolla-cli/tools /usr/share/kolla-ansible/kolla-cli/tools
* mkdir /usr/share/kolla-ansible/ansible/host_vars
* cp /etc/kolla/globals.yml /usr/share/kolla-ansible/ansible/group_vars/__GLOBAL__

61
kolla_cli/api/client.py
View File

@ -11,14 +11,10 @@
# 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 kolla_cli.i18n as u
import logging
import os
import sys
from logging.handlers import RotatingFileHandler
from kolla_cli.api.control_plane import ControlPlaneApi
from kolla_cli.api.group import GroupApi
from kolla_cli.api.host import HostApi
@ -26,14 +22,11 @@ from kolla_cli.api.password import PasswordApi
from kolla_cli.api.properties import PropertyApi
from kolla_cli.api.service import ServiceApi
from kolla_cli.api.support import SupportApi
from kolla_cli.common.utils import get_log_level
CONSOLE_MESSAGE_FORMAT = '%(message)s'
LOG_FILE_MESSAGE_FORMAT = \
'[%(asctime)s] %(levelname)-8s %(name)s %(message)s'
LOG = None
VERSION = '2.0'
# TODO(bmace) - API version should probably be stored somewhere else
VERSION = '0.1'
class ClientApi(
@ -55,18 +48,11 @@ class ClientApi(
the updates.
"""
def __init__(self):
self._configure_logging()
@staticmethod
def get_version():
# type: () -> str
return VERSION
@staticmethod
def base_call():
LOG.info('base call')
@staticmethod
def enable_console_logging(level, enable=True):
# type: (int, bool) -> None
@ -85,46 +71,3 @@ class ClientApi(
root_logger.addHandler(console)
else:
root_logger.removeHandler(console)
def _configure_logging(self):
global LOG
root_logger = logging.getLogger('')
root_logger.setLevel(logging.DEBUG)
handler_found = False
handlers = root_logger.handlers
for handler in handlers:
if isinstance(handler, RotatingFileHandler):
handler_found = True
break
if not handler_found:
# logger has not been set up
try:
rotate_handler = RotatingFileHandler(
os.path.join(os.path.abspath(os.sep),
'var', 'log', 'kolla-cli', 'kolla.log'),
maxBytes=self._get_kolla_log_file_size(),
backupCount=4)
except IOError as e:
# most likely the caller is not part of the kolla group
raise IOError(u._('Permission denied to run the kolla client.'
'\nPlease add user to the kolla group and '
'then log out and back in. {error}')
.format(error=str(e)))
formatter = logging.Formatter(LOG_FILE_MESSAGE_FORMAT)
rotate_handler.setFormatter(formatter)
rotate_handler.setLevel(get_log_level())
root_logger.addHandler(rotate_handler)
LOG = logging.getLogger(__name__)
def _get_kolla_log_file_size(self):
# type: () -> int
envvar = 'KOLLA_LOG_FILE_SIZE'
size_str = os.environ.get(envvar, '500000')
try:
size = int(size_str)
except Exception:
size = 50000
return size

1
kolla_cli/common/inventory.py
View File

@ -605,7 +605,6 @@ class Inventory(object):
dirpath = os.path.join(tempfile.gettempdir(), dirname)
os.mkdir(dirpath, 0o775)
_, gid = get_admin_uids()
os.chown(dirpath, -1, gid) # nosec
json_gen_path = os.path.join(dirpath, 'temp_inventory.py')
with open(json_gen_path, 'w') as json_gen_file:

6
kolla_cli/common/support.py
View File

@ -20,7 +20,6 @@ from kolla_cli.api.exceptions import FailedOperation
from kolla_cli.common.inventory import Inventory
from kolla_cli.common.properties import AnsibleProperties
from kolla_cli.common.utils import get_kolla_ansible_home
from kolla_cli.common.utils import get_kolla_ansible_log_dir
from kolla_cli.common.utils import get_kolla_cli_etc
from kolla_cli.common.utils import run_cmd
@ -161,7 +160,6 @@ def dump(dirpath):
debugging problems.
"""
kolla_home = get_kolla_ansible_home()
kolla_logs = get_kolla_ansible_log_dir()
kolla_ansible = os.path.join(kolla_home, 'ansible')
kollacli_etc = get_kolla_cli_etc().rstrip('/')
ketc = 'kolla/etc/'
@ -180,10 +178,6 @@ def dump(dirpath):
tar.add(kollacli_etc,
arcname=ketc + os.path.basename(kollacli_etc))
# add kolla log files
if os.path.isdir(kolla_logs):
tar.add(kolla_logs)
# add output of various commands
_add_cmd_info(tar)

48
kolla_cli/common/utils.py
View File

@ -40,26 +40,20 @@ def get_log_level():
return level
def get_ansible_etc():
return os.environ.get("ANSIBLE_ETC",
"/etc/ansible/")
def get_kolla_ansible_home():
return os.environ.get("KOLLA_HOME", "/usr/share/kolla-ansible/")
def get_kolla_etc():
return os.environ.get("KOLLA_ETC", "/etc/kolla/")
return os.environ.get('KOLLA_ETC', '/etc/kolla/')
def get_kolla_cli_home():
return os.environ.get("KOLLA_CLI_HOME",
"/usr/share/kolla-ansible/kolla-cli/")
return os.path.join(get_kolla_ansible_home(), 'kolla-cli')
def get_kolla_cli_etc():
return os.environ.get("KOLLA_CLI_ETC", "/etc/kolla/kolla-cli/")
return os.path.join(get_kolla_etc(), 'kolla-cli')
def get_group_vars_dir():
@ -70,16 +64,17 @@ def get_host_vars_dir():
return os.path.join(get_kolla_ansible_home(), 'ansible/host_vars')
def get_kolla_ansible_log_dir():
return '/var/log/kolla-cli/'
def get_ansible_lock_path():
return os.path.join(get_kolla_cli_home(), 'ansible.lock')
def get_tools_path():
return os.environ.get(
'KOLLA_TOOLS_DIR', os.path.join(get_kolla_cli_home(), 'tools'))
def get_kolla_actions_path():
return os.path.join(get_kolla_cli_home(), 'tools', 'kolla_actions.py')
return os.path.join(get_tools_path(), 'kolla_actions.py')
def get_admin_uids():
@ -90,19 +85,6 @@ def get_admin_uids():
return uid, gid
def get_kolla_log_file_size():
envvar = 'KOLLA_LOG_FILE_SIZE'
size_str = os.environ.get(envvar, '500000')
try:
size = int(size_str)
except Exception:
raise InvalidArgument(
u._('Environmental variable ({env_var}) is not an '
'integer ({log_size}).')
.format(env_var=envvar, log_size=size_str))
return size
def get_property_list_length():
envvar = 'KOLLA_PROP_LIST_LENGTH'
length_str = os.environ.get(envvar, '50')
@ -252,11 +234,16 @@ def change_property(file_path, property_dict, clear=False):
If not clear, and key is found, edit property in place.
"""
cloned_dict = copy.copy(property_dict)
group_info = grp.getgrnam('kolla')
if not os.path.exists(file_path):
with open(file_path, 'a'):
os.utime(file_path, None)
os.chown(file_path, -1, group_info.gr_gid)
try:
group_info = grp.getgrnam('kolla')
os.chown(file_path, -1, group_info.gr_gid)
except KeyError:
# ignore error if kolla user not present, needed
# for functional test
LOG.debug('Ignoring error- kolla user not defined')
new_contents = []
read_data = sync_read_file(file_path)
@ -568,6 +555,9 @@ class Lock(object):
self._release_flock()
else:
self._release_pidfile()
except OSError:
# ignore release of an already released lock
pass
except Exception:
# this really shouldn't happen unless for some reason
# two areas in the same process try to release the lock

3
requirements.txt
View File

@ -1,6 +1,7 @@
ansible>=1.9.2
kolla-ansible
Babel>=0.9.6
cliff==1.13.0 # Apache-2.0
cliff>=1.13.0 # Apache-2.0
cliff-tablib<=1.1
jsonpickle>=0.9
oslo.i18n>=1.3.0 # Apache-2.0

24
tests/common.py
View File

@ -39,7 +39,7 @@ ARG_LIST = {
}
TEST_SUFFIX = 'test/'
VENV_PY_PATH = '.venv/bin/python'
VENV_PY_PATH = '.tox/py27/bin/python'
KOLLA_CMD = 'kolla-cli'
KOLLA_SHELL_DIR = 'kolla_cli'
@ -95,14 +95,9 @@ class KollaCliTest(testtools.TestCase):
"""
# self.log.debug('run cmd: %s' % cmd)
msg = ''
# pipe encoding defaults to None which will cause output encode errors
# if non-ascii chars are attempted to be written to stdout.
env = {'PYTHONIOENCODING': 'utf-8'}
process = subprocess.Popen(cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
env=env,
shell=True)
(out, err) = process.communicate()
retval = process.returncode
@ -192,6 +187,8 @@ class KollaCliTest(testtools.TestCase):
self._restore_dir(hostdir)
def _save_dir(self, src_dir):
if not os.path.exists(src_dir):
return
dirname = os.path.basename(src_dir)
save_dir = os.path.join('/tmp', dirname + '.utest.save')
if os.path.exists(save_dir):
@ -247,8 +244,8 @@ class KollaCliTest(testtools.TestCase):
(_, msg) = self.run_command('which python')
self.log.debug('starting with python: %s' % msg.strip())
self.cmd_prefix = KOLLA_CMD
(retval, msg) = self.run_command('%s host add -h' % self.cmd_prefix)
if retval == 0:
(retval, msg) = self.run_command('%s --version' % self.cmd_prefix)
if retval is not None and retval == 0:
self.log.debug('%s found, will use as the test command'
% KOLLA_CMD)
return
@ -260,20 +257,21 @@ class KollaCliTest(testtools.TestCase):
# will run the tests via kolla_cli/shell.py and
# use the python in .venv/bin/python
cwd = os.getcwd()
if cwd.endswith('tests'):
os_kolla_dir = cwd.rsplit('/', 1)[0]
if os.path.basename(cwd) == 'kolla-cli':
# we're in a debug env
os_kollacli_dir = cwd
shell_dir = os_kolla_dir + '/%s/' % KOLLA_SHELL_DIR
shell_dir = os_kollacli_dir + '/%s/' % KOLLA_SHELL_DIR
shell_path = os.path.join(shell_dir, 'shell.py')
python_path = os.path.join(os_kolla_dir, VENV_PY_PATH)
python_path = os.path.join(os_kollacli_dir, VENV_PY_PATH)
self.log.debug('shell_path: %s' % shell_path)
self.log.debug('python_path: %s' % python_path)
if os.path.exists(shell_path) and os.path.exists(python_path):
self.cmd_prefix = '%s %s ' % (python_path, shell_path)
self.run_cli_cmd('host add -h')
self.run_cli_cmd('host --version')
self.log.info('successfully ran command in venv environment')
return

72
tests/deploy.py
View File

@ -22,6 +22,7 @@ import json
import unittest
CLIENT = ClientApi()
UNREACHABLE = 'UNREACHABLE!'
class TestFunctional(KollaCliTest):
@ -56,7 +57,7 @@ class TestFunctional(KollaCliTest):
json.loads(msg)
except Exception:
self.assertTrue(False, 'invalid json: %s' % msg)
remote_msg = '"ansible_ssh_user": "kolla"'
remote_msg = '"ansible_ssh_user": "root"'
local_msg = '"ansible_connection": "local"'
# verify that setdeploy local worked:
@ -66,7 +67,7 @@ class TestFunctional(KollaCliTest):
% (remote_msg, msg))
# verify that setdeploy remote worked:
self.run_cli_cmd('setdeploy remote')
CLIENT.set_deploy_mode(remote_mode=True)
inventory = Inventory.load()
path = inventory.create_json_gen_file()
(retval, msg) = self.run_command(path)
@ -85,8 +86,9 @@ class TestFunctional(KollaCliTest):
for host in hosts:
self.run_cli_cmd('host add %s' % host)
for group in groups:
self.run_cli_cmd('group addhost %s %s' % (group, host))
for groupname in groups:
group = CLIENT.group_get([groupname])[0]
group.add_host(host)
inventory = Inventory.load()
@ -139,51 +141,18 @@ class TestFunctional(KollaCliTest):
enable_service_props['enable_%s' % service_name] = 'no'
CLIENT.property_set(enable_service_props)
self.run_cli_cmd('deploy')
self.run_cli_cmd('deploy --serial -v')
msg = ''
CLIENT.set_deploy_mode(remote_mode=False)
job = CLIENT.deploy(hostnames=[])
job.wait()
msg = job.get_console_output()
self.assertEqual(job.get_status(), 0,
'error performing whole host deploy %s' % msg)
# test deploy with timeout
msg = self.run_cli_cmd('deploy --timeout .001', expect_error=True)
self.assertIn('timed out', msg)
# full host deploy to non-compute host. this can only be done
# through the api (cli test below makes sure it fails in cli)
msg = ''
try:
CLIENT.host_add(['localhost'])
CLIENT.set_deploy_mode(remote_mode=False)
job = CLIENT.deploy(hostnames=['localhost'])
job.wait()
msg = job.get_console_output()
self.assertEqual(job.get_status(), 0,
'error performing whole host deploy %s' % msg)
except Exception as e:
self.assertEqual(0, 1,
'unexpected exception in host deploy %s, %s'
% (e.message, msg))
finally:
CLIENT.host_remove(['localhost'])
# run compute host deploy to invalid host
err_msg = 'Status: unreachable'
msg = ''
try:
self.run_cli_cmd('host add dummy_host')
CLIENT.set_deploy_mode(remote_mode=True)
self.run_cli_cmd('group addhost compute dummy_host')
(retval, msg) = self.run_command(
'kolla-cli deploy --host dummy_host -v')
self.assertNotEqual(retval, 0,
'host only deploy ran ok but shouldn\'t have')
self.assertIn(err_msg, msg,
'Incorrect error message')
except Exception as e:
self.assertEqual(0, 1,
'host only deploy threw exception %s, %s'
% (e.message, msg))
finally:
self.run_cli_cmd('host remove dummy_host')
def test_upgrade(self):
# test will upgrade an environment with no hosts, mostly a NOP,
# but it will go through the client code paths.
@ -192,20 +161,19 @@ class TestFunctional(KollaCliTest):
msg = ''
# run rabbitmq service deploy
try:
CLIENT.host_add(['localhost'])
CLIENT.set_deploy_mode(remote_mode=False)
CLIENT.host_add(['dummy_host'])
CLIENT.set_deploy_mode(remote_mode=True)
job = CLIENT.upgrade()
job.wait()
msg = job.get_console_output()
self.assertEqual(job.get_status(), 0,
'error performing service specific deploy %s'
self.assertEqual(job.get_status(), 1,
'upgrade succeeded unexpectedly: %s'
% msg)
self.assertIn(UNREACHABLE, msg)
except Exception as e:
self.assertEqual(0, 1,
'unexpected exception in service deploy: %s, %s'
% (e.message, msg))
raise e
finally:
CLIENT.host_remove(['localhost'])
CLIENT.host_remove(['dummy_host'])
def check_json(self, msg, groups, hosts, included_groups, included_hosts):
err_msg = ('included groups: %s\n' % included_groups +

26
tests/destroy.py
View File

@ -24,7 +24,7 @@ TEST_GROUP_NAME = 'test_group'
CLIENT = ClientApi()
NOT_KNOWN = 'Name or service not known'
UNREACHABLE = 'Status: unreachable'
UNREACHABLE = 'UNREACHABLE!'
class TestFunctional(KollaCliTest):
@ -35,20 +35,8 @@ class TestFunctional(KollaCliTest):
# This will generate expected exceptions in all host access
# commands.
hostnames = ['test_deploy_host1']
pwd = 'test_pwd'
CLIENT.host_add(hostnames)
try:
setup_info = {}
for hostname in hostnames:
setup_info[hostname] = {'password': pwd}
CLIENT.host_setup(setup_info)
except Exception as e:
self.assertFalse(False, 'host setup exception: %s' % e)
self.assertIn(NOT_KNOWN, '%s' % e,
'Unexpected exception in host setup: %s' % e)
# add host to a new deploy group
CLIENT.group_add([TEST_GROUP_NAME])
group = CLIENT.group_get([TEST_GROUP_NAME])[0]
@ -58,7 +46,7 @@ class TestFunctional(KollaCliTest):
# destroy services, initialize server
self.log.info('Start destroy #1')
job = CLIENT.host_destroy(hostnames, destroy_type='kill',
include_data=True)
include_data=True, verbose_level=2)
self._process_job(job, 'destroy #1')
self.log.info('updating various properties for the test')
@ -91,18 +79,18 @@ class TestFunctional(KollaCliTest):
def _process_job(self, job, descr, expect_kill=False):
status = job.wait()
err_msg = job.get_error_message()
output = job.get_console_output()
self.log.info('job is complete. status: %s, err: %s'
% (status, err_msg))
% (status, output))
if expect_kill:
self.assertEqual(2, status, 'Job %s does not have killed status %s'
% (descr, err_msg))
% (descr, output))
else:
self.assertEqual(1, status, 'Job %s ' % descr +
'succeeded when it should have failed')
self.assertIn(UNREACHABLE,
self.assertIn(UNREACHABLE, output,
'Job %s: No hosts, but got wrong error: %s'
% (descr, err_msg))
% (descr, output))
if __name__ == '__main__':
unittest.main()

10
tests/group.py
View File

@ -60,7 +60,7 @@ class TestFunctional(KollaCliTest):
host1 = 'test_host1'
host2 = 'test_host2'
groupname = 'compute'
groupname = 'control'
group = groups[groupname]
hosts = group['Hosts']
@ -88,7 +88,7 @@ class TestFunctional(KollaCliTest):
def test_add_group_to_service(self):
groups = self.get_default_groups()
groupname = 'compute'
groupname = 'network'
service1 = 'keystone'
service2 = 'heat-api'
@ -211,12 +211,14 @@ class TestFunctional(KollaCliTest):
% group_name +
' not equal to expected services,' +
'\nexpected: %s, \ncli: %s'
% (group_services, cli_services))
% (sorted(group_services),
sorted(cli_services)))
for group_service in group_services:
self.assertIn(group_service, cli_services,
'Group: %s' % group_name +
'\nexpected_services: %s, \nnot in cli: %s '
% (group_service, cli_services))
% (sorted(group_services),
sorted(cli_services)))
def get_default_groups(self):
"""get default groups

6
tests/password.py
View File

@ -56,7 +56,8 @@ class TestFunctional(KollaCliTest):
def test_password_set_clear(self):
# This test should leave the passwords.yml file unchanged
# after the test completes.
# after the test completes. The tox setup bash script sets
# one password - "database_password" to "foobar".
pwds_path = os.path.join(get_kolla_etc(), 'passwords.yml')
size_start = os.path.getsize(pwds_path)
@ -128,9 +129,6 @@ class TestFunctional(KollaCliTest):
self.assertEqual(size_start, size_end, 'passwords.yml size changed ' +
'from %s to %s' % (size_start, size_end))
# check that password init does not throw an exception
self.run_cli_cmd('password init')
def _password_value_exists(self, key, value, cli_output):
"""Verify cli data against model data"""
# check for any host in cli output that shouldn't be there

2
tests/service.py
View File

@ -147,7 +147,7 @@ class TestFunctional(KollaCliTest):
# add new group to a service which has a parent
servicename = 'glance-api'
new_group = 'compute'
new_group = 'control'
self.run_cli_cmd('service addgroup %s %s' % (servicename, new_group))
msg = self.run_cli_cmd('service listgroups -f json')

22
tests/stop.py
View File

@ -22,7 +22,7 @@ TEST_GROUP_NAME = 'test_group'
CLIENT = ClientApi()
NOT_KNOWN = 'Name or service not known'
UNREACHABLE = 'Status: unreachable'
UNREACHABLE = 'UNREACHABLE!'
class TestFunctional(KollaCliTest):
@ -32,20 +32,8 @@ class TestFunctional(KollaCliTest):
# This will generate expected exceptions in all host access
# commands.
hostnames = ['test_deploy_host1']
pwd = 'test_pwd'
CLIENT.host_add(hostnames)
try:
setup_info = {}
for hostname in hostnames:
setup_info[hostname] = {'password': pwd}
CLIENT.host_setup(setup_info)
except Exception as e:
self.assertFalse(False, 'host setup exception: %s' % e)
self.assertIn(NOT_KNOWN, '%s' % e,
'Unexpected exception in host setup: %s' % e)
# add host to a new deploy group
CLIENT.group_add([TEST_GROUP_NAME])
group = CLIENT.group_get([TEST_GROUP_NAME])[0]
@ -77,18 +65,18 @@ class TestFunctional(KollaCliTest):
def _process_job(self, job, descr, expect_kill=False):
status = job.wait()
err_msg = job.get_error_message()
output = job.get_console_output()
self.log.info('job is complete. status: %s, err: %s'
% (status, err_msg))
% (status, output))
if expect_kill:
self.assertEqual(2, status, 'Job %s does not have killed status %s'
% (descr, err_msg))
% (descr, output))
else:
self.assertEqual(1, status, 'Job %s ' % descr +
'succeeded when it should have failed')
self.assertIn(UNREACHABLE,
'Job %s: No hosts, but got wrong error: %s'
% (descr, err_msg))
% (descr, output))
if __name__ == '__main__':
unittest.main()

7
tests/support.py
View File

@ -19,7 +19,7 @@ import unittest
from common import KollaCliTest
from kolla_cli.api.client import ClientApi
from kolla_cli.common.utils import get_kolla_cli_home
from kolla_cli.common.utils import get_tools_path
from kolla_cli.common.utils import safe_decode
LOGS_PREFIX = '/tmp/kolla_support_logs_'
@ -36,8 +36,8 @@ class TestFunctional(KollaCliTest):
zip_path = ''
try:
path = os.path.join(get_kolla_cli_home(),
'tools', 'log_collector.py')
path = os.path.join(get_tools_path(),
'log_collector.py')
# run the log_collector tool
retval, msg = self.run_command('/usr/bin/python %s %s'
@ -78,7 +78,6 @@ class TestFunctional(KollaCliTest):
def test_dump(self):
check_files = [
'var/log/kolla-cli/kolla.log',
'kolla/etc/kolla-cli/ansible/inventory.json',
'kolla/share/ansible/site.yml',
]

34
tests/tox_test_setup.sh Executable file
View File

@ -0,0 +1,34 @@
#!/bin/bash
#
# delete old pyc files
/usr/bin/find . -type f -name "*.pyc" -delete
# clean up files from last run
rm -f $KOLLA_ETC/kolla-cli/ansible/inventory.json
rm -f $KOLLA_HOME/ansible/group_vars/__GLOBAL__
rm -f $KOLLA_HOME/kolla-cli/ansible.lock
rm -f $KOLLA_ETC/passwords.yml
# setup the various files needed for the cli to run
mkdir -p $KOLLA_ETC/kolla-cli/ansible
touch $KOLLA_ETC/kolla-cli/ansible/inventory.json
mkdir -p $KOLLA_HOME/kolla-cli
touch $KOLLA_HOME/kolla-cli/ansible.lock
# setup kolla-ansible passwords file with just 2 passwords
cat > $KOLLA_ETC/passwords.yml <<EOF
database_password: foobar
nova_password: foobar
EOF
# If it's not there, clone the kolla-ansible repo to get its ansible directory
# and then copy it over
mkdir -p $KOLLA_HOME/git
if [ ! -d $KOLLA_HOME/ansible ]; then
git clone https://github.com/openstack/kolla-ansible $KOLLA_HOME/git
cp -rf $KOLLA_HOME/git/ansible $KOLLA_HOME/ansible/
fi
# setup needed kolla-ansible files
mkdir -p $KOLLA_HOME/ansible/host_vars
touch $KOLLA_HOME/ansible/group_vars/__GLOBAL__

30
tools/kolla_actions.py
View File

@ -42,18 +42,19 @@ def _get_empty_keys(path):
pwd_data = f.read()
pwds = yaml.safe_load(pwd_data)
comma = ''
for pwd_key, pwd_val in pwds.items():
is_empty = False
if not pwd_val and pwd_key not in ok_empty:
is_empty = True
elif isinstance(pwd_val, dict):
if not pwd_val.get('private_key', None):
if pwds:
for pwd_key, pwd_val in pwds.items():
is_empty = False
if not pwd_val and pwd_key not in ok_empty:
is_empty = True
elif not pwd_val.get('public_key', None):
is_empty = True
if is_empty:
empty_keys = ''.join([empty_keys, comma, pwd_key])
comma = ','
elif isinstance(pwd_val, dict):
if not pwd_val.get('private_key', None):
is_empty = True
elif not pwd_val.get('public_key', None):
is_empty = True
if is_empty:
empty_keys = ''.join([empty_keys, comma, pwd_key])
comma = ','
if empty_keys:
print(empty_keys)
@ -64,9 +65,10 @@ def _print_pwd_keys(path):
with open(path, 'r') as f:
pwd_data = f.read()
pwds = yaml.safe_load(pwd_data)
for pwd_key in pwds.keys():
keys_str = ''.join([keys_str, prefix, pwd_key])
prefix = ','
if pwds:
for pwd_key in pwds.keys():
keys_str = ''.join([keys_str, prefix, pwd_key])
prefix = ','
print(keys_str)

31
tox.ini
View File

@ -1,23 +1,35 @@
[tox]
minversion = 1.6
skipsdist = True
envlist = py27,pep8,bandit,mypy
envlist = py27,pep8,mypy
[testenv]
usedevelop = True
install_command = pip install {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
usedevelop=True
whitelist_externals = find
{toxinidir}/tests/tox_test_setup.sh
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
setenv =
KOLLA_ETC = /tmp/kollaclitest/etc/kolla/
KOLLA_HOME = /tmp/kollaclitest/usr/share/kolla-ansible/
KOLLA_TOOLS_DIR = {toxinidir}/tools/
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_TEST_TIMEOUT
PYTHON OS_TEST_PATH LISTOPT IDOPTION
commands =
find . -type f -name "*.py[c|o]" -delete
find . -type d -name "__pycache__" -delete
python setup.py test --slowest --testr-args='{posargs}'
[testenv:py27]
commands =
/usr/bin/find . -type f -name "*.pyc" -delete
{toxinidir}/tests/tox_test_setup.sh
{envpython} -m unittest discover -s tests -p "*.*"
[testenv:pep8]
commands = flake8
deps = {[testenv]deps}
commands = flake8 {posargs}
[testenv:mypy]
basepython = python3
@ -30,11 +42,10 @@ commands = {posargs}
[flake8]
show-source = True
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,ansible_plugins
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build
[testenv:bandit]
deps = -r{toxinidir}/test-requirements.txt
commands = bandit -r kollacli
commands = bandit -r kolla_cli
[testenv:docs]
commands = ./builddocs.sh