Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into cnit_related_activity (ecd3cd08) · Commits · TFS / controller

.gitlab-ci.yml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -52,6 +52,8 @@ include:
	- local: '/src/telemetry/.gitlab-ci.yml'		- local: '/src/telemetry/.gitlab-ci.yml'
	- local: '/src/analytics/.gitlab-ci.yml'		- local: '/src/analytics/.gitlab-ci.yml'
	- local: '/src/qos_profile/.gitlab-ci.yml'		- local: '/src/qos_profile/.gitlab-ci.yml'
			- local: '/src/vnt_manager/.gitlab-ci.yml'
			- local: '/src/e2e_orchestrator/.gitlab-ci.yml'

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

ecoc24

0 → 120000

+1 −0

Original line number	Original line	Diff line number	Diff line
			src/tests/ecoc24/
			No newline at end of file

manifests/e2e_orchestratorservice.yaml

+16 −22

Original line number	Original line	Diff line number	Diff line
	@@ -20,8 +20,12 @@ spec:
	selector:		selector:
	matchLabels:		matchLabels:
	app: e2e-orchestratorservice		app: e2e-orchestratorservice
			replicas: 1
	template:		template:
	metadata:		metadata:
			annotations:
			config.linkerd.io/skip-outbound-ports: "8761"
			config.linkerd.io/skip-inbound-ports: "8761"
	labels:		labels:
	app: e2e-orchestratorservice		app: e2e-orchestratorservice
	spec:		spec:
	@@ -33,9 +37,18 @@ spec:
	ports:		ports:
	- containerPort: 10050		- containerPort: 10050
	- containerPort: 9192		- containerPort: 9192
			- containerPort: 8761
	env:		env:
	- name: LOG_LEVEL		- name: LOG_LEVEL
	value: "INFO"		value: "INFO"
			- name: WS_IP_HOST
			value: "nbiservice.tfs-ip.svc.cluster.local"
			- name: WS_IP_PORT
			value: "8761"
			- name: WS_E2E_HOST
			value: "e2e-orchestratorservice.tfs-e2e.svc.cluster.local"
			- name: WS_E2E_PORT
			value: "8762"
	readinessProbe:		readinessProbe:
	exec:		exec:
	command: ["/bin/grpc_health_probe", "-addr=:10050"]		command: ["/bin/grpc_health_probe", "-addr=:10050"]
	@@ -67,25 +80,6 @@ spec:
	- name: metrics		- name: metrics
	port: 9192		port: 9192
	targetPort: 9192		targetPort: 9192
	---		- name: ws
	apiVersion: autoscaling/v2		port: 8761
	kind: HorizontalPodAutoscaler		targetPort: 8761
	metadata:
	name: e2e-orchestratorservice-hpa
	spec:
	scaleTargetRef:
	apiVersion: apps/v1
	kind: Deployment
	name: e2e-orchestratorservice
	minReplicas: 1
	maxReplicas: 20
	metrics:
	- type: Resource
	resource:
	name: cpu
	target:
	type: Utilization
	averageUtilization: 80
	#behavior:
	# scaleDown:
	# stabilizationWindowSeconds: 30

manifests/nbiservice.yaml

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,9 @@ spec:
	replicas: 1		replicas: 1
	template:		template:
	metadata:		metadata:
			annotations:
			config.linkerd.io/skip-inbound-ports: "8762"
			config.linkerd.io/skip-outbound-ports: "8762"
	labels:		labels:
	app: nbiservice		app: nbiservice
	spec:		spec:
	@@ -35,11 +38,14 @@ spec:
	- containerPort: 8080		- containerPort: 8080
	- containerPort: 9090		- containerPort: 9090
	- containerPort: 9192		- containerPort: 9192
			- containerPort: 8762
	env:		env:
	- name: LOG_LEVEL		- name: LOG_LEVEL
	value: "INFO"		value: "INFO"
	- name: IETF_NETWORK_RENDERER		- name: IETF_NETWORK_RENDERER
	value: "LIBYANG"		value: "LIBYANG"
			- name: WS_E2E_PORT
			value: "8762"
	readinessProbe:		readinessProbe:
	exec:		exec:
	command: ["/bin/grpc_health_probe", "-addr=:9090"]		command: ["/bin/grpc_health_probe", "-addr=:9090"]
	@@ -77,3 +83,7 @@ spec:
	protocol: TCP		protocol: TCP
	port: 9192		port: 9192
	targetPort: 9192		targetPort: 9192
			- name: ws
			protocol: TCP
			port: 8762
			targetPort: 8762

manifests/vnt_managerservice.yaml

0 → 100644

+77 −0

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

			apiVersion: apps/v1
			kind: Deployment
			metadata:
			name: vnt-managerservice
			spec:
			selector:
			matchLabels:
			app: vnt-managerservice
			replicas: 1
			template:
			metadata:
			annotations:
			config.linkerd.io/skip-outbound-ports: "8765"
			config.linkerd.io/skip-inbound-ports: "8765"
			labels:
			app: vnt-managerservice
			spec:
			terminationGracePeriodSeconds: 5
			containers:
			- name: server
			image: labs.etsi.org:5050/tfs/controller/vnt_manager:latest
			imagePullPolicy: Always
			ports:
			- containerPort: 10080
			- containerPort: 9192
			env:
			- name: LOG_LEVEL
			value: "INFO"
			- name: WS_IP_PORT
			value: "8761"
			- name: WS_E2E_PORT
			value: "8762"
			readinessProbe:
			exec:
			command: ["/bin/grpc_health_probe", "-addr=:10080"]
			livenessProbe:
			exec:
			command: ["/bin/grpc_health_probe", "-addr=:10080"]
			resources:
			requests:
			cpu: 250m
			memory: 128Mi
			limits:
			cpu: 1000m
			memory: 1024Mi
			---
			apiVersion: v1
			kind: Service
			metadata:
			name: vnt-managerservice
			labels:
			app: vnt-managerservice
			spec:
			type: ClusterIP
			selector:
			app: vnt-managerservice
			ports:
			- name: grpc
			port: 10080
			targetPort: 10080
			- name: metrics
			port: 9192
			targetPort: 9192