Commit c05075fe authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Code Cleanup

parent c69030e5

src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ from common.tools.context_queries.Slice import get_slice 
from context.client.ContextClient import ContextClient

from slice.client.SliceClient import SliceClient

from .tools.Authentication import HTTP_AUTH

from .tools.ContextMethods import get_service, get_slice

from .tools.HttpStatusCodes import HTTP_GATEWAYTIMEOUT, HTTP_NOCONTENT, HTTP_OK, HTTP_SERVERERROR



LOGGER = logging.getLogger(__name__)

src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_SiteNetworkAccesses.py

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ from context.client.ContextClient import ContextClient 
from slice.client.SliceClient import SliceClient

from .schemas.site_network_access import SCHEMA_SITE_NETWORK_ACCESS

from .tools.Authentication import HTTP_AUTH

from .tools.ContextMethods import get_service, get_slice

from .tools.HttpStatusCodes import HTTP_NOCONTENT, HTTP_SERVERERROR

from .tools.Validator import validate_message

from .Constants import (

src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/ContextMethods.py

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
import grpc, logging

from typing import Optional

from common.Constants import DEFAULT_CONTEXT_UUID

from context.client.ContextClient import ContextClient

from context.proto.context_pb2 import Service, ServiceId, Slice, SliceId



LOGGER = logging.getLogger(__name__)



def get_service(

        context_client : ContextClient, service_uuid : str, context_uuid : str = DEFAULT_CONTEXT_UUID

    ) -> Optional[Service]:

    try:

        # pylint: disable=no-member

        service_id = ServiceId()

        service_id.context_id.context_uuid.uuid = context_uuid

        service_id.service_uuid.uuid = service_uuid

        service_readonly = context_client.GetService(service_id)

        service = Service()

        service.CopyFrom(service_readonly)

        return service

    except grpc.RpcError:

        #LOGGER.exception('Unable to get service({:s} / {:s})'.format(str(context_uuid), str(service_uuid)))

        return None



def get_slice(

        context_client : ContextClient, slice_uuid : str, context_uuid : str = DEFAULT_CONTEXT_UUID

    ) -> Optional[Slice]:

    try:

        # pylint: disable=no-member

        slice_id = SliceId()

        slice_id.context_id.context_uuid.uuid = context_uuid

        slice_id.slice_uuid.uuid = slice_uuid

        slice_readonly = context_client.GetSlice(slice_id)

        slice_ = Slice()

        slice_.CopyFrom(slice_readonly)

        return slice_

    except grpc.RpcError:

        #LOGGER.exception('Unable to get slice({:s} / {:s})'.format(str(context_uuid), str(slice_uuid)))

        return None