Merge branch 'feat/302-add-test-to-featuve-develop-during-232' into 'develop' (685bdd9e) · Commits · TFS / controller

.gitlab-ci.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ include:
		- local: '/src/qos_profile/.gitlab-ci.yml'
		- local: '/src/vnt_manager/.gitlab-ci.yml'
		- local: '/src/e2e_orchestrator/.gitlab-ci.yml'
		- local: '/src/ztp_server/.gitlab-ci.yml'

		# This should be last one: end-to-end integration tests
		- local: '/src/tests/.gitlab-ci.yml'

src/ztp_server/.gitlab-ci.yml

0 → 100644

+100 −0

Original line number	Diff line number	Diff line
		# 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.

		# Build, tag, and push the Docker image to the GitLab Docker registry
		build ztp_server:
		variables:
		IMAGE_NAME: 'ztp_server' # name of the microservice
		IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
		stage: build
		before_script:
		- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
		script:
		- docker buildx build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile .
		- docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
		- docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
		after_script:
		- docker images --filter="dangling=true" --quiet \| xargs -r docker rmi
		rules:
		- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" \|\| $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
		- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'
		- changes:
		- src/common/*/.py
		- proto/*.proto
		- src/$IMAGE_NAME/*/.{py,in,yml}
		- src/$IMAGE_NAME/Dockerfile
		- src/$IMAGE_NAME/tests/*.py
		- manifests/${IMAGE_NAME}service.yaml
		- .gitlab-ci.yml

		# Apply unit test to the component
		unit_test ztp_server:
		variables:
		IMAGE_NAME: 'ztp_server' # name of the microservice
		IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
		stage: unit_test
		needs:
		- build ztp_server
		before_script:
		- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
		- docker ps -aq \| xargs -r docker rm -f
		- >
		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
		- docker container prune -f
		script:
		- docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
		- docker images --filter="dangling=true" --quiet \| xargs -r docker rmi
		- >
		docker run --name $IMAGE_NAME -d -v "$PWD/src/$IMAGE_NAME/tests:/opt/results"
		--network=teraflowbridge
		--env LOG_LEVEL=DEBUG
		--env FLASK_ENV=development
		$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG
		- while ! docker logs $IMAGE_NAME 2>&1 \| grep -q 'Configured Resources:'; do sleep 1; done
		- sleep 5 # Give extra time to container to get ready
		- docker ps -a
		- docker logs $IMAGE_NAME
		- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_core.py --junitxml=/opt/results/${IMAGE_NAME}_report_core.xml"
		- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report_unitary.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:
		- docker logs $IMAGE_NAME
		- docker rm -f $IMAGE_NAME
		- docker network rm teraflowbridge
		rules:
		- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" \|\| $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
		- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'
		- changes:
		- src/common/*/.py
		- proto/*.proto
		- src/$IMAGE_NAME/*/.{py,in,yml}
		- src/$IMAGE_NAME/Dockerfile
		- src/$IMAGE_NAME/tests/*.py
		- manifests/${IMAGE_NAME}service.yaml
		- .gitlab-ci.yml
		artifacts:
		when: always
		reports:
		junit: src/$IMAGE_NAME/tests/${IMAGE_NAME}_report_*.xml

src/ztp_server/requirements.in

+0 −7

Original line number	Diff line number	Diff line
		@@ -12,17 +12,10 @@
		# See the License for the specific language governing permissions and
		# limitations under the License.

		deepdiff==6.7.*
		deepmerge==1.1.*
		Flask==2.1.3
		Flask-HTTPAuth==4.5.0
		Flask-RESTful==0.3.9
		jsonschema==4.4.0
		libyang==2.8.4
		netaddr==0.9.0
		pyang==2.6.0
		git+https://github.com/robshakir/pyangbind.git
		pydantic==2.6.3
		requests==2.27.1
		werkzeug==2.3.7
		websockets==12.0

src/ztp_server/service/ZtpServerServiceServicerImpl.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,9 +28,9 @@ class ZtpServerServiceServicerImpl(ZtpServerServiceServicer):
		LOGGER.info('Servicer Created')

		@safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
		def GetZtpProvisioning(self, request : ProvisioningScriptName, context : grpc.ServicerContext) -> ProvisioningScript:
		def GetProvisioningScript(self, request : ProvisioningScriptName, context : grpc.ServicerContext) -> ProvisioningScript:
		try:
		provisioningPath = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', 'data', request.scriptname)
		provisioningPath = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'data', request.scriptname)
		with open(provisioningPath, 'r') as provisioning_file:
		provisioning_content = provisioning_file.read()
		return ProvisioningScript(script=provisioning_content)

src/ztp_server/service/rest_server/ztpServer_plugins/ztp_provisioning_api/Resources.py

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,5 +33,4 @@ class config(_Resource):
		@HTTP_AUTH.login_required
		def get(self, config_db : str):
		content = returnConfigFile(config_db)

		return content