Merge branch 'develop' into feat/110-cttc-incorrect-endpoint-lookup-in-nbi-etsi-bwm-plugin (647b5729) · Commits · TFS / controller

.gitlab-ci.yml

+3 −2

Original line number	Diff line number	Diff line
		@@ -39,8 +39,9 @@ include:
		#- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'
		#- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'
		#- local: '/src/l3_attackmitigator/.gitlab-ci.yml'
		#- local: '/src/slice/.gitlab-ci.yml'
		- local: '/src/slice/.gitlab-ci.yml'
		#- local: '/src/interdomain/.gitlab-ci.yml'
		- local: '/src/pathcomp/.gitlab-ci.yml'
		#- local: '/src/dlt/.gitlab-ci.yml'
		- local: '/src/load_generator/.gitlab-ci.yml'
		- local: '/src/bgpls_speaker/.gitlab-ci.yml'

deploy/tfs.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -364,7 +364,7 @@ for COMPONENT in $TFS_COMPONENTS; do
		echo "Waiting for '$COMPONENT' component..."
		COMPONENT_OBJNAME=$(echo "${COMPONENT}" \| sed "s/\_/-/")
		kubectl wait --namespace $TFS_K8S_NAMESPACE \
		--for='condition=available' --timeout=300s deployment/${COMPONENT_OBJNAME}service
		--for='condition=available' --timeout=90s deployment/${COMPONENT_OBJNAME}service
		printf "\n"
		done

manifests/bgpls_speakerservice.yaml

0 → 100644

+72 −0

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

		apiVersion: apps/v1
		kind: Deployment
		metadata:
		name: bgpls-speakerservice
		spec:
		selector:
		matchLabels:
		app: bgpls-speakerservice
		replicas: 1
		template:
		metadata:
		labels:
		app: bgpls-speakerservice
		spec:
		terminationGracePeriodSeconds: 5
		containers:
		- name: server
		image: localhost:32000/tfs/bgpls_speaker:dev
		imagePullPolicy: Always
		ports:
		- containerPort: 20030
		- containerPort: 9192
		env:
		- name: LOG_LEVEL
		value: "INFO"
		readinessProbe:
		exec:
		command: ["/bin/grpc_health_probe", "-addr=:20030"]
		livenessProbe:
		exec:
		command: ["/bin/grpc_health_probe", "-addr=:20030"]
		resources:
		requests:
		cpu: 250m
		memory: 128Mi
		limits:
		cpu: 1000m
		memory: 1024Mi
		---
		apiVersion: v1
		kind: Service
		metadata:
		name: bgpls-speakerservice
		labels:
		app: bgpls-speakerservice
		spec:
		type: ClusterIP
		selector:
		app: bgpls-speakerservice
		ports:
		- name: grpc
		protocol: TCP
		port: 20030
		targetPort: 20030
		- name: metrics
		protocol: TCP
		port: 9192
		targetPort: 9192

manifests/opticalcontrollerservice.yaml

0 → 100644

+72 −0

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

		apiVersion: apps/v1
		kind: Deployment
		metadata:
		name: opticalcontrollerservice
		spec:
		selector:
		matchLabels:
		app: opticalcontrollerservice
		replicas: 1
		template:
		metadata:
		labels:
		app: opticalcontrollerservice
		spec:
		terminationGracePeriodSeconds: 5
		containers:
		- name: server
		image: localhost:32000/tfs/opticalcontroller:dev
		imagePullPolicy: Never
		ports:
		- containerPort: 10060
		- containerPort: 9192
		env:
		- name: LOG_LEVEL
		value: "INFO"
		#readinessProbe:
		# exec:
		# command: ["/bin/grpc_health_probe", "-addr=:10060"]
		#livenessProbe:
		# exec:
		# command: ["/bin/grpc_health_probe", "-addr=:10060"]
		resources:
		requests:
		cpu: 500m
		memory: 128Mi
		limits:
		cpu: 1000m
		memory: 1024Mi
		---
		apiVersion: v1
		kind: Service
		metadata:
		name: opticalcontrollerservice
		labels:
		app: opticalcontrollerservice
		spec:
		type: ClusterIP
		selector:
		app: opticalcontrollerservice
		ports:
		- name: grpc
		protocol: TCP
		port: 10060
		targetPort: 10060
		- name: metrics
		protocol: TCP
		port: 9192
		targetPort: 9192

my_deploy.sh

+6 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,12 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_gene
		# Uncomment to activate Monitoring
		#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"

		# Uncomment to activate BGP-LS Speaker
		#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"

		# Uncomment to activate Optical Controller
		#export TFS_COMPONENTS="${TFS_COMPONENTS} opticalcontroller"

		# Uncomment to activate ZTP
		#export TFS_COMPONENTS="${TFS_COMPONENTS} ztp"