Commit 180917c7 authored by Konstantinos Togias's avatar Konstantinos Togias
Browse files

Merge branch 'fix/rename-wrongly-named-field' into 'develop' 

fix: rename of appInstanceId field to appServerIp to correctly name what it is

See merge request !214
parents 022a29e6 f27cc855

src/openop_tfsdk/contract/adapters/network.py

+1 −2
Changes for src/openop_tfsdk/contract/adapters/network.py: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -169,8 +169,7 @@ def _traffic_influence( 
        raise ValidationError("traffic_influence needs notification_url in the control path")

    return {

        "appId": target.application_reference.external_app_id,

        # The old client takes the instance id as the application server IPv4.

        "appInstanceId": _address(target.application_server.ipv4),

        "appServerIp": _address(target.application_server.ipv4),

        "edgeCloudZoneId": request.target.zone_ref,

        "device": _device(target.device),

        "notificationUri": notification_url,

src/openop_tfsdk/network/core/base_network_client.py

+2 −4
Changes for src/openop_tfsdk/network/core/base_network_client.py: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -192,9 +192,7 @@ class BaseNetworkClient: 
        self.core_specific_traffic_influence_validation(traffic_influence_data)



        device_ip = traffic_influence_data.retrieve_ue_ipv4()

        server_ip = (

            traffic_influence_data.appInstanceId

        )  # assume that the instance id corresponds to its IPv4 address

        server_ip = traffic_influence_data.appServerIp

        sink_url = traffic_influence_data.notificationUri

        edge_zone = traffic_influence_data.edgeCloudZoneId
@@ -222,7 +220,7 @@ class BaseNetworkClient: 


        camara_ti = schemas.CreateTrafficInfluence(

            appId=traffic_influence_data.afAppId,

            appInstanceId=serverIp,

            appServerIp=serverIp,

            edgeCloudZoneId=edgeId,

            notificationUri=traffic_influence_data.notificationDestination,

            device=schemas.Device(

src/openop_tfsdk/network/core/schemas.py

+1 −1
Changes for src/openop_tfsdk/network/core/schemas.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ class CreateTrafficInfluence(BaseModel): 
    trafficInfluenceID: str | None = None

    apiConsumerId: str | None = None

    appId: str

    appInstanceId: str

    appServerIp: str

    edgeCloudRegion: str | None = None

    edgeCloudZoneId: str | None = None

    sourceTrafficFilters: SourceTrafficFilters | None = None

tests/network/test_create_traffic_influence.py

+3 −3
Changes for tests/network/test_create_traffic_influence.py: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ ti_session1 = { 
    "device": {"ipv4Address": {"publicAddress": "12.1.2.31", "privateAddress": "12.1.2.31"}},

    "edgeCloudZoneId": "edge",

    "appId": "testSdk-ffff-aaaa-c0ffe",

    "appInstanceId": "172.21.18.3",

    "appServerIp": "172.21.18.3",

    "notificationUri": "https://endpoint.example.com/sink",

}
@@ -20,7 +20,7 @@ ti_session1_put = { 
    "device": {"ipv4Address": {"publicAddress": "12.1.2.31", "privateAddress": "12.1.2.31"}},

    "edgeCloudZoneId": "edge2",

    "appId": "testSdk-ffff-aaaa-c0ffe",

    "appInstanceId": "172.21.18.3",

    "appServerIp": "172.21.18.3",

    "notificationUri": "https://endpoint.example.com/sink",

}
@@ -28,7 +28,7 @@ ti_session2 = { 
    "device": {"ipv4Address": {"publicAddress": "12.1.2.31", "privateAddress": "12.1.2.31"}},

    "edgeCloudZoneId": "edge",

    "appId": "testSdk-ffff-aaaa-c0ffe",

    "appInstanceId": "172.21.18.65",

    "appServerIp": "172.21.18.65",

    "notificationUri": "https://endpoint.example.com/sink",

}