Commit 943d7eb3 authored by Mohamad Rahhal's avatar Mohamad Rahhal
Browse files

Merge branch 'feat/143-cttc-logical-resources-component' of... 

Merge branch 'feat/143-cttc-logical-resources-component' of https://labs.etsi.org/rep/tfs/controller into feat/390-cttc-integration-of-spine-leaf-fabric-management
parents 93e6fbd5 803a6064

scripts/show_logs_logical_resources.sh

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2022-2025 ETSI 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.



########################################################################################################################

# Define your deployment settings here

########################################################################################################################



# If not already set, set the name of the Kubernetes namespace to deploy to.

export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}



########################################################################################################################

# Automated steps start here

########################################################################################################################



kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/logical-resourcesservice -c server

src/common/tools/descriptor/Loader.py

+1 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ from spine_leaf.client.SpineLeafClient import SpineLeafClient 
from service.client.ServiceClient import ServiceClient

from slice.client.SliceClient import SliceClient

from vnt_manager.client.VNTManagerClient import VNTManagerClient

from common.tools.context_queries.Slice import get_uuid_from_string

from .Tools import (

    format_device_custom_config_rules, format_service_custom_config_rules,

    format_slice_custom_config_rules, get_descriptors_add_contexts,
@@ -472,7 +473,6 @@ class DescriptorLoader: 
        if len(self.__logical_resources) == 0:

            return

        

        from service.service.tools.object_uuid import get_uuid_from_string



        num_ok, error_list = 0, []

        for fabric in self.__logical_resources: