forked from gnuoy/snap-openstack
-
Notifications
You must be signed in to change notification settings - Fork 35
feat: generate yadro charm #774
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
4
commits into
canonical:main
Choose a base branch
from
ahmad-can:feature/generate-yadro-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
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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 | ||
|
|
||
| """Yadro backend for Sunbeam storage.""" |
120 changes: 120 additions & 0 deletions
120
sunbeam-python/sunbeam/storage/backends/yadro/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,120 @@ | ||
| # SPDX-FileCopyrightText: 2026 - Canonical Ltd | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| """Yadro storage backend implementation.""" | ||
|
|
||
| from enum import StrEnum | ||
| from typing import Annotated | ||
|
|
||
| from pydantic import Field | ||
|
|
||
| from sunbeam.core.manifest import StorageBackendConfig | ||
| from sunbeam.storage.base import StorageBackendBase | ||
|
|
||
|
|
||
| class Protocol(StrEnum): | ||
| """Enumeration of valid protocol types.""" | ||
|
|
||
| FC = "fc" | ||
| ISCSI = "iscsi" | ||
|
|
||
|
|
||
| class YadroConfig(StorageBackendConfig): | ||
| """Configuration model for the Yadro storage backend. | ||
|
|
||
| This model includes the configuration options defined directly for this | ||
| backend. Additional configuration can be managed dynamically through the | ||
| charm. | ||
| """ | ||
|
|
||
| # Required connection parameter. | ||
| san_ip: Annotated[ | ||
| str, Field(description="Storage array management IP address or hostname.") | ||
| ] | ||
|
|
||
| # Optional backend configuration parameters. | ||
| protocol: Annotated[ | ||
| Protocol | None, | ||
| Field(description="Protocol selector: fc, iscsi."), | ||
| ] = None | ||
| pool_name: Annotated[ | ||
| str | None, | ||
| Field(description="Storage pool name."), | ||
| ] = None | ||
| api_port: Annotated[ | ||
| int | None, | ||
| Field(description="Port used to access the storage API."), | ||
| ] = None | ||
| export_ports: Annotated[ | ||
| str | None, | ||
| Field(description="Ports used to export storage resources."), | ||
| ] = None | ||
| host_group: Annotated[ | ||
| str | None, | ||
| Field(description="Host group name."), | ||
| ] = None | ||
| max_resource_count: Annotated[ | ||
| int | None, | ||
| Field(description="Maximum number of resources allowed."), | ||
| ] = None | ||
| pool_max_resource_count: Annotated[ | ||
| int | None, | ||
| Field(description="Maximum number of resources allowed for a single pool."), | ||
| ] = None | ||
| tat_api_retry_count: Annotated[ | ||
| int | None, | ||
| Field(description="Number of retries for storage API operations."), | ||
| ] = None | ||
| auth_method: Annotated[ | ||
| str | None, | ||
| Field(description="Authentication method for iSCSI (CHAP)"), | ||
| ] = None | ||
| lba_format: Annotated[ | ||
| str | None, | ||
| Field(description="LBA format for new volumes."), | ||
| ] = None | ||
| wait_retry_count: Annotated[ | ||
| int | None, | ||
| Field(description="Number of checks for a lengthy operation to finish."), | ||
| ] = None | ||
| wait_interval: Annotated[ | ||
| int | None, | ||
| Field(description="Number of seconds to wait before re-checking."), | ||
| ] = None | ||
|
|
||
|
|
||
| class YadroBackend(StorageBackendBase): | ||
| """Yadro storage backend implementation.""" | ||
|
|
||
| backend_type = "yadro" | ||
| display_name = "Tatlin FCVolume" | ||
| generally_available = True | ||
|
|
||
| @property | ||
| def charm_name(self) -> str: | ||
| """Return the charm application name.""" | ||
| return "cinder-volume-yadro" | ||
|
|
||
| @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 True | ||
|
|
||
| def config_type(self) -> type[StorageBackendConfig]: | ||
| """Return the configuration model type for this backend.""" | ||
| return YadroConfig |
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
58 changes: 58 additions & 0 deletions
58
sunbeam-python/tests/unit/sunbeam/storage/backends/test_yadro.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,58 @@ | ||
| # SPDX-FileCopyrightText: 2026 - Canonical Ltd | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| """Tests for Yadro backend.""" | ||
|
|
||
| import pytest | ||
| from pydantic import ValidationError | ||
|
|
||
| from tests.unit.sunbeam.storage.backends.test_common import BaseBackendTests | ||
|
|
||
|
|
||
| class TestYadroBackend(BaseBackendTests): | ||
| """Tests for Yadro backend.""" | ||
|
|
||
| @pytest.fixture | ||
| def backend(self, yadro_backend): | ||
| """Provide Yadro backend instance.""" | ||
| return yadro_backend | ||
|
|
||
| def test_backend_type_is_yadro(self, backend): | ||
| """Test that backend type is 'yadro'.""" | ||
| assert backend.backend_type == "yadro" | ||
|
|
||
| def test_charm_name_is_yadro_charm(self, backend): | ||
| """Test that charm name is cinder-volume-yadro.""" | ||
| assert backend.charm_name == "cinder-volume-yadro" | ||
|
|
||
| def test_config_has_required_fields(self, backend): | ||
| """Test that Yadro config has required fields.""" | ||
| fields = backend.config_type().model_fields | ||
| for field in ("san_ip", "protocol"): | ||
| assert field in fields, f"Required field {field} not found in config" | ||
|
|
||
|
|
||
| class TestYadroConfigValidation: | ||
| """Test Yadro config validation behavior.""" | ||
|
|
||
| def test_protocol_rejects_invalid_value(self, yadro_backend): | ||
| """Test that protocol rejects values other than fc/iscsi.""" | ||
| config_class = yadro_backend.config_type() | ||
| with pytest.raises(ValidationError): | ||
| config_class.model_validate( | ||
| { | ||
| "san-ip": "192.168.1.1", | ||
| "protocol": "nvme", | ||
| } | ||
| ) | ||
|
ahmad-can marked this conversation as resolved.
|
||
|
|
||
| def test_protocol_accepts_fc(self, yadro_backend): | ||
| """Test that protocol accepts fc.""" | ||
| config_class = yadro_backend.config_type() | ||
| config = config_class.model_validate( | ||
| { | ||
| "san-ip": "192.168.1.1", | ||
| "protocol": "fc", | ||
| } | ||
| ) | ||
|
ahmad-can marked this conversation as resolved.
|
||
| 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.