openstack/sunbeam-charms
Code Issues Proposed changes

Unused openstack_release option

Browse Source 
Change-Id: I8a0b89dc227f9cbd1034e37b257e8c5ef905db3f
This commit is contained in:
Liam Young 2022-11-03 13:13:17 +00:00
parent b222d31a61
commit 200957d633
5 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ops-sunbeam/ops_sunbeam/charm.py
View File

@ -203,7 +203,6 @@ class OSBaseOperatorCharm(ops.charm.CharmBase):
self.service_name,
self.container_configs,
self.template_dir,
self.openstack_release,
self.configure_charm,
)
]
@ -619,7 +618,6 @@ class OSBaseOperatorAPICharm(OSBaseOperatorCharm):
self.service_name,
self.container_configs,
self.template_dir,
self.openstack_release,
self.configure_charm,
f"wsgi-{self.service_name}",
)

5
ops-sunbeam/ops_sunbeam/container_handlers.py
View File

@ -60,7 +60,6 @@ class PebbleHandler(ops.charm.Object):
service_name: str,
container_configs: List[sunbeam_core.ContainerConfigFile],
template_dir: str,
openstack_release: str,
callback_f: Callable,
) -> None:
"""Run constructor."""
@ -73,7 +72,6 @@ class PebbleHandler(ops.charm.Object):
self.container_configs = container_configs
self.container_configs.extend(self.default_container_configs())
self.template_dir = template_dir
self.openstack_release = openstack_release
self.callback_f = callback_f
self.setup_pebble_handler()
@ -120,7 +118,6 @@ class PebbleHandler(ops.charm.Object):
container,
config,
self.template_dir,
self.openstack_release,
context,
)
if changed:
@ -348,7 +345,6 @@ class WSGIPebbleHandler(PebbleHandler):
service_name: str,
container_configs: List[sunbeam_core.ContainerConfigFile],
template_dir: str,
openstack_release: str,
callback_f: Callable,
wsgi_service_name: str,
) -> None:
@ -359,7 +355,6 @@ class WSGIPebbleHandler(PebbleHandler):
service_name,
container_configs,
template_dir,
openstack_release,
callback_f,
)
self.wsgi_service_name = wsgi_service_name

1
ops-sunbeam/ops_sunbeam/templating.py
View File

@ -50,7 +50,6 @@ def sidecar_config_render(
container: "ops.model.Container",
config: "sunbeam_core.ContainerConfigFile",
template_dir: str,
openstack_release: str,
context: "sunbeam_core.OPSCharmContexts",
) -> bool:
"""Render templates inside containers.

3
ops-sunbeam/unit_tests/test_charms.py
View File

@ -138,7 +138,6 @@ resources:
class MyCharm(sunbeam_charm.OSBaseOperatorCharm):
"""Test charm for testing OSBaseOperatorCharm."""
openstack_release = "diablo"
service_name = "my-service"
def __init__(self, framework: "ops.framework.Framework") -> None:
@ -203,7 +202,6 @@ TEMPLATE_CONTENTS = """
class MyAPICharm(sunbeam_charm.OSBaseOperatorAPICharm):
"""Test charm for testing OSBaseOperatorAPICharm."""
openstack_release = "diablo"
service_name = "my-service"
wsgi_admin_script = "/bin/wsgi_admin"
wsgi_public_script = "/bin/wsgi_public"
@ -304,7 +302,6 @@ class TestMultiSvcCharm(MyAPICharm):
self.service_name,
self.container_configs,
self.template_dir,
self.openstack_release,
self.configure_charm,
)
]

4
ops-sunbeam/unit_tests/test_templating.py
View File

@ -51,7 +51,7 @@ class TestTemplating(test_utils.CharmTestCase):
{"testfile.txt": "debug = {{ debug }}"}
)
sunbeam_templating.sidecar_config_render(
container_mock, config, "/tmp/templates", "essex", {"debug": True}
container_mock, config, "/tmp/templates", {"debug": True}
)
container_mock.push.assert_called_once_with(
"/tmp/testfile.txt",
@ -77,6 +77,6 @@ class TestTemplating(test_utils.CharmTestCase):
{"testfile.txt": "debug = {{ debug }}"}
)
sunbeam_templating.sidecar_config_render(
container_mock, config, "/tmp/templates", "essex", {"debug": True}
container_mock, config, "/tmp/templates", {"debug": True}
)
self.assertFalse(container_mock.push.called)