Commit 70be713f authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 0a3559d4

src/context/Dockerfile

+0 −4
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ FROM python:3.13-slim 
RUN apt-get --yes --quiet --quiet update && \

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

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

# Copy local_pkcgs_resource/. /tmp/sources

# Workdir tmp/sources/

# Run dpkg -i wget_1.21.2-2ubuntu1.1_amd64.deb g++_4%3a11.2.0-1ubuntu1_amd64.deb git_1%3a2.34.1-1ubuntu1.11_amd64.deb

# RUN apt-get install -f -y && apt-get clean



# Set Python to show logs as they occur

ENV PYTHONUNBUFFERED=0

src/context/service/ContextServiceServicerImpl.py

+7 −6
Original line number Diff line number Diff line
@@ -21,16 +21,17 @@ from common.proto.context_pb2 import ( 
    Device, DeviceEvent, DeviceFilter, DeviceId, DeviceIdList, DeviceList,

    Empty, EndPointIdList, EndPointNameList,

    Link, LinkEvent, LinkId, LinkIdList, LinkList,

    Service, ServiceEvent, ServiceFilter, ServiceId, ServiceIdList, ServiceList,

    Service, ServiceConfigRule, ServiceEvent, ServiceFilter, ServiceId, ServiceIdList, ServiceList,

    Slice, SliceEvent, SliceFilter, SliceId, SliceIdList, SliceList,

    Topology, TopologyDetails, TopologyEvent, TopologyId, TopologyIdList, TopologyList,

    OpticalConfigList, OpticalConfigId, OpticalConfig, OpticalLink, OpticalLinkList,

    ServiceConfigRule,OpticalBand,OpticalBandId,OpticalBandList

    OpticalBand, OpticalBandId, OpticalBandList

)

from common.proto.policy_pb2 import PolicyRuleIdList, PolicyRuleId, PolicyRuleList, PolicyRule

from common.proto.context_pb2_grpc import ContextServiceServicer

from common.proto.context_policy_pb2_grpc import ContextPolicyServiceServicer

from common.method_wrappers.Decorator import MetricsPool, safe_and_metered_rpc_method

from .database.ConfigRule import delete_config_rule

from .database.Connection import (

    connection_delete, connection_get, connection_list_ids, connection_list_objs, connection_set

)
@@ -61,6 +62,9 @@ from .database.Topology import ( 
    topology_delete, topology_get, topology_get_details, topology_list_ids,

    topology_list_objs, topology_set

)

from .database.OpticalBand import (

    get_optical_band, set_optical_band, select_optical_band

)

from .database.OpticalConfig import (

    set_opticalconfig, select_opticalconfig, get_opticalconfig, delete_opticalconfig,

    update_opticalconfig, delete_opticalchannel
@@ -68,10 +72,7 @@ from .database.OpticalConfig import ( 
from .database.OpticalLink import (

    optical_link_delete, optical_link_get, optical_link_list_objs, optical_link_set

)

from .database.ConfigRule import delete_config_rule

from .database.OpticalBand import ( 

                                   get_optical_band,set_optical_band , select_optical_band

                                   )





LOGGER = logging.getLogger(__name__)

src/device/Dockerfile

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ RUN apt-get --yes --quiet --quiet update && \ 
# - Ref: https://github.com/CESNET/libyang-python/

RUN mkdir -p /var/libyang

RUN git clone https://github.com/CESNET/libyang.git /var/libyang

#COPY /var/libyang/. /var/libyang

WORKDIR /var/libyang

RUN git fetch

RUN git checkout v2.1.148

src/device/service/Tools.py

+4 −5
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ def _raw_config_rules_to_grpc( 
def populate_config_rules(device : Device, driver : _Driver) -> List[str]:

    device_uuid = device.device_id.device_uuid.uuid

    results_getconfig = driver.GetConfig()

    

    return _raw_config_rules_to_grpc(

        device_uuid, device.device_config, ERROR_GET, ConfigActionEnum.CONFIGACTION_SET, results_getconfig)

src/nbi/Dockerfile

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ RUN apt-get --yes --quiet --quiet update && \ 
# - Ref: https://github.com/CESNET/libyang-python/

RUN mkdir -p /var/libyang

RUN git clone https://github.com/CESNET/libyang.git /var/libyang

#COPY libyang/. /var/libyang

WORKDIR /var/libyang

RUN git fetch

RUN git checkout v2.1.148