Commit 78afa02c authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Device component - IETF L3VPN/Slice and NCE Drivers: 

- Fixed format of delete-subscription requests
- Fixed return types from establish-subscription requests
parent eef3210d

src/device/service/DeviceServiceServicerImpl.py

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ class DeviceServiceServicerImpl(DeviceServiceServicer): 
                    'SSETelemetrySubscribe', extra_details='Driver returned an unexpected number of responses: {:d}'.format(len(r))

                )

            sub_conf: dict = r[0]

            return SSEMonitoringSubscriptionResponse(identifier=str(sub_conf['identifier']), uri=sub_conf['uri'])

            return SSEMonitoringSubscriptionResponse(identifier=str(sub_conf['id']), uri=sub_conf['uri'])



        if config_type == SSEMonitoringSubscriptionConfig.Unsubscribe:

            r = driver.UnsubscribeState([(str(request.identifier), 0, 0)])

src/device/service/drivers/ietf_l3vpn/IetfL3VpnDriver.py

+2 −2
Original line number Diff line number Diff line
@@ -265,8 +265,8 @@ class IetfL3VpnDriver(_Driver): 
        s = subscriptions[0]

        identifier = s[0]

        s_data : UnsubscribedNotificationsSchema = {

            'delete-subscription': {

                'identifier': int(identifier),

            'ietf-subscribed-notifications:input': {

                'id': int(identifier),

            }

        }

        self._handler_subscription.unsubscribe(s_data)

src/device/service/drivers/ietf_l3vpn/handlers/SubscriptionHandler.py

+2 −2
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ SubscribedNotificationsSchema = TypedDict( 
    'SubscribedNotificationsSchema', {'ietf-subscribed-notifications:input': Input}

)



SubscriptionSchema = TypedDict('SubscriptionSchema', {'identifier': str})

SubscriptionSchema = TypedDict('SubscriptionSchema', {'id': str})



UnsubscribedNotificationsSchema = TypedDict(

    'UnsubscribedNotificationsSchema', {'delete-subscription': SubscriptionSchema}

    'UnsubscribedNotificationsSchema', {'ietf-subscribed-notifications:input': SubscriptionSchema}

)

src/device/service/drivers/ietf_slice/IetfSliceDriver.py

+2 −2
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ class IetfSliceDriver(_Driver): 
        s = subscriptions[0]

        identifier = s[0]

        s_data : UnsubscribedNotificationsSchema = {

            'delete-subscription': {

                'identifier': int(identifier),

            'ietf-subscribed-notifications:input': {

                'id': int(identifier),

            }

        }

        self._handler_subscription.unsubscribe(s_data)

src/device/service/drivers/ietf_slice/handlers/SubscriptionHandler.py

+2 −2
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ SubscribedNotificationsSchema = TypedDict( 
    'SubscribedNotificationsSchema', {'ietf-subscribed-notifications:input': Input}

)



SubscriptionSchema = TypedDict('SubscriptionSchema', {'identifier': str})

SubscriptionSchema = TypedDict('SubscriptionSchema', {'id': str})



UnsubscribedNotificationsSchema = TypedDict(

    'UnsubscribedNotificationsSchema', {'delete-subscription': SubscriptionSchema}

    'UnsubscribedNotificationsSchema', {'ietf-subscribed-notifications:input': SubscriptionSchema}

)