Add ironic-api relation
This commit is contained in:
parent
6f1a437f66
commit
9932272180
|
@ -0,0 +1,15 @@
|
|||
/build/
|
||||
|
||||
bin
|
||||
.coverage
|
||||
.testrepository
|
||||
.tox
|
||||
tags
|
||||
*.sw[nop]
|
||||
*.pyc
|
||||
.unit-state.db
|
||||
trusty/
|
||||
xenial/
|
||||
.stestr
|
||||
__pycache__
|
||||
func-results.json
|
|
@ -0,0 +1,4 @@
|
|||
[DEFAULT]
|
||||
test_path=./unit_tests
|
||||
top_dir=./
|
||||
|
|
@ -0,0 +1,202 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
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.
|
|
@ -0,0 +1,5 @@
|
|||
# This file is used to trigger rebuilds
|
||||
# when dependencies of the charm change,
|
||||
# but nothing in the charm needs to.
|
||||
# simply change the uuid to something new
|
||||
0f7f02ff-1295-4635-9ea5-9453c45b6c9e
|
|
@ -0,0 +1,11 @@
|
|||
# This file is managed centrally by release-tools and should not be modified
|
||||
# within individual charm repos. See the 'global' dir contents for available
|
||||
# choices of *requirements.txt files for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||
# Build requirements
|
||||
charm-tools>=2.4.4
|
||||
# importlib-resources 1.1.0 removed Python 3.5 support
|
||||
importlib-resources<1.1.0
|
||||
simplejson
|
|
@ -0,0 +1 @@
|
|||
# Ironic API juju charm
|
Before Width: | Height: | Size: 81 KiB After Width: | Height: | Size: 81 KiB |
|
@ -3,6 +3,7 @@ includes:
|
|||
- interface:mysql-shared
|
||||
- interface:rabbitmq
|
||||
- interface:keystone
|
||||
- interface:ironic-api
|
||||
repo: https://github.com/gabriel-samfira/charm-ironic-api
|
||||
options:
|
||||
basic:
|
|
@ -6,6 +6,10 @@ import os
|
|||
import charms_openstack.charm
|
||||
import charms_openstack.adapters
|
||||
import charms_openstack.ip as os_ip
|
||||
import charmhelpers.contrib.network.ip as ch_ip
|
||||
import charms_openstack.adapters as adapters
|
||||
|
||||
from charms import reactive
|
||||
|
||||
|
||||
PACKAGES = [
|
||||
|
@ -23,36 +27,13 @@ OPENSTACK_RELEASE_KEY = 'ironic-charm.openstack-release-version'
|
|||
charms_openstack.charm.use_defaults('charm.default-select-release')
|
||||
|
||||
|
||||
def db_sync_done():
|
||||
return IronicAPICharm.singleton.db_sync_done()
|
||||
@adapters.config_property
|
||||
def deployment_interface_ip(cls):
|
||||
return ch_ip.get_relation_ip("deployment")
|
||||
|
||||
|
||||
def restart_all():
|
||||
IronicAPICharm.singleton.restart_all()
|
||||
|
||||
|
||||
def db_sync():
|
||||
IronicAPICharm.singleton.db_sync()
|
||||
|
||||
|
||||
def configure_ha_resources(hacluster):
|
||||
IronicAPICharm.singleton.configure_ha_resources(hacluster)
|
||||
|
||||
|
||||
def assess_status():
|
||||
IronicAPICharm.singleton.assess_status()
|
||||
|
||||
|
||||
def setup_endpoint(keystone):
|
||||
charm = IronicAPICharm.singleton
|
||||
public_ep = '{}'.format(charm.public_url)
|
||||
internal_ep = '{}'.format(charm.internal_url)
|
||||
admin_ep = '{}'.format(charm.admin_url)
|
||||
keystone.register_endpoints(charm.service_type,
|
||||
charm.region,
|
||||
public_ep,
|
||||
internal_ep,
|
||||
admin_ep)
|
||||
@adapters.config_property
|
||||
def internal_interface_ip(cls):
|
||||
return ch_ip.get_relation_ip("internal")
|
||||
|
||||
|
||||
class IronicAPICharm(charms_openstack.charm.HAOpenStackCharm):
|
||||
|
@ -111,3 +92,11 @@ class IronicAPICharm(charms_openstack.charm.HAOpenStackCharm):
|
|||
database=self.config['database'],
|
||||
username=self.config['database-user'], )
|
||||
]
|
||||
|
||||
def set_ironic_api_info(self, baremetal):
|
||||
is_ready = reactive.flags.is_flag_set('config.complete')
|
||||
relation_data = {"ironic-api-ready": is_ready}
|
||||
for unit in baremetal.all_joined_units:
|
||||
baremetal.set_baremetal_info(
|
||||
unit.relation.relation_id,
|
||||
relation_data)
|
|
@ -23,3 +23,6 @@ requires:
|
|||
interface: rabbitmq
|
||||
identity-service:
|
||||
interface: keystone
|
||||
provides:
|
||||
ironic-api:
|
||||
interface: baremetal
|
|
@ -7,8 +7,6 @@ import charms_openstack.charm as charm
|
|||
import charm.openstack.ironic.ironic as ironic # noqa
|
||||
|
||||
from charmhelpers.core.templating import render
|
||||
import charmhelpers.contrib.network.ip as ch_ip
|
||||
import charms_openstack.adapters as adapters
|
||||
|
||||
|
||||
# Use the charms.openstack defaults for common states and hooks
|
||||
|
@ -18,45 +16,55 @@ charm.use_defaults(
|
|||
'shared-db.connected',
|
||||
'identity-service.available', # enables SSL support
|
||||
'config.changed',
|
||||
'update-status')
|
||||
'update-status',
|
||||
'upgrade-charm',
|
||||
'certificates.available')
|
||||
|
||||
|
||||
@reactive.when('shared-db.available')
|
||||
@reactive.when('identity-service.available')
|
||||
@reactive.when('amqp.available')
|
||||
def render_stuff(*args):
|
||||
def render(*args):
|
||||
hookenv.log("about to call the render_configs with {}".format(args))
|
||||
with charm.provide_charm_instance() as ironic_charm:
|
||||
ironic_charm.render_with_interfaces(
|
||||
charm.optional_interfaces(args))
|
||||
ironic_charm.configure_ssl()
|
||||
ironic_charm.assess_status()
|
||||
reactive.set_state('config.complete')
|
||||
|
||||
|
||||
@reactive.when('identity-service.connected')
|
||||
def setup_endpoint(keystone):
|
||||
ironic.setup_endpoint(keystone)
|
||||
ironic.assess_status()
|
||||
with charm.provide_charm_instance() as ironic_charm:
|
||||
keystone.register_endpoints(
|
||||
ironic_charm.service_type,
|
||||
ironic_charm.region,
|
||||
ironic_charm.public_url,
|
||||
ironic_charm.internal_url,
|
||||
ironic_charm.admin_url)
|
||||
ironic_charm.assess_status()
|
||||
|
||||
|
||||
@reactive.when('ironic-api.available')
|
||||
@reactive.when('config.complete')
|
||||
def ironic_api_relation_joined(ironic_api):
|
||||
with charm.provide_charm_instance() as ironic_charm:
|
||||
ironic_charm.set_ironic_api_info(ironic_api)
|
||||
|
||||
|
||||
@reactive.when('config.complete')
|
||||
@reactive.when_not('db.synced')
|
||||
def run_db_migration():
|
||||
ironic.db_sync()
|
||||
ironic.restart_all()
|
||||
with charm.provide_charm_instance() as ironic_charm:
|
||||
ironic_charm.db_sync()
|
||||
ironic_charm.restart_all()
|
||||
ironic_charm.assess_status()
|
||||
reactive.set_state('db.synced')
|
||||
ironic.assess_status()
|
||||
|
||||
|
||||
@reactive.when('ha.connected')
|
||||
def cluster_connected(hacluster):
|
||||
ironic.configure_ha_resources(hacluster)
|
||||
|
||||
|
||||
@adapters.config_property
|
||||
def deployment_interface_ip(self):
|
||||
return ch_ip.get_relation_ip("deployment")
|
||||
|
||||
@adapters.config_property
|
||||
def internal_interface_ip(self):
|
||||
return ch_ip.get_relation_ip("internal")
|
||||
with charm.provide_charm_instance() as ironic_charm:
|
||||
ironic_charm.configure_ha_resources(hacluster)
|
||||
ironic_charm.assess_status()
|
|
@ -0,0 +1,8 @@
|
|||
# This file is managed centrally by release-tools and should not be modified
|
||||
# within individual charm repos. See the 'global' dir contents for available
|
||||
# choices of *requirements.txt files for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
|
||||
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
|
@ -0,0 +1,50 @@
|
|||
# Source charm (with zaza): ./src/tox.ini
|
||||
# This file is managed centrally by release-tools and should not be modified
|
||||
# within individual charm repos. See the 'global' dir contents for available
|
||||
# choices of tox.ini for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
|
||||
[tox]
|
||||
envlist = pep8
|
||||
skipsdist = True
|
||||
# NOTE: Avoid build/test env pollution by not enabling sitepackages.
|
||||
sitepackages = False
|
||||
# NOTE: Avoid false positives by not skipping missing interpreters.
|
||||
skip_missing_interpreters = False
|
||||
|
||||
[testenv]
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
PYTHONHASHSEED=0
|
||||
whitelist_externals = juju
|
||||
passenv = HOME TERM CS_* OS_* TEST_*
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
install_command =
|
||||
pip install {opts} {packages}
|
||||
|
||||
[testenv:pep8]
|
||||
basepython = python3
|
||||
deps=charm-tools
|
||||
commands = charm-proof
|
||||
|
||||
[testenv:func-noop]
|
||||
basepython = python3
|
||||
commands =
|
||||
functest-run-suite --help
|
||||
|
||||
[testenv:func]
|
||||
basepython = python3
|
||||
commands =
|
||||
functest-run-suite --keep-model
|
||||
|
||||
[testenv:func-smoke]
|
||||
basepython = python3
|
||||
commands =
|
||||
functest-run-suite --keep-model --smoke
|
||||
|
||||
[testenv:func-target]
|
||||
basepython = python3
|
||||
commands =
|
||||
functest-run-suite --keep-model --bundle {posargs}
|
||||
|
||||
[testenv:venv]
|
||||
commands = {posargs}
|
|
@ -0,0 +1,24 @@
|
|||
# This file is managed centrally by release-tools and should not be modified
|
||||
# within individual charm repos. See the 'global' dir contents for available
|
||||
# choices of *requirements.txt files for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||
# Lint and unit test requirements
|
||||
flake8>=2.2.4
|
||||
stestr>=2.2.0
|
||||
requests>=2.18.4
|
||||
charms.reactive
|
||||
mock>=1.2
|
||||
nose>=1.3.7
|
||||
coverage>=3.6
|
||||
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
||||
#
|
||||
# Revisit for removal / mock improvement:
|
||||
netifaces # vault
|
||||
psycopg2-binary # vault
|
||||
tenacity # vault
|
||||
pbr # vault
|
||||
cryptography # vault, keystone-saml-mellon
|
||||
lxml # keystone-saml-mellon
|
||||
hvac # vault, barbican-vault
|
|
@ -0,0 +1,97 @@
|
|||
# Source charm: ./tox.ini
|
||||
# This file is managed centrally by release-tools and should not be modified
|
||||
# within individual charm repos. See the 'global' dir contents for available
|
||||
# choices of tox.ini for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
|
||||
[tox]
|
||||
skipsdist = True
|
||||
envlist = pep8,py3
|
||||
# NOTE: Avoid build/test env pollution by not enabling sitepackages.
|
||||
sitepackages = False
|
||||
# NOTE: Avoid false positives by not skipping missing interpreters.
|
||||
skip_missing_interpreters = False
|
||||
|
||||
[testenv]
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
PYTHONHASHSEED=0
|
||||
TERM=linux
|
||||
LAYER_PATH={toxinidir}/layers
|
||||
INTERFACE_PATH={toxinidir}/interfaces
|
||||
JUJU_REPOSITORY={toxinidir}/build
|
||||
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
|
||||
install_command =
|
||||
pip install {opts} {packages}
|
||||
deps =
|
||||
-r{toxinidir}/requirements.txt
|
||||
|
||||
[testenv:build]
|
||||
basepython = python3
|
||||
commands =
|
||||
charm-build --log-level DEBUG -o {toxinidir}/build src {posargs}
|
||||
|
||||
[testenv:py3]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py35]
|
||||
basepython = python3.5
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py36]
|
||||
basepython = python3.6
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py37]
|
||||
basepython = python3.7
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py38]
|
||||
basepython = python3.8
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:pep8]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = flake8 {posargs} src unit_tests
|
||||
|
||||
[testenv:cover]
|
||||
# Technique based heavily upon
|
||||
# https://github.com/openstack/nova/blob/master/tox.ini
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
setenv =
|
||||
{[testenv]setenv}
|
||||
PYTHON=coverage run
|
||||
commands =
|
||||
coverage erase
|
||||
stestr run --slowest {posargs}
|
||||
coverage combine
|
||||
coverage html -d cover
|
||||
coverage xml -o cover/coverage.xml
|
||||
coverage report
|
||||
|
||||
[coverage:run]
|
||||
branch = True
|
||||
concurrency = multiprocessing
|
||||
parallel = True
|
||||
source =
|
||||
.
|
||||
omit =
|
||||
.tox/*
|
||||
*/charmhelpers/*
|
||||
unit_tests/*
|
||||
|
||||
[testenv:venv]
|
||||
basepython = python3
|
||||
commands = {posargs}
|
||||
|
||||
[flake8]
|
||||
# E402 ignore necessary for path append before sys module import in actions
|
||||
ignore = E402,W503,W504
|
|
@ -0,0 +1,11 @@
|
|||
import sys
|
||||
import mock
|
||||
|
||||
sys.path.append('src')
|
||||
sys.path.append('src/lib')
|
||||
|
||||
# Mock out charmhelpers so that we can test without it.
|
||||
import charms_openstack.test_mocks # noqa
|
||||
charms_openstack.test_mocks.mock_charmhelpers()
|
||||
sys.modules['charmhelpers.core.decorators'] = (
|
||||
charms_openstack.test_mocks.charmhelpers.core.decorators)
|
|
@ -0,0 +1,118 @@
|
|||
# Copyright 2020 Canonical Ltd
|
||||
#
|
||||
# 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 json
|
||||
import mock
|
||||
|
||||
from charm.openstack.ironic import ironic
|
||||
import reactive.ironic_handlers as handlers
|
||||
|
||||
import charms_openstack.test_utils as test_utils
|
||||
|
||||
|
||||
class TestRegisteredHooks(test_utils.TestRegisteredHooks):
|
||||
|
||||
def test_hooks(self):
|
||||
defaults = [
|
||||
'charm.installed',
|
||||
'amqp.connected',
|
||||
'shared-db.connected',
|
||||
'identity-service.available',
|
||||
'config.changed',
|
||||
'update-status',
|
||||
'upgrade-charm',
|
||||
'certificates.available',
|
||||
]
|
||||
hook_set = {
|
||||
'when': {
|
||||
'render': ('shared-db.available',
|
||||
'identity-service.available',
|
||||
'amqp.available',),
|
||||
'run_db_migration': ('config.complete',),
|
||||
'cluster_connected': ('ha.connected',),
|
||||
'setup_endpoint': ('identity-service.connected',),
|
||||
'ironic_api_relation_joined': (
|
||||
'ironic-api.available',
|
||||
'config.complete',
|
||||
),
|
||||
},
|
||||
'when_not': {
|
||||
'run_db_migration': (
|
||||
'db.synced',),
|
||||
},
|
||||
'hook': {
|
||||
'upgrade_charm': ('upgrade-charm',),
|
||||
},
|
||||
}
|
||||
# test that the hooks were registered via the
|
||||
# reactive.ironic_handlers
|
||||
self.registered_hooks_test_helper(handlers, hook_set, defaults)
|
||||
|
||||
|
||||
class TestIronicHandlers(test_utils.PatchHelper):
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.patch_release(ironic.IronicAPICharm.release)
|
||||
self.ironic_charm = mock.MagicMock()
|
||||
self.patch_object(handlers.charm, 'provide_charm_instance',
|
||||
new=mock.MagicMock())
|
||||
self.provide_charm_instance().__enter__.return_value = \
|
||||
self.ironic_charm
|
||||
self.provide_charm_instance().__exit__.return_value = None
|
||||
|
||||
def test_setup_endpoint_connection(self):
|
||||
keystone = mock.MagicMock()
|
||||
handlers.setup_endpoint(keystone)
|
||||
keystone.register_endpoints.assert_called_once_with(
|
||||
self.ironic_charm.service_type,
|
||||
self.ironic_charm.region,
|
||||
self.ironic_charm.public_url,
|
||||
self.ironic_charm.internal_url,
|
||||
self.ironic_charm.admin_url)
|
||||
self.ironic_charm.assess_status.assert_called_once_with()
|
||||
|
||||
def test_ironic_api_relation_joined(self):
|
||||
ironic_api = mock.MagicMock()
|
||||
handlers.ironic_api_relation_joined(ironic_api)
|
||||
self.ironic_charm.set_ironic_api_info.assert_called_once_with(
|
||||
ironic_api)
|
||||
|
||||
def test_render(self):
|
||||
self.patch('charms.reactive.set_state', 'set_state')
|
||||
self.patch_object(handlers.charm, 'optional_interfaces')
|
||||
self.optional_interfaces.return_value = ('fake', 'interface', 'list')
|
||||
handlers.render('arg1', 'arg2')
|
||||
self.ironic_charm.render_with_interfaces.assert_called_once_with(
|
||||
('fake', 'interface', 'list'))
|
||||
self.optional_interfaces.assert_called_once_with(
|
||||
('arg1', 'arg2'))
|
||||
self.ironic_charm.configure_ssl.assert_called_once_with()
|
||||
self.ironic_charm.assess_status.assert_called_once_with()
|
||||
self.set_state.assert_called_once_with('config.complete')
|
||||
|
||||
def test_run_db_migration(self):
|
||||
self.patch('charms.reactive.set_state', 'set_state')
|
||||
handlers.run_db_migration()
|
||||
self.ironic_charm.db_sync.assert_called_once_with()
|
||||
self.ironic_charm.restart_all.assert_called_once_with()
|
||||
self.set_state.assert_called_once_with('db.synced')
|
||||
self.ironic_charm.assess_status.assert_called_once_with()
|
||||
|
||||
def test_cluster_connected(self):
|
||||
hacluster = mock.MagicMock()
|
||||
handlers.cluster_connected(hacluster)
|
||||
self.ironic_charm.configure_ha_resources.assert_called_once_with(
|
||||
hacluster)
|
||||
self.ironic_charm.assess_status.assert_called_once_with()
|
|
@ -0,0 +1,90 @@
|
|||
# Copyright 2020 Canonical Ltd
|
||||
#
|
||||
# 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 mock
|
||||
|
||||
import charms_openstack.test_utils as test_utils
|
||||
|
||||
from charm.openstack.ironic import ironic
|
||||
|
||||
|
||||
class TestIronicCharmConfigProperties(test_utils.PatchHelper):
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.patch_release(ironic.IronicAPICharm.release)
|
||||
|
||||
def test_deployment_interface_ip(self):
|
||||
cls = mock.MagicMock()
|
||||
self.patch_object(ironic, 'ch_ip')
|
||||
ironic.deployment_interface_ip(cls)
|
||||
self.ch_ip.get_relation_ip.assert_called_with('deployment')
|
||||
|
||||
def test_internal_interface_ip(self):
|
||||
cls = mock.MagicMock()
|
||||
self.patch_object(ironic, 'ch_ip')
|
||||
ironic.internal_interface_ip(cls)
|
||||
self.ch_ip.get_relation_ip.assert_called_with('internal')
|
||||
|
||||
|
||||
class TestIronicCharm(test_utils.PatchHelper):
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.patch_release(ironic.IronicAPICharm.release)
|
||||
self.target = ironic.IronicAPICharm()
|
||||
|
||||
def test_get_amqp_credentials(self):
|
||||
cfg_data = {
|
||||
"rabbit-user": "ironic",
|
||||
"rabbit-vhost": "openstack",
|
||||
}
|
||||
self.target.config = cfg_data
|
||||
result = self.target.get_amqp_credentials()
|
||||
self.assertEqual(result, ('ironic', 'openstack'))
|
||||
|
||||
def test_get_database_setup(self):
|
||||
cfg_data = {
|
||||
"database-user": "ironic",
|
||||
"database": "ironicdb",
|
||||
}
|
||||
self.target.config = cfg_data
|
||||
result = self.target.get_database_setup()
|
||||
self.assertEqual(
|
||||
result,
|
||||
[{
|
||||
"database": cfg_data["database"],
|
||||
"username": cfg_data["database-user"]}])
|
||||
|
||||
def test_set_ironic_api_info(self):
|
||||
self.patch_object(ironic.reactive.flags, 'is_flag_set')
|
||||
self.is_flag_set.return_value = True
|
||||
baremetal = mock.MagicMock()
|
||||
unit = mock.MagicMock()
|
||||
unit.relation.relation_id = "fake"
|
||||
baremetal.all_joined_units = [unit]
|
||||
relation_data = {"ready": True}
|
||||
self.target.set_ironic_api_info(baremetal)
|
||||
|
||||
baremetal.set_baremetal_info.assert_called_with(
|
||||
"fake", relation_data)
|
||||
|
||||
self.is_flag_set.return_value = False
|
||||
relation_data = {"ready": False}
|
||||
self.target.set_ironic_api_info(baremetal)
|
||||
|
||||
baremetal.set_baremetal_info.assert_called_with(
|
||||
"fake", relation_data)
|
||||
|
||||
|
Loading…
Reference in New Issue