Commit 1315c336 authored by George Papathanail's avatar George Papathanail Committed by Dimitrios Gogos
Browse files

fix: rename resource_zone_id/network_domain_id to zone_id/domain_id in... 

fix: rename resource_zone_id/network_domain_id to zone_id/domain_id in TrafficInfluence activate command
parent b0cab96e

src/open_exposure_gateway/application/mappers/traffic_influence_mapper.py

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ def build_activate_command( 
    requested_at: str,

    service_specification_id: UUID,

    app_provider_id: str,

    resource_zone_id: str | None,

    zone_id: str | None,

) -> SRMNetworkCapabilityActivateCommand:

    source_filter = request.sourceTrafficFilters

    destination_filter = request.destinationTrafficFilters
@@ -38,7 +38,7 @@ def build_activate_command( 
        requested_at=requested_at,

        app_provider_id=app_provider_id,

        service_specification_id=str(service_specification_id),

        resource_zone_id=resource_zone_id,

        zone_id=zone_id,

        network_capability=NetworkCapabilityPayload(

            target=target,

            parameters=NetworkCapabilityParameters(

src/open_exposure_gateway/application/services/traffic_influence_service.py

+3 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ class TrafficInfluenceService: 
        except Exception as exc:

            raise DownstreamServiceException(error_msg) from exc



    async def _resolve_resource_zone_id(

    async def _resolve_zone_id(

        self,

        request: PostTrafficInfluence,

        x_correlator: Optional[str],
@@ -154,7 +154,7 @@ class TrafficInfluenceService: 
        # edgeCloudRegion has no SRM field of its own (srm/canonical-parameters-schema.md

        # has no "region" concept); it's resolved locally to a zone before the command

        # is built, same zones lookup EAM already uses.

        resource_zone_id = await self._resolve_resource_zone_id(request, x_correlator)

        zone_id = await self._resolve_zone_id(request, x_correlator)



        command = build_activate_command(

            request=request,
@@ -166,7 +166,7 @@ class TrafficInfluenceService: 
            # throwaway id because its sessions aren't tied to an onboarded catalog entry.

            service_specification_id=request.appId,

            app_provider_id=app_provider_id,

            resource_zone_id=resource_zone_id,

            zone_id=zone_id,

        )



        operation = Operation(

src/open_exposure_gateway/domain/traffic_influence.py

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ class SRMNetworkCapabilityActivateCommand(BaseModel): 
    app_provider_id: str

    source: str = "nbi_camara"

    service_specification_id: str

    resource_zone_id: str | None = None

    network_domain_id: str | None = None

    zone_id: str | None = None

    domain_id: str | None = None

    network_capability: NetworkCapabilityPayload

tests/unit/test_traffic_influence_flows.py

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ class TestTrafficInfluenceCreateFlow: 
        assert source.port == 45678

        assert destination.port == 443

        assert destination.protocol == "TCP"

        assert command.resource_zone_id == TI_BODY["edgeCloudZoneId"]

        assert command.zone_id == TI_BODY["edgeCloudZoneId"]

        assert command.service_specification_id == TI_BODY["appId"]

        assert command.source == "nbi_camara"