forked from gnuoy/snap-openstack
-
Notifications
You must be signed in to change notification settings - Fork 35
feat: generate toyouacs5000 charm #772
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-toyouacs5000-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
4 changes: 4 additions & 0 deletions
4
sunbeam-python/sunbeam/storage/backends/toyouacs5000/__init__.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,4 @@ | ||
| # SPDX-FileCopyrightText: 2026 - Canonical Ltd | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| """Toyou ACS5000 backend for Sunbeam storage.""" |
118 changes: 118 additions & 0 deletions
118
sunbeam-python/sunbeam/storage/backends/toyouacs5000/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,118 @@ | ||
| # SPDX-FileCopyrightText: 2026 - Canonical Ltd | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| """Vendor 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.""" | ||
|
|
||
| FC = "fc" | ||
| ISCSI = "iscsi" | ||
|
|
||
|
|
||
| class Toyouacs5000Config(StorageBackendConfig): | ||
| """Configuration model for Acs5000 backend. | ||
|
|
||
| This model includes ALL configuration options for the backend. | ||
| Additional configuration can be managed dynamically through the charm. | ||
| """ | ||
|
|
||
| # Mandatory connection parameters (required: true in spec) | ||
| san_ip: Annotated[str, Field(description="IP address of SAN controller")] | ||
| san_login: Annotated[ | ||
| str, | ||
| Field(description="Username for SAN controller"), | ||
| SecretDictField(field="san-login"), | ||
| ] | ||
| san_password: Annotated[ | ||
| str, | ||
| Field(description="Password for SAN controller"), | ||
| SecretDictField(field="san-password"), | ||
| ] | ||
|
|
||
| # Optional backend configuration (required: false in spec) | ||
| protocol: Annotated[ | ||
| Protocol | None, | ||
| Field(description="Protocol selector: fc, iscsi."), | ||
| ] = None | ||
|
|
||
| # Storage management options | ||
| acs5000_volpool_name: Annotated[ | ||
| str | None, | ||
| Field( | ||
| description=( | ||
| "Comma-separated list of storage system storage pools for volumes." | ||
| ) | ||
| ), | ||
| ] = None | ||
| acs5000_copy_interval: Annotated[ | ||
| int | None, | ||
| Field( | ||
| description=( | ||
| "When volume copy task is going on, refresh volume status interval" | ||
| ) | ||
| ), | ||
| ] = None | ||
| acs5000_multiattach: Annotated[ | ||
| bool | None, | ||
| Field(description="Enable multi-attach for volumes with no host limit."), | ||
| ] = None | ||
| san_thin_provision: Annotated[ | ||
| bool | None, | ||
| Field(description="Use thin provisioning for SAN volumes?"), | ||
| ] = None | ||
| use_multipath_for_image_xfer: Annotated[ | ||
| bool | None, | ||
| Field(description="Enable multipathing for image transfer operations."), | ||
| ] = None | ||
|
|
||
|
|
||
| class Toyouacs5000Backend(StorageBackendBase): | ||
| """Acs5000 backend implementation.""" | ||
|
|
||
| backend_type = "toyouacs5000" | ||
| display_name = "Acs5000 FC/iSCSI" | ||
| generally_available = True | ||
|
|
||
| @property | ||
| def charm_name(self) -> str: | ||
| """Return the charm application name.""" | ||
| return "cinder-volume-toyouacs5000" | ||
|
|
||
| @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 Toyouacs5000Config | ||
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
85 changes: 85 additions & 0 deletions
85
sunbeam-python/tests/unit/sunbeam/storage/backends/test_toyouacs5000.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,85 @@ | ||
| # SPDX-FileCopyrightText: 2026 - Canonical Ltd | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| """Tests for Toyou ACS5000 backend.""" | ||
|
|
||
| import pytest | ||
| from pydantic import ValidationError | ||
|
|
||
| from sunbeam.storage.models import SecretDictField | ||
| from tests.unit.sunbeam.storage.backends.test_common import BaseBackendTests | ||
|
|
||
|
|
||
| class TestToyouacs5000Backend(BaseBackendTests): | ||
| """Tests for Toyou ACS5000 backend.""" | ||
|
|
||
| @pytest.fixture | ||
| def backend(self, toyouacs5000_backend): | ||
| """Provide Toyou ACS5000 backend instance.""" | ||
| return toyouacs5000_backend | ||
|
|
||
| def test_backend_type_is_toyouacs5000(self, backend): | ||
| """Test that backend type is 'toyouacs5000'.""" | ||
| assert backend.backend_type == "toyouacs5000" | ||
|
|
||
| def test_charm_name_is_toyouacs5000_charm(self, backend): | ||
| """Test that charm name is cinder-volume-toyouacs5000.""" | ||
| assert backend.charm_name == "cinder-volume-toyouacs5000" | ||
|
|
||
| def test_display_name_is_protocol_agnostic(self, backend): | ||
| """Test that display name reflects FC and iSCSI support.""" | ||
| assert backend.display_name == "Acs5000 FC/iSCSI" | ||
|
|
||
| def test_config_has_expected_fields(self, backend): | ||
| """Test that Toyou ACS5000 config exposes expected fields.""" | ||
| fields = backend.config_type().model_fields | ||
| for field in ("san_ip", "protocol", "san_login", "san_password"): | ||
| assert field in fields, f"Expected field {field} not found in config" | ||
|
|
||
| def test_config_enforces_required_fields(self, backend): | ||
| """Test that mandatory Toyou ACS5000 config fields are required.""" | ||
| fields = backend.config_type().model_fields | ||
| for field in ("san_ip", "san_login", "san_password"): | ||
| assert fields[field].is_required(), ( | ||
| f"Field {field} should be required in config" | ||
| ) | ||
|
|
||
| def test_sensitive_fields_are_marked_secret(self, backend): | ||
| """Test that SAN credentials are marked as secret.""" | ||
| config_class = backend.config_type() | ||
| for field_name in ("san_login", "san_password"): | ||
| 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 TestToyouacs5000ConfigValidation: | ||
| """Test Toyou ACS5000 config validation behavior.""" | ||
|
|
||
| def test_protocol_rejects_invalid_value(self, toyouacs5000_backend): | ||
| """Test that protocol rejects values other than fc/iscsi.""" | ||
| config_class = toyouacs5000_backend.config_type() | ||
| with pytest.raises(ValidationError): | ||
| config_class.model_validate( | ||
| { | ||
| "san-ip": "192.168.1.1", | ||
| "san-login": "admin", | ||
| "san-password": "secret", | ||
| "protocol": "nvme", | ||
| } | ||
| ) | ||
|
|
||
| def test_protocol_accepts_fc(self, toyouacs5000_backend): | ||
| """Test that protocol accepts fc.""" | ||
| config_class = toyouacs5000_backend.config_type() | ||
| config = config_class.model_validate( | ||
| { | ||
| "san-ip": "192.168.1.1", | ||
| "san-login": "admin", | ||
| "san-password": "secret", | ||
| "protocol": "fc", | ||
| } | ||
| ) | ||
| assert config.protocol == "fc" |
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.