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

Optical component: 

- Pre-merge cleanup
parent 4ec7cd1c

proto/context.proto

+2 −2
Original line number Diff line number Diff line
@@ -211,8 +211,8 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_XR = 6;

  DEVICEDRIVER_IETF_L2VPN = 7;

  DEVICEDRIVER_GNMI_OPENCONFIG = 8;

  DEVICEDRIVER_IETF_ACTN = 9;

  DEVICEDRIVER_FLEXSCALE = 10;

  DEVICEDRIVER_FLEXSCALE = 9;

  DEVICEDRIVER_IETF_ACTN = 10;

  DEVICEDRIVER_OC = 11;

}

proto/openconfig_device.proto

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ syntax = "proto3"; 
package openconfig_device;



import "context.proto";

import "monitoring.proto";



service OpenConfigService {

  rpc AddOpenConfigDevice   (context.OpticalConfig) returns (context.OpticalConfigId) {}

src/context/service/ContextServiceServicerImpl.py

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ from .database.Slice import ( 
    slice_delete, slice_get, slice_list_ids, slice_list_objs, slice_select, slice_set, slice_unset)

from .database.Topology import (

    topology_delete, topology_get, topology_get_details, topology_list_ids, topology_list_objs, topology_set)

from .database.OpticalConfig import (set_opticalconfig,select_opticalconfig,get_opticalconfig)

from .database.OpticalConfig import set_opticalconfig, select_opticalconfig, get_opticalconfig



LOGGER = logging.getLogger(__name__)

src/device/service/DeviceService.py

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ class DeviceService(GenericGrpcService): 
        add_DeviceServiceServicer_to_server(self.device_servicer, self.server)

        add_OpenConfigServiceServicer_to_server(self.openconfig_device_servicer,self.server)





    def stop(self):

        super().stop()

        self.monitoring_loops.stop()

src/device/service/DeviceServiceServicerImpl.py

+10 −10
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ from common.Settings import ENVVAR_SUFIX_SERVICE_HOST, get_env_var_name 
from common.method_wrappers.Decorator import MetricTypeEnum, MetricsPool, safe_and_metered_rpc_method

from common.method_wrappers.ServiceExceptions import NotFoundException, OperationFailedException

from common.proto.context_pb2 import (

    Device, DeviceConfig, DeviceDriverEnum, DeviceId, DeviceOperationalStatusEnum, Empty, Link,OpticalConfig,OpticalConfigId)

    Device, DeviceConfig, DeviceDriverEnum, DeviceId, DeviceOperationalStatusEnum, Empty, Link,

    OpticalConfig, OpticalConfigId

)

from common.proto.device_pb2 import MonitoringSettings

from common.proto.device_pb2_grpc import DeviceServiceServicer

from common.tools.context_queries.Device import get_device
@@ -54,13 +56,12 @@ class DeviceServiceServicerImpl(DeviceServiceServicer): 


    @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)

    def AddDevice(self, request : Device, context : grpc.ServicerContext) -> DeviceId:

  

        t0 = time.time()



        device_uuid = request.device_id.device_uuid.uuid



        connection_config_rules = check_connect_rules(request.device_config)

        if (request.device_drivers[0]!= DeviceDriverEnum.DEVICEDRIVER_OC) :

        if request.device_drivers[0] != DeviceDriverEnum.DEVICEDRIVER_OC:

            check_no_endpoints(request.device_endpoints)



        t1 = time.time()
@@ -143,11 +144,10 @@ class DeviceServiceServicerImpl(DeviceServiceServicer): 
                device.device_operational_status = DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_ENABLED

           

            # temporary line 

            if (request.device_drivers[0]== DeviceDriverEnum.DEVICEDRIVER_OC and len(request.device_endpoints)>0):

             

                for endpoint in request.device_endpoints:

                    #endpoint.endpoint_id.device_id.CopyFrom(device.device_id)

                    pass

            if request.device_drivers[0] == DeviceDriverEnum.DEVICEDRIVER_OC and len(request.device_endpoints) > 0:

                #for endpoint in request.device_endpoints:

                #    #endpoint.endpoint_id.device_id.CopyFrom(device.device_id)

                #    pass

                device.device_endpoints.extend(request.device_endpoints)



            device_id = context_client.SetDevice(device)