Commit 3200f256 authored by Paris Stentoumis's avatar Paris Stentoumis
Browse files

Merge branch 'refactor/workload-capability-rename' into 'develop' 

Rename of deploy_workload capability kind to workload

See merge request !32
parents 4abf1ad5 9a1166f5

src/srm/domain/models/topology/enums.py

+1 −1
Changes for src/srm/domain/models/topology/enums.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ class CapabilityState(StrEnum): 


class CapabilityKind(StrEnum):

    QUERY_AVAILABLE_RESOURCES = "query_available_resources"

    DEPLOY_WORKLOAD = "deploy_workload"

    WORKLOAD = "workload"

    QOD_SESSION = "qod_session"

    TRAFFIC_INFLUENCE = "traffic_influence"

    SIM_SWAP = "sim_swap"

tests/api/rest/test_catalog.py

+1 −1
Changes for tests/api/rest/test_catalog.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ def _request_payload(*, service_specification_id: str | None) -> dict[str, Any]: 
            {

                "ref": "compute-capability",

                "deployment_unit_ref": "main",

                "capability_kind": "deploy_workload",

                "capability_kind": "workload",

                "domain_kind": "compute",

            }

        ],

tests/application/test_service_specification_create.py

+1 −1
Changes for tests/application/test_service_specification_create.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ async def test_create_links_capability_requirement_to_deployment_unit_ref() -> N 
    requirement = ServiceCapabilityRequirement(

        service_specification_id=service_specification_id,

        ref="compute-capability",

        capability_kind=CapabilityKind.DEPLOY_WORKLOAD,

        capability_kind=CapabilityKind.WORKLOAD,

        domain_kind=DomainKind.COMPUTE,

        parameters=_capability_parameters(),

    )

tests/integration/test_constraints.py

+1 −1
Changes for tests/integration/test_constraints.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ def _capability(domain_id: UUID, ref: str) -> Capability: 
        domain_id=domain_id,

        ref=ref,

        name="Capability",

        kind=CapabilityKind.DEPLOY_WORKLOAD,

        kind=CapabilityKind.WORKLOAD,

        state=CapabilityState.ACTIVE,

        metadata={},

        control_path_bindings=[],

tests/integration/test_postgres.py

+1 −1
Changes for tests/integration/test_postgres.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ def _service_specification() -> ServiceSpecification: 
                service_specification_id=specification_id,

                deployment_unit_id=None,

                ref="compute-capability",

                capability_kind=CapabilityKind.DEPLOY_WORKLOAD,

                capability_kind=CapabilityKind.WORKLOAD,

                domain_kind=DomainKind.COMPUTE,

                is_required=True,

                selector={"zone": "edge-a"},