Commit 7fc4cd83 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup and header updates

parent 41fbf497

src/common/tools/context_queries/OpticalConfig.py

+14 −3
Original line number Diff line number Diff line 
# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.





from common.method_wrappers.ServiceExceptions import InvalidArgumentsException

from typing import Optional, Union
@@ -34,8 +48,6 @@ def get_uuid_random() -> str: 
def channel_get_uuid(

    channel_name :str , allow_random : bool = False

) -> str:

    



    if len(channel_name) > 0:

        return get_uuid_from_string(channel_name)

    if allow_random: return get_uuid_random()
@@ -56,7 +68,6 @@ def device_get_uuid (device_name) : 
def opticalconfig_get_uuid(

    device_name : str = '', allow_random : bool = False

) -> str:

    

    if len(device_name) > 0:

        device_uuid= device_get_uuid(device_name=device_name)

        return get_uuid_from_string(f"{device_uuid}_opticalconfig")

src/context/service/database/OpticalLink.py

+1 −1
Original line number Diff line number Diff line 
# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

src/context/service/database/models/OpticalConfig/OpticalConfigModel.py

+1 −1
Original line number Diff line number Diff line 
# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

src/context/service/database/models/OpticalConfig/RoadmModel.py

+1 −1
Original line number Diff line number Diff line 


# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

src/context/service/database/models/OpticalConfig/TransponderModel.py

+1 −1
Original line number Diff line number Diff line 


# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.