Commit 528c3cec authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

NBI Component - SSE Telemetry Connector: 

- Removed unused/wrong database/model fields
parent 80115f01

src/nbi/service/sse_telemetry/create_subscription.py

+0 −4
Original line number Diff line number Diff line
@@ -143,10 +143,8 @@ class CreateSubscription(Resource): 
                identifier=r.identifier,

                uri=r.uri,

                xpath=xpath_filter,

                status=True,

                main_subscription=False,

                main_subscription_id=request_identifier,

                details=None,

            )

            _ = set_subscription(db, s)
@@ -159,10 +157,8 @@ class CreateSubscription(Resource): 
            xpath=request_data['ietf-subscribed-notifications:input'][

                'ietf-yang-push:datastore-xpath-filter'

            ],

            status=True,

            main_subscription=True,

            main_subscription_id=None,

            details=None,

        )

        _ = set_subscription(db, s)

src/nbi/service/sse_telemetry/database/Subscription.py

+0 −10
Original line number Diff line number Diff line
@@ -30,10 +30,8 @@ class SSESubsciprionDict(TypedDict): 
    identifier: str

    uri: str

    xpath: str

    status: bool

    main_subscription: bool

    main_subscription_id: Optional[str]

    details: Optional[dict[str, Any]]





def set_subscription(db_engine: Engine, request: SSESubsciprionDict) -> None:
@@ -46,10 +44,8 @@ def set_subscription(db_engine: Engine, request: SSESubsciprionDict) -> None: 
                identifier=stmt.excluded.identifier,

                uri=stmt.excluded.uri,

                xpath=stmt.excluded.xpath,

                status=stmt.excluded.status,

                main_subscription=stmt.excluded.main_subscription,

                main_subscription_id=stmt.excluded.main_subscription_id,

                details=stmt.excluded.details,

            ),

        )

        stmt = stmt.returning(SSESubscriptionModel)
@@ -86,10 +82,8 @@ def get_main_subscription(db_engine: Engine, request: str) -> Optional[SSESubsci 
                identifier=obj.identifier,

                uri=obj.uri,

                xpath=obj.xpath,

                status=obj.status,

                main_subscription=obj.main_subscription,

                main_subscription_id=obj.main_subscription_id,

                details=obj.details,

            )

        )
@@ -109,10 +103,8 @@ def get_sub_subscription(db_engine: Engine, request: str) -> List[SSESubsciprion 
                identifier=o.identifier,

                uri=o.uri,

                xpath=o.xpath,

                status=o.status,

                main_subscription=o.main_subscription,

                main_subscription_id=o.main_subscription_id,

                details=o.details,

            )

            for o in obj

        ]
@@ -129,10 +121,8 @@ def get_subscriptions(db_engine: Engine) -> List[SSESubsciprionDict]: 
                identifier=obj.identifier,

                uri=obj.uri,

                xpath=obj.xpath,

                status=obj.status,

                main_subscription=obj.main_subscription,

                main_subscription_id=obj.main_subscription_id,

                details=obj.details,

            )

            for obj in obj_list

        ]

src/nbi/service/sse_telemetry/database/models/Subscription.py

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ class SSESubscriptionModel(_Base): 
    identifier = Column(String, nullable=False, unique=False)

    uri = Column(String, nullable=False, unique=False)

    xpath = Column(String, nullable=False, unique=False)

    status = Column(Boolean, default=False)

    main_subscription = Column(Boolean, default=False)

    main_subscription_id = Column(String, nullable=True)