forked from gnuoy/snap-openstack
-
Notifications
You must be signed in to change notification settings - Fork 35
feat: generate synology charm #771
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ahmad-can
wants to merge
3
commits into
canonical:main
Choose a base branch
from
ahmad-can:feature/generate-synology-charm
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # SPDX-FileCopyrightText: 2026 - Canonical Ltd | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| """Synology backend for Sunbeam storage.""" |
125 changes: 125 additions & 0 deletions
125
sunbeam-python/sunbeam/storage/backends/synology/backend.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| # SPDX-FileCopyrightText: 2026 - Canonical Ltd | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| """Synology iSCSI backend implementation using base step classes.""" | ||
|
|
||
| import logging | ||
| from enum import StrEnum | ||
| from typing import Annotated | ||
|
|
||
| from pydantic import Field | ||
| from rich.console import Console | ||
|
|
||
| from sunbeam.core.manifest import StorageBackendConfig | ||
| from sunbeam.storage.base import StorageBackendBase | ||
| from sunbeam.storage.models import SecretDictField | ||
|
|
||
| LOG = logging.getLogger(__name__) | ||
| console = Console() | ||
|
|
||
|
|
||
| class Protocol(StrEnum): | ||
| """Enumeration of valid protocol types.""" | ||
|
|
||
| ISCSI = "iscsi" | ||
|
|
||
|
|
||
| class SynologyConfig(StorageBackendConfig): | ||
| """Configuration model for Synology iSCSI backend. | ||
|
|
||
| This model includes ALL configuration options for the backend. | ||
| Additional configuration can be managed dynamically through the charm. | ||
| """ | ||
|
|
||
| # Mandatory connection parameters | ||
| san_ip: Annotated[ | ||
| str, Field(description="Storage array management IP address or hostname.") | ||
| ] | ||
| protocol: Annotated[ | ||
| Protocol | None, | ||
| Field(description="Protocol selector: iscsi."), | ||
| ] = None | ||
|
|
||
| synology_password: Annotated[ | ||
| str, | ||
| Field(description="Password of administrator for logging in Synology storage."), | ||
| SecretDictField(field="synology-password"), | ||
| ] | ||
|
|
||
| synology_one_time_pass: Annotated[ | ||
| str | None, | ||
| Field( | ||
| description=( | ||
| "One time password of administrator for logging in Synology " | ||
| "storage if OTP is enabled." | ||
| ) | ||
| ), | ||
| SecretDictField(field="synology-one-time-pass"), | ||
| ] = None | ||
|
|
||
| # Optional backend configuration | ||
| synology_pool_name: Annotated[ | ||
| str | None, | ||
| Field(description="Volume on Synology storage to be used for creating lun."), | ||
| ] = None | ||
|
|
||
| synology_admin_port: Annotated[ | ||
| int, | ||
| Field(description="Management port for Synology storage."), | ||
| ] = 5000 | ||
|
|
||
| synology_username: Annotated[ | ||
| str, | ||
| Field(description="Administrator of Synology storage."), | ||
| ] = "admin" | ||
|
|
||
| synology_ssl_verify: Annotated[ | ||
| bool, | ||
| Field(description="Verify SSL certificates when connecting over HTTPS."), | ||
| ] = True | ||
|
|
||
| synology_device_id: Annotated[ | ||
| str | None, | ||
| Field( | ||
| description=( | ||
| "Device id for skip one time password check for logging in " | ||
| "Synology storage if OTP is enabled." | ||
| ) | ||
| ), | ||
| ] = None | ||
|
|
||
|
|
||
| class SynologyBackend(StorageBackendBase): | ||
| """Synology iSCSI backend implementation.""" | ||
|
|
||
| backend_type = "synology" | ||
| display_name = "Synology iSCSI" | ||
| generally_available = True | ||
|
ahmad-can marked this conversation as resolved.
|
||
|
|
||
| @property | ||
| def charm_name(self) -> str: | ||
| """Return the charm application name.""" | ||
| return "cinder-volume-synology" | ||
|
|
||
| @property | ||
| def charm_channel(self) -> str: | ||
| """Return the default charm channel.""" | ||
| return "latest/edge" | ||
|
|
||
| @property | ||
| def charm_revision(self) -> str | None: | ||
| """Return a pinned charm revision, if any.""" | ||
| return None | ||
|
|
||
| @property | ||
| def charm_base(self) -> str: | ||
| """Return the target base for this charm.""" | ||
| return "ubuntu@24.04" | ||
|
|
||
| @property | ||
| def supports_ha(self) -> bool: | ||
| """Whether this backend supports HA deployments.""" | ||
| return False | ||
|
|
||
| def config_type(self) -> type[StorageBackendConfig]: | ||
| """Return the configuration model type for this backend.""" | ||
| return SynologyConfig | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
sunbeam-python/tests/unit/sunbeam/storage/backends/test_synology.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| # SPDX-FileCopyrightText: 2026 - Canonical Ltd | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| """Tests for Synology backend.""" | ||
|
|
||
| import pytest | ||
| from pydantic import ValidationError | ||
|
|
||
| from sunbeam.storage.models import SecretDictField | ||
| from tests.unit.sunbeam.storage.backends.test_common import BaseBackendTests | ||
|
|
||
|
|
||
| class TestSynologyBackend(BaseBackendTests): | ||
| """Tests for Synology backend.""" | ||
|
|
||
| @pytest.fixture | ||
| def backend(self, synology_backend): | ||
| """Provide Synology backend instance.""" | ||
| return synology_backend | ||
|
|
||
| def test_backend_type_is_synology(self, backend): | ||
| """Test that backend type is 'synology'.""" | ||
| assert backend.backend_type == "synology" | ||
|
|
||
| def test_charm_name_is_synology_charm(self, backend): | ||
| """Test that charm name is cinder-volume-synology.""" | ||
| assert backend.charm_name == "cinder-volume-synology" | ||
|
|
||
| def test_display_name_uses_synology_branding(self, backend): | ||
| """Test that display name consistently uses Synology.""" | ||
| assert backend.display_name == "Synology iSCSI" | ||
|
|
||
| def test_config_has_required_fields(self, backend): | ||
| """Test that Synology config has required fields.""" | ||
| fields = backend.config_type().model_fields | ||
| for field in ( | ||
| "san_ip", | ||
| "protocol", | ||
| "synology_password", | ||
| "synology_one_time_pass", | ||
| ): | ||
| assert field in fields, f"Required field {field} not found in config" | ||
|
|
||
| def test_sensitive_fields_are_marked_secret(self, backend): | ||
| """Test Synology secret fields are marked as secret.""" | ||
| config_class = backend.config_type() | ||
| for field_name in ("synology_password", "synology_one_time_pass"): | ||
| field = config_class.model_fields.get(field_name) | ||
| assert field is not None | ||
| assert any(isinstance(m, SecretDictField) for m in field.metadata), ( | ||
| f"{field_name} should be marked as secret" | ||
| ) | ||
|
|
||
|
|
||
| class TestSynologyConfigValidation: | ||
| """Test Synology config validation behavior.""" | ||
|
|
||
| def test_protocol_rejects_invalid_value(self, synology_backend): | ||
| """Test that protocol rejects values other than iscsi.""" | ||
| config_class = synology_backend.config_type() | ||
| with pytest.raises(ValidationError): | ||
| config_class.model_validate( | ||
| { | ||
| "san-ip": "192.168.1.1", | ||
| "synology-password": "secret", | ||
| "synology-one-time-pass": "otp", | ||
| "protocol": "fc", | ||
| } | ||
| ) | ||
|
|
||
| def test_protocol_accepts_iscsi(self, synology_backend): | ||
| """Test that protocol accepts iscsi.""" | ||
| config_class = synology_backend.config_type() | ||
| config = config_class.model_validate( | ||
| { | ||
| "san-ip": "192.168.1.1", | ||
| "synology-password": "secret", | ||
| "synology-one-time-pass": "otp", | ||
| "protocol": "iscsi", | ||
| } | ||
| ) | ||
| assert config.protocol == "iscsi" | ||
|
|
||
| def test_one_time_password_is_optional(self, synology_backend): | ||
| """Test that one-time password is optional when OTP is not enabled.""" | ||
| config_class = synology_backend.config_type() | ||
| config = config_class.model_validate( | ||
| { | ||
| "san-ip": "192.168.1.1", | ||
| "synology-password": "secret", | ||
| "protocol": "iscsi", | ||
| } | ||
| ) | ||
| assert config.synology_one_time_pass is None | ||
|
|
||
| @pytest.mark.parametrize( | ||
| "field_name,field_value", | ||
| [ | ||
| ("synology-admin-port", None), | ||
| ("synology-username", None), | ||
| ("synology-ssl-verify", None), | ||
| ], | ||
| ) | ||
| def test_optional_defaults_reject_none( | ||
| self, synology_backend, field_name, field_value | ||
| ): | ||
| """Test that non-nullable fields with defaults reject explicit None.""" | ||
| config_class = synology_backend.config_type() | ||
| payload = { | ||
| "san-ip": "192.168.1.1", | ||
| "synology-password": "secret", | ||
| "protocol": "iscsi", | ||
| field_name: field_value, | ||
| } | ||
| with pytest.raises(ValidationError): | ||
| config_class.model_validate(payload) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.