Commit 849e3a08 authored by Andrea Sgambelluri's avatar Andrea Sgambelluri
Browse files

bugs fixing

parent 9bf79402

deploy/tfs.sh

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ for COMPONENT in $TFS_COMPONENTS; do 
    echo "Waiting for '$COMPONENT' component..."

    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")

    kubectl wait --namespace $TFS_K8S_NAMESPACE \

        --for='condition=available' --timeout=300s deployment/${COMPONENT_OBJNAME}service

        --for='condition=available' --timeout=90s deployment/${COMPONENT_OBJNAME}service

    printf "\n"

done

src/context/service/ContextServiceServicerImpl.py

+4 −4
Original line number Diff line number Diff line
@@ -44,7 +44,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.OpticalConfigOperator import (set_OpticalConfig,select_OpticalConfig,get_OpticalConfig)

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



LOGGER = logging.getLogger(__name__)
@@ -302,16 +302,16 @@ class ContextServiceServicerImpl(ContextServiceServicer, ContextPolicyServiceSer 
    @safe_and_metered_rpc_method(METRICS_POOL,LOGGER)

    def GetOpticalConfig(self,request:Empty,context:grpc.ServicerContext) -> OpticalConfigList:

  

        result =get_OpticalConfig(db_engine=self.db_engine)

        result =get_opticalconfig(db_engine=self.db_engine)

      

        return OpticalConfigList(OpticalConfigs=result)

    def SetOpticalConfig(self,request:OpticalConfig,context:grpc.ServicerContext)-> OpticalConfigId:

      

        OpticalConfig_id= set_OpticalConfig(db_engine=self.db_engine,request=request)

        OpticalConfig_id= set_opticalconfig(db_engine=self.db_engine,request=request)

  

        return OpticalConfigId(**OpticalConfig_id)

    def SelectOpticalConfig (self,request:OpticalConfigId,context:grpc.ServicerContext) -> OpticalConfig:

        result =select_OpticalConfig(db_engine=self.db_engine,request=request)

        result =select_opticalconfig(db_engine=self.db_engine,request=request)

        logging.info(f"FromSelectOpticalConfig {result}")

        myid =OpticalConfigId()

        myid.CopyFrom(result.OpticalConfig_id)

src/device/service/Tools.py

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ def get_edit_target (device:Device,is_opticalband:bool)-> str: 
        if device.device_type =='optical-roadm': return 'media-channel'

        else : return 'optical-channel'

        

def is_key_existed( key:str ,keys_dic=dict,key_name_to_use= None | str ) -> dict:

def is_key_existed( key:str ,keys_dic=dict,key_name_to_use= None ) -> dict:

    dic={}

    dic["resource_key"]=key    

    if key_name_to_use is not None: