Commit 55a4a200 authored by Shayan Hajipour's avatar Shayan Hajipour
Browse files

integration: IETF Slice api adaptation 

- dummy post /restconf/data endpoint added
- `ietf-nss` removed from ietf slice NBI path
parent 10ba696b

src/nbi/service/__main__.py

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ from .rest_server.nbi_plugins.ietf_network_slice import register_ietf_nss 
from .rest_server.nbi_plugins.ietf_acl import register_ietf_acl

from .rest_server.nbi_plugins.qkd_app import register_qkd_app

from .rest_server.nbi_plugins.tfs_api import register_tfs_api

from .rest_server.nbi_plugins import register_restconf

from .context_subscription import register_context_subscription



terminate = threading.Event()
@@ -79,6 +80,7 @@ def main(): 
    register_ietf_acl(rest_server)

    register_qkd_app(rest_server)

    register_tfs_api(rest_server)

    register_restconf(rest_server)

    rest_server.start()



    register_context_subscription()

src/nbi/service/rest_server/nbi_plugins/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -34,5 +34,5 @@ def _add_resource(rest_server: RestServer, resource: Resource, *urls, **kwargs): 
    rest_server.add_resource(resource, *urls, **kwargs)





def register_ietf_nss(rest_server: RestServer):

def register_restconf(rest_server: RestServer):

    _add_resource(rest_server, BaseServer, "")

src/nbi/service/rest_server/nbi_plugins/ietf_network_slice/__init__.py

+9 −9
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ from .NSS_Services_Connection_Groups import NSS_Service_Connection_Groups 
from .NSS_Services_SDP import NSS_Service_SDP

from .NSS_Services_SDPs import NSS_Service_SDPs



URL_PREFIX = "/restconf/data/ietf-network-slice-service:ietf-nss"

URL_PREFIX = "/restconf/data/ietf-network-slice-service"





def _add_resource(rest_server: RestServer, resource: Resource, *urls, **kwargs):
@@ -37,39 +37,39 @@ def _add_resource(rest_server: RestServer, resource: Resource, *urls, **kwargs): 




def register_ietf_nss(rest_server: RestServer):

    _add_resource(rest_server, NSS_Services, "/network-slice-services")

    _add_resource(rest_server, NSS_Services, ":network-slice-services")

    _add_resource(

        rest_server,

        NSS_Service,

        "/network-slice-services/slice-service=<string:slice_id>",

        ":network-slice-services/slice-service=<string:slice_id>",

    )

    _add_resource(

        rest_server,

        NSS_Service_SDPs,

        "/network-slice-services/slice-service=<string:slice_id>/sdps",

        ":network-slice-services/slice-service=<string:slice_id>/sdps",

    )

    _add_resource(

        rest_server,

        NSS_Service_SDP,

        "/network-slice-services/slice-service=<string:slice_id>/sdps/sdp=<string:sdp_id>",

        ":network-slice-services/slice-service=<string:slice_id>/sdps/sdp=<string:sdp_id>",

    )

    _add_resource(

        rest_server,

        NSS_Service_Connection_Groups,

        "/network-slice-services/slice-service=<string:slice_id>/connection-groups",

        ":network-slice-services/slice-service=<string:slice_id>/connection-groups",

    )

    _add_resource(

        rest_server,

        NSS_Service_Connection_Group,

        "/network-slice-services/slice-service=<string:slice_id>/connection-groups/connection-group=<string:connection_group_id>",

        ":network-slice-services/slice-service=<string:slice_id>/connection-groups/connection-group=<string:connection_group_id>",

    )

    _add_resource(

        rest_server,

        NSS_Service_Match_Criteria,

        "/network-slice-services/slice-service=<string:slice_id>/sdps/sdp=<string:sdp_id>/service-match-criteria",

        ":network-slice-services/slice-service=<string:slice_id>/sdps/sdp=<string:sdp_id>/service-match-criteria",

    )

    _add_resource(

        rest_server,

        NSS_Service_Match_Criterion,

        "/network-slice-services/slice-service=<string:slice_id>/sdps/sdp=<string:sdp_id>/service-match-criteria/match-criterion=<string:match_criterion_id>",

        ":network-slice-services/slice-service=<string:slice_id>/sdps/sdp=<string:sdp_id>/service-match-criteria/match-criterion=<string:match_criterion_id>",

    )