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

Pre-merge code cleanup

parent 88136684

src/context/Dockerfile

+2 −6
Original line number Diff line number Diff line
@@ -15,12 +15,8 @@ 
FROM python:3.9-slim



# Install dependencies

# RUN apt-get --yes --quiet --quiet update && \

#     apt-get --yes --quiet --quiet install wget g++ git && \

#     rm -rf /var/lib/apt/lists/*



RUN apt-get --yes  update && \

    apt-get --yes   install wget g++ git && \

RUN apt-get --yes --quiet --quiet update && \

    apt-get --yes --quiet --quiet install wget g++ git && \

    rm -rf /var/lib/apt/lists/*



# Set Python to show logs as they occur

src/device/client/DeviceClient.py

+11 −8
Original line number Diff line number Diff line
@@ -15,12 +15,16 @@ 
import grpc, logging

from common.Constants import ServiceNameEnum

from common.Settings import get_service_host, get_service_port_grpc

from common.proto.context_pb2 import Device, DeviceConfig, DeviceId, Empty,OpticalConfig,OpticalConfigId ,OpticalConfigList

from common.proto.context_pb2 import (

    Device, DeviceConfig, DeviceId, Empty,

    OpticalConfig, OpticalConfigId, OpticalConfigList

)

from common.proto.device_pb2 import MonitoringSettings

from common.proto.device_pb2_grpc import DeviceServiceStub

from common.proto.optical_device_pb2_grpc import OpenConfigServiceStub

from common.tools.client.RetryDecorator import retry, delay_exponential

from common.tools.grpc.Tools import grpc_message_to_json_string

from common.proto.optical_device_pb2_grpc import OpenConfigServiceStub



LOGGER = logging.getLogger(__name__)

MAX_RETRIES = 15

DELAY_FUNCTION = delay_exponential(initial=0.01, increment=2.0, maximum=5.0)
@@ -47,6 +51,7 @@ class DeviceClient: 
        if self.channel is not None: self.channel.close()

        self.channel = None

        self.stub = None

        self.openconfig_stub = None



    @RETRY_DECORATOR

    def AddDevice(self, request : Device) -> DeviceId:
@@ -100,5 +105,3 @@ class DeviceClient: 
        response = self.openconfig_stub.DisableOpticalDevice(request)

        LOGGER.debug('DisableOpticalDevice result: {:s}'.format(grpc_message_to_json_string(response)))

        return response

src/device/service/drivers/oc_driver/OCDriver.py

+0 −2
Original line number Diff line number Diff line
@@ -353,5 +353,3 @@ class OCDriver(_Driver): 
            else:

                results = edit_config(self.__netconf_handler, self.__logger, resources, delete=True,conditions=conditions)

        return results

src/device/service/drivers/oc_driver/templates/Interfaces/interfaces.py

+3 −5
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


from yattag import Doc, indent

import logging



def interface_template (interface_data:dict) :

    data={"name":"eth0","ip":"192.168.1.1","prefix-length":'24'}

    doc, tag, text = Doc().tagtext()
@@ -37,7 +38,4 @@ def interface_template (interface_data:dict) : 
                indentation = ' '*2,

                newline = '\r\n'

            )        



    return result
 
                    

                    
 No newline at end of file

src/device/service/drivers/oc_driver/templates/Tools.py

+0 −4
Original line number Diff line number Diff line
@@ -492,7 +492,3 @@ def extract_openroadm_info(xml_data:str): 
            if (clli is not None):

                roadm_info['clli']=clli.text

    return roadm_info