From a97f804abd7ef264157343254cc8797d459c2aa9 Mon Sep 17 00:00:00 2001 From: Ahmad Hassan Date: Tue, 14 Apr 2026 15:20:49 +0500 Subject: [PATCH 1/3] feat: generate veritasaccess charm --- .../backends/veritasaccess/__init__.py | 4 + .../storage/backends/veritasaccess/backend.py | 88 +++++++++++++++++++ .../unit/sunbeam/storage/backends/conftest.py | 10 ++- .../sunbeam/storage/backends/test_common.py | 16 +++- .../storage/backends/test_veritasaccess.py | 58 ++++++++++++ 5 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 sunbeam-python/sunbeam/storage/backends/veritasaccess/__init__.py create mode 100644 sunbeam-python/sunbeam/storage/backends/veritasaccess/backend.py create mode 100644 sunbeam-python/tests/unit/sunbeam/storage/backends/test_veritasaccess.py diff --git a/sunbeam-python/sunbeam/storage/backends/veritasaccess/__init__.py b/sunbeam-python/sunbeam/storage/backends/veritasaccess/__init__.py new file mode 100644 index 000000000..cd0cce88a --- /dev/null +++ b/sunbeam-python/sunbeam/storage/backends/veritasaccess/__init__.py @@ -0,0 +1,4 @@ +# SPDX-FileCopyrightText: 2026 - Canonical Ltd +# SPDX-License-Identifier: Apache-2.0 + +"""Veritas Access backend for Sunbeam storage.""" diff --git a/sunbeam-python/sunbeam/storage/backends/veritasaccess/backend.py b/sunbeam-python/sunbeam/storage/backends/veritasaccess/backend.py new file mode 100644 index 000000000..50953da6c --- /dev/null +++ b/sunbeam-python/sunbeam/storage/backends/veritasaccess/backend.py @@ -0,0 +1,88 @@ +# SPDX-FileCopyrightText: 2026 - Canonical Ltd +# SPDX-License-Identifier: Apache-2.0 + +"""ACCESSIscsi 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 + +LOG = logging.getLogger(__name__) +console = Console() + + +class Protocol(StrEnum): + """Enumeration of valid protocol types.""" + + ISCSI = "iscsi" + + +class VeritasaccessConfig(StorageBackendConfig): + """Configuration model for ACCESSIscsi 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 + + # Optional backend configuration + vrts_lun_sparse: Annotated[ + bool | None, + Field(description="Create sparse Lun."), + ] = None + + vrts_target_config: Annotated[ + str | None, + Field(description="VA config file."), + ] = None + + +class VeritasaccessBackend(StorageBackendBase): + """ACCESSIscsi backend implementation.""" + + backend_type = "veritasaccess" + display_name = "ACCESSIscsi" + generally_available = True + + @property + def charm_name(self) -> str: + """Return the charm application name.""" + return "cinder-volume-veritasaccess" + + @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 VeritasaccessConfig diff --git a/sunbeam-python/tests/unit/sunbeam/storage/backends/conftest.py b/sunbeam-python/tests/unit/sunbeam/storage/backends/conftest.py index 80d3d8ef5..7cd44511d 100644 --- a/sunbeam-python/tests/unit/sunbeam/storage/backends/conftest.py +++ b/sunbeam-python/tests/unit/sunbeam/storage/backends/conftest.py @@ -9,6 +9,7 @@ from sunbeam.storage.backends.dellsc.backend import DellSCBackend from sunbeam.storage.backends.hitachi.backend import HitachiBackend from sunbeam.storage.backends.purestorage.backend import PureStorageBackend +from sunbeam.storage.backends.veritasaccess.backend import VeritasaccessBackend @pytest.fixture @@ -29,19 +30,26 @@ def dellsc_backend(): return DellSCBackend() +@pytest.fixture +def veritasaccess_backend(): + """Provide a Veritas Access backend instance.""" + return VeritasaccessBackend() + + @pytest.fixture def dellpowerstore_backend(): """Provide a Dell PowerStore backend instance.""" return DellPowerstoreBackend() -@pytest.fixture(params=["hitachi", "purestorage", "dellsc", "dellpowerstore"]) +@pytest.fixture(params=["hitachi", "purestorage", "dellsc", "veritasaccess", "dellpowerstore"]) def any_backend(request): """Parametrized fixture that provides each backend type.""" backends = { "hitachi": HitachiBackend(), "purestorage": PureStorageBackend(), "dellsc": DellSCBackend(), + "veritasaccess": VeritasaccessBackend(), "dellpowerstore": DellPowerstoreBackend(), } return backends[request.param] diff --git a/sunbeam-python/tests/unit/sunbeam/storage/backends/test_common.py b/sunbeam-python/tests/unit/sunbeam/storage/backends/test_common.py index def51a0e8..47e587ca9 100644 --- a/sunbeam-python/tests/unit/sunbeam/storage/backends/test_common.py +++ b/sunbeam-python/tests/unit/sunbeam/storage/backends/test_common.py @@ -157,13 +157,18 @@ def backend(self, any_backend): def test_all_backends_have_unique_types( - hitachi_backend, purestorage_backend, dellsc_backend, dellpowerstore_backend + hitachi_backend, purestorage_backend, dellsc_backend, veritasaccess_backend, dellpowerstore_backend ): """Test that all backends have unique type identifiers.""" backends = [ + hitachi_backend, + purestorage_backend, + dellsc_backend, + veritasaccess_backend, + , dellpowerstore_backend, ] types = [b.backend_type for b in backends] @@ -173,13 +178,18 @@ def test_all_backends_have_unique_types( def test_all_backends_have_unique_charm_names( - hitachi_backend, purestorage_backend, dellsc_backend, dellpowerstore_backend + hitachi_backend, purestorage_backend, dellsc_backend, veritasaccess_backend, dellpowerstore_backend ): """Test that all backends have unique charm names.""" backends = [ + hitachi_backend, + purestorage_backend, + dellsc_backend, + veritasaccess_backend, + , dellpowerstore_backend, ] charm_names = [b.charm_name for b in backends] @@ -196,6 +206,7 @@ def test_all_backends_have_unique_charm_names( ("hitachi", "hitachi"), ("purestorage", "purestorage"), ("dellsc", "dellsc"), + ("veritasaccess", "veritasaccess"), ("dellpowerstore", "dellpowerstore"), ], ) @@ -211,6 +222,7 @@ def test_backend_types_match_expected(any_backend, backend_type, expected_type): ("hitachi", "cinder-volume-hitachi"), ("purestorage", "cinder-volume-purestorage"), ("dellsc", "cinder-volume-dellsc"), + ("veritasaccess", "cinder-volume-veritasaccess"), ("dellpowerstore", "cinder-volume-dellpowerstore"), ], ) diff --git a/sunbeam-python/tests/unit/sunbeam/storage/backends/test_veritasaccess.py b/sunbeam-python/tests/unit/sunbeam/storage/backends/test_veritasaccess.py new file mode 100644 index 000000000..bf4e2a05c --- /dev/null +++ b/sunbeam-python/tests/unit/sunbeam/storage/backends/test_veritasaccess.py @@ -0,0 +1,58 @@ +# SPDX-FileCopyrightText: 2026 - Canonical Ltd +# SPDX-License-Identifier: Apache-2.0 + +"""Tests for Veritas Access backend.""" + +import pytest +from pydantic import ValidationError + +from tests.unit.sunbeam.storage.backends.test_common import BaseBackendTests + + +class TestVeritasaccessBackend(BaseBackendTests): + """Tests for Veritas Access backend.""" + + @pytest.fixture + def backend(self, veritasaccess_backend): + """Provide Veritas Access backend instance.""" + return veritasaccess_backend + + def test_backend_type_is_veritasaccess(self, backend): + """Test that backend type is 'veritasaccess'.""" + assert backend.backend_type == "veritasaccess" + + def test_charm_name_is_veritasaccess_charm(self, backend): + """Test that charm name is cinder-volume-veritasaccess.""" + assert backend.charm_name == "cinder-volume-veritasaccess" + + def test_config_has_required_fields(self, backend): + """Test that Veritas Access 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 TestVeritasaccessConfigValidation: + """Test Veritas Access config validation behavior.""" + + def test_protocol_rejects_invalid_value(self, veritasaccess_backend): + """Test that protocol rejects values other than iscsi.""" + config_class = veritasaccess_backend.config_type() + with pytest.raises(ValidationError): + config_class.model_validate( + { + "san-ip": "192.168.1.1", + "protocol": "fc", + } + ) + + def test_protocol_accepts_iscsi(self, veritasaccess_backend): + """Test that protocol accepts iscsi.""" + config_class = veritasaccess_backend.config_type() + config = config_class.model_validate( + { + "san-ip": "192.168.1.1", + "protocol": "iscsi", + } + ) + assert config.protocol == "iscsi" From e28f0ae1ac61facc6fcba7626c954806eea6f008 Mon Sep 17 00:00:00 2001 From: Ahmad Hassan Date: Wed, 15 Apr 2026 14:37:34 +0500 Subject: [PATCH 2/3] fix: standardize Veritas Access backend naming and docs --- .../storage/backends/veritasaccess/backend.py | 16 ++++++++-------- .../unit/sunbeam/storage/backends/conftest.py | 6 +++--- .../unit/sunbeam/storage/backends/test_common.py | 8 -------- .../storage/backends/test_veritasaccess.py | 8 ++++++-- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/sunbeam-python/sunbeam/storage/backends/veritasaccess/backend.py b/sunbeam-python/sunbeam/storage/backends/veritasaccess/backend.py index 50953da6c..1e508c0f8 100644 --- a/sunbeam-python/sunbeam/storage/backends/veritasaccess/backend.py +++ b/sunbeam-python/sunbeam/storage/backends/veritasaccess/backend.py @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2026 - Canonical Ltd # SPDX-License-Identifier: Apache-2.0 -"""ACCESSIscsi backend implementation using base step classes.""" +"""Veritas Access backend implementation using base step classes.""" import logging from enum import StrEnum @@ -23,8 +23,8 @@ class Protocol(StrEnum): ISCSI = "iscsi" -class VeritasaccessConfig(StorageBackendConfig): - """Configuration model for ACCESSIscsi backend. +class VeritasAccessConfig(StorageBackendConfig): + """Configuration model for Veritas Access backend. This model includes ALL configuration options for the backend. Additional configuration can be managed dynamically through the charm. @@ -42,7 +42,7 @@ class VeritasaccessConfig(StorageBackendConfig): # Optional backend configuration vrts_lun_sparse: Annotated[ bool | None, - Field(description="Create sparse Lun."), + Field(description="Create sparse LUN."), ] = None vrts_target_config: Annotated[ @@ -51,11 +51,11 @@ class VeritasaccessConfig(StorageBackendConfig): ] = None -class VeritasaccessBackend(StorageBackendBase): - """ACCESSIscsi backend implementation.""" +class VeritasAccessBackend(StorageBackendBase): + """Veritas Access backend implementation.""" backend_type = "veritasaccess" - display_name = "ACCESSIscsi" + display_name = "Veritas Access" generally_available = True @property @@ -85,4 +85,4 @@ def supports_ha(self) -> bool: def config_type(self) -> type[StorageBackendConfig]: """Return the configuration model type for this backend.""" - return VeritasaccessConfig + return VeritasAccessConfig diff --git a/sunbeam-python/tests/unit/sunbeam/storage/backends/conftest.py b/sunbeam-python/tests/unit/sunbeam/storage/backends/conftest.py index 7cd44511d..75727da8d 100644 --- a/sunbeam-python/tests/unit/sunbeam/storage/backends/conftest.py +++ b/sunbeam-python/tests/unit/sunbeam/storage/backends/conftest.py @@ -9,7 +9,7 @@ from sunbeam.storage.backends.dellsc.backend import DellSCBackend from sunbeam.storage.backends.hitachi.backend import HitachiBackend from sunbeam.storage.backends.purestorage.backend import PureStorageBackend -from sunbeam.storage.backends.veritasaccess.backend import VeritasaccessBackend +from sunbeam.storage.backends.veritasaccess.backend import VeritasAccessBackend @pytest.fixture @@ -33,7 +33,7 @@ def dellsc_backend(): @pytest.fixture def veritasaccess_backend(): """Provide a Veritas Access backend instance.""" - return VeritasaccessBackend() + return VeritasAccessBackend() @pytest.fixture @@ -49,7 +49,7 @@ def any_backend(request): "hitachi": HitachiBackend(), "purestorage": PureStorageBackend(), "dellsc": DellSCBackend(), - "veritasaccess": VeritasaccessBackend(), + "veritasaccess": VeritasAccessBackend(), "dellpowerstore": DellPowerstoreBackend(), } return backends[request.param] diff --git a/sunbeam-python/tests/unit/sunbeam/storage/backends/test_common.py b/sunbeam-python/tests/unit/sunbeam/storage/backends/test_common.py index 47e587ca9..b0bab24b8 100644 --- a/sunbeam-python/tests/unit/sunbeam/storage/backends/test_common.py +++ b/sunbeam-python/tests/unit/sunbeam/storage/backends/test_common.py @@ -161,14 +161,10 @@ def test_all_backends_have_unique_types( ): """Test that all backends have unique type identifiers.""" backends = [ - hitachi_backend, - purestorage_backend, - dellsc_backend, veritasaccess_backend, - , dellpowerstore_backend, ] types = [b.backend_type for b in backends] @@ -182,14 +178,10 @@ def test_all_backends_have_unique_charm_names( ): """Test that all backends have unique charm names.""" backends = [ - hitachi_backend, - purestorage_backend, - dellsc_backend, veritasaccess_backend, - , dellpowerstore_backend, ] charm_names = [b.charm_name for b in backends] diff --git a/sunbeam-python/tests/unit/sunbeam/storage/backends/test_veritasaccess.py b/sunbeam-python/tests/unit/sunbeam/storage/backends/test_veritasaccess.py index bf4e2a05c..b04586608 100644 --- a/sunbeam-python/tests/unit/sunbeam/storage/backends/test_veritasaccess.py +++ b/sunbeam-python/tests/unit/sunbeam/storage/backends/test_veritasaccess.py @@ -9,7 +9,7 @@ from tests.unit.sunbeam.storage.backends.test_common import BaseBackendTests -class TestVeritasaccessBackend(BaseBackendTests): +class TestVeritasAccessBackend(BaseBackendTests): """Tests for Veritas Access backend.""" @pytest.fixture @@ -25,6 +25,10 @@ def test_charm_name_is_veritasaccess_charm(self, backend): """Test that charm name is cinder-volume-veritasaccess.""" assert backend.charm_name == "cinder-volume-veritasaccess" + def test_display_name_is_veritas_access(self, backend): + """Test that display name is user-friendly and consistent.""" + assert backend.display_name == "Veritas Access" + def test_config_has_required_fields(self, backend): """Test that Veritas Access config has required fields.""" fields = backend.config_type().model_fields @@ -32,7 +36,7 @@ def test_config_has_required_fields(self, backend): assert field in fields, f"Required field {field} not found in config" -class TestVeritasaccessConfigValidation: +class TestVeritasAccessConfigValidation: """Test Veritas Access config validation behavior.""" def test_protocol_rejects_invalid_value(self, veritasaccess_backend): From 10c075f942dcaaf394cf9036ca7342233a6c689b Mon Sep 17 00:00:00 2001 From: Ahmad Hassan Date: Tue, 21 Apr 2026 17:05:13 +0500 Subject: [PATCH 3/3] fix: test/lint issues resolve --- .../tests/unit/sunbeam/storage/backends/conftest.py | 4 +++- .../unit/sunbeam/storage/backends/test_common.py | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sunbeam-python/tests/unit/sunbeam/storage/backends/conftest.py b/sunbeam-python/tests/unit/sunbeam/storage/backends/conftest.py index 75727da8d..f9b7d6c35 100644 --- a/sunbeam-python/tests/unit/sunbeam/storage/backends/conftest.py +++ b/sunbeam-python/tests/unit/sunbeam/storage/backends/conftest.py @@ -42,7 +42,9 @@ def dellpowerstore_backend(): return DellPowerstoreBackend() -@pytest.fixture(params=["hitachi", "purestorage", "dellsc", "veritasaccess", "dellpowerstore"]) +@pytest.fixture( + params=["hitachi", "purestorage", "dellsc", "veritasaccess", "dellpowerstore"] +) def any_backend(request): """Parametrized fixture that provides each backend type.""" backends = { diff --git a/sunbeam-python/tests/unit/sunbeam/storage/backends/test_common.py b/sunbeam-python/tests/unit/sunbeam/storage/backends/test_common.py index b0bab24b8..62891aba3 100644 --- a/sunbeam-python/tests/unit/sunbeam/storage/backends/test_common.py +++ b/sunbeam-python/tests/unit/sunbeam/storage/backends/test_common.py @@ -157,7 +157,11 @@ def backend(self, any_backend): def test_all_backends_have_unique_types( - hitachi_backend, purestorage_backend, dellsc_backend, veritasaccess_backend, dellpowerstore_backend + hitachi_backend, + purestorage_backend, + dellsc_backend, + veritasaccess_backend, + dellpowerstore_backend, ): """Test that all backends have unique type identifiers.""" backends = [ @@ -174,7 +178,11 @@ def test_all_backends_have_unique_types( def test_all_backends_have_unique_charm_names( - hitachi_backend, purestorage_backend, dellsc_backend, veritasaccess_backend, dellpowerstore_backend + hitachi_backend, + purestorage_backend, + dellsc_backend, + veritasaccess_backend, + dellpowerstore_backend, ): """Test that all backends have unique charm names.""" backends = [