Commit 24acbcd7 authored by Carlos Manso's avatar Carlos Manso
Browse files

Merge branch... 

Merge branch 'feat/147-integrate-support-for-ip-e2e-optical-sdn-controllers-to-manage-hierarchical-virtual' of https://labs.etsi.org/rep/tfs/controller into feat/147-integrate-support-for-ip-e2e-optical-sdn-controllers-to-manage-hierarchical-virtual
parents acf8c193 fb67c199

src/tests/ecoc24/delete.sh

deleted100755 → 0
+0 −22
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (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.





# Delete old namespaces

kubectl delete namespace tfs-e2e tfs-ip



# Delete secondary ingress controllers

kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml

kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml

src/tests/ecoc24/deploy.sh

deleted100755 → 0
+0 −38
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (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.





# Delete old namespaces

kubectl delete namespace tfs-e2e tfs-ip



# Delete secondary ingress controllers

kubectl delete -f ./src/tests/ecoc24/nginx-ingress-controller-e2e.yaml

kubectl delete -f ./src/tests/ecoc24/nginx-ingress-controller-ip.yaml



# Create secondary ingress controllers

kubectl apply -f ./src/tests/ecoc24/nginx-ingress-controller-e2e.yaml

kubectl apply -f ./src/tests/ecoc24/nginx-ingress-controller-ip.yaml





# Deploy TFS for ip

source ./src/tests/ecoc24/deploy_specs_ip.sh

./deploy/all.sh

mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_ip.sh





# Deploy TFS for e2e

source ./src/tests/ecoc24/deploy_specs_e2e.sh

./deploy/all.sh

mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_e2e.sh

src/vnt_manager/client/VNTManagerClient.py

+2 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ from common.proto.vnt_manager_pb2_grpc import VNTManagerServiceStub 
from common.Settings import get_service_host, get_service_port_grpc

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

from common.tools.grpc.Tools import grpc_message_to_json

# from common.proto.e2eorchestrator_pb2 import E2EOrchestratorRequest, E2EOrchestratorReply

from common.proto.context_pb2 import (

    Link, LinkId, LinkIdList, LinkList,

)
@@ -64,9 +63,9 @@ class VNTManagerClient: 


    @RETRY_DECORATOR

    def VNTSubscript(self, request: VNTSubscriptionRequest) -> VNTSubscriptionReply:

        LOGGER.info("Subscript request: {:s}".format(str(grpc_message_to_json(request))))

        LOGGER.debug("Subscript request: {:s}".format(str(grpc_message_to_json(request))))

        response = self.stub.VNTSubscript(request)

        LOGGER.info("Subscript result: {:s}".format(str(grpc_message_to_json(response))))

        LOGGER.debug("Subscript result: {:s}".format(str(grpc_message_to_json(response))))

        return response



    @RETRY_DECORATOR

manifests/ztpservice.yaml

+19 −19

File changed.

Contains only whitespace changes.

src/nbi/service/rest_server/nbi_plugins/tfs_api/__init__.py

+25 −25

File changed.

Contains only whitespace changes.