Merge branch... (711dbff3) · Commits · TFS / controller

scripts/run_tests_locally-nbi-all.sh

0 → 100755

+29 −0

Original line number	Diff line number	Diff line
		#!/bin/bash
		# Copyright 2022-2023 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.


		PROJECTDIR=`pwd`

		cd $PROJECTDIR/src
		RCFILE=$PROJECTDIR/coverage/.coveragerc

		# Run unitary tests and analyze coverage of code at same time
		# helpful pytest flags: --log-level=INFO -o log_cli=true --verbose --maxfail=1 --durations=0

		coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
		nbi/tests/test_ietf_l2vpn.py

		coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
		nbi/tests/test_ietf_network.py

scripts/run_tests_locally-nbi.sh→scripts/run_tests_locally-nbi-ietf-l2vpn.sh

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,5 +20,6 @@ cd $PROJECTDIR/src
		RCFILE=$PROJECTDIR/coverage/.coveragerc

		# Run unitary tests and analyze coverage of code at same time
		# helpful pytest flags: --log-level=INFO -o log_cli=true --verbose --maxfail=1 --durations=0
		coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
		nbi/tests/test_unitary.py
		nbi/tests/test_ietf_l2vpn.py

src/common/tests/MockServicerImpl_Context.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -430,7 +430,7 @@ class MockServicerImpl_Context(ContextServiceServicer):

		def RemoveSlice(self, request: SliceId, context : grpc.ServicerContext) -> Empty:
		LOGGER.debug('[RemoveSlice] request={:s}'.format(grpc_message_to_json_string(request)))
		context_uuid = str(request.slice_id.context_id.context_uuid.uuid)
		context_uuid = str(request.context_id.context_uuid.uuid)
		container_name = 'slice[{:s}]'.format(context_uuid)
		slice_uuid = request.slice_uuid.uuid
		reply = self._del(request, container_name, slice_uuid, 'slice_id', TOPIC_SLICE, context)
		@@ -522,7 +522,7 @@ class MockServicerImpl_Context(ContextServiceServicer):

		def RemoveService(self, request: ServiceId, context : grpc.ServicerContext) -> Empty:
		LOGGER.debug('[RemoveService] request={:s}'.format(grpc_message_to_json_string(request)))
		context_uuid = str(request.service_id.context_id.context_uuid.uuid)
		context_uuid = str(request.context_id.context_uuid.uuid)
		container_name = 'service[{:s}]'.format(context_uuid)
		service_uuid = request.service_uuid.uuid
		reply = self._del(request, container_name, service_uuid, 'service_id', TOPIC_SERVICE, context)

src/nbi/.gitlab-ci.yml

+15 −4

Original line number	Diff line number	Diff line
		@@ -48,15 +48,26 @@ unit_test nbi:
		- build nbi
		before_script:
		- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
		- if docker network list \| grep teraflowbridge; then echo "teraflowbridge is already created"; else docker network create -d bridge teraflowbridge; fi
		- if docker container ls \| grep $IMAGE_NAME; then docker rm -f $IMAGE_NAME; else echo "$IMAGE_NAME image is not in the system"; fi
		- >
		if docker network list \| grep teraflowbridge; then
		echo "teraflowbridge is already created";
		else
		docker network create -d bridge teraflowbridge;
		fi
		- >
		if docker container ls \| grep $IMAGE_NAME; then
		docker rm -f $IMAGE_NAME;
		else
		echo "$IMAGE_NAME image is not in the system";
		fi
		script:
		- docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
		- docker run --name $IMAGE_NAME -d -p 9090:9090 -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG
		- sleep 5
		- docker ps -a
		- docker logs $IMAGE_NAME
		- docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py $IMAGE_NAME/tests/test_ietf_network.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml"
		- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_ietf_l2vpn.py --junitxml=/opt/results/${IMAGE_NAME}_report_ietf_l2vpn.xml"
		- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_ietf_network.py --junitxml=/opt/results/${IMAGE_NAME}_report_ietf_network.xml"
		- docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"
		coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
		after_script:
		@@ -77,7 +88,7 @@ unit_test nbi:
		artifacts:
		when: always
		reports:
		junit: src/$IMAGE_NAME/tests/${IMAGE_NAME}_report.xml
		junit: src/$IMAGE_NAME/tests/${IMAGE_NAME}_report_*.xml

		## Deployment of the service in Kubernetes Cluster
		#deploy nbi:

src/nbi/requirements.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ Flask==2.1.3
		Flask-HTTPAuth==4.5.0
		Flask-RESTful==0.3.9
		jsonschema==4.4.0
		pyang
		pyang==2.6.0
		git+https://github.com/robshakir/pyangbind.git
		requests==2.27.1
		werkzeug==2.3.7