Commit aa9b3c25 authored Oct 11, 2024 by Carlos Manso

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into...

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

parents 974e5f74 89020c87

deploy/crdb.sh

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -175,6 +175,7 @@ function crdb_drop_databases_single() {
	--execute "SHOW DATABASES;" --format=tsv \| awk '{print $1}' \| grep "^tfs"		--execute "SHOW DATABASES;" --format=tsv \| awk '{print $1}' \| grep "^tfs"
	)		)
	echo "Found TFS databases: ${DATABASES}" \| tr '\n' ' '		echo "Found TFS databases: ${DATABASES}" \| tr '\n' ' '
			echo

	for DB_NAME in $DATABASES; do		for DB_NAME in $DATABASES; do
	echo "Dropping TFS database: $DB_NAME"		echo "Dropping TFS database: $DB_NAME"
	@@ -369,6 +370,7 @@ function crdb_drop_databases_cluster() {
	--execute "SHOW DATABASES;" --format=tsv \| awk '{print $1}' \| grep "^tfs"		--execute "SHOW DATABASES;" --format=tsv \| awk '{print $1}' \| grep "^tfs"
	)		)
	echo "Found TFS databases: ${DATABASES}" \| tr '\n' ' '		echo "Found TFS databases: ${DATABASES}" \| tr '\n' ' '
			echo

	for DB_NAME in $DATABASES; do		for DB_NAME in $DATABASES; do
	echo "Dropping TFS database: $DB_NAME"		echo "Dropping TFS database: $DB_NAME"

deploy/tfs.sh

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -344,11 +344,10 @@ for COMPONENT in $TFS_COMPONENTS; do
	VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-gateway:" "$MANIFEST" \| cut -d ":" -f4)		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-gateway:" "$MANIFEST" \| cut -d ":" -f4)
	sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-gateway:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"		sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-gateway:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"
	else		else
			VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" \| cut -d ":" -f4)
	if [ "$TFS_SKIP_BUILD" != "YES" ]; then		if [ "$TFS_SKIP_BUILD" != "YES" ]; then
	IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT:$TFS_IMAGE_TAG" \| sed 's,//,/,g' \| sed 's,http:/,,g')		IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT:$TFS_IMAGE_TAG" \| sed 's,//,/,g' \| sed 's,http:/,,g')
	VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" \| cut -d ":" -f4)
	else		else
	VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" \| cut -d ":" -f4)
	IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT:$VERSION" \| sed 's,//,/,g' \| sed 's,http:/,,g')		IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT:$VERSION" \| sed 's,//,/,g' \| sed 's,http:/,,g')
	fi		fi
	sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"		sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"

manifests/analyticsservice.yaml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -98,11 +98,11 @@ spec:
	selector:		selector:
	app: analyticsservice		app: analyticsservice
	ports:		ports:
	- name: frontend-grpc		- name: grpc
	protocol: TCP		protocol: TCP
	port: 30080		port: 30080
	targetPort: 30080		targetPort: 30080
	- name: backend-grpc		- name: grpc-backend
	protocol: TCP		protocol: TCP
	port: 30090		port: 30090
	targetPort: 30090		targetPort: 30090

manifests/telemetryservice.yaml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -98,11 +98,11 @@ spec:
	selector:		selector:
	app: telemetryservice		app: telemetryservice
	ports:		ports:
	- name: frontend-grpc		- name: grpc
	protocol: TCP		protocol: TCP
	port: 30050		port: 30050
	targetPort: 30050		targetPort: 30050
	- name: backend-grpc		- name: grpc-backend
	protocol: TCP		protocol: TCP
	port: 30060		port: 30060
	targetPort: 30060		targetPort: 30060

my_deploy.sh

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@
	export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"		export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"

	# Set the list of components, separated by spaces, you want to build images for, and deploy.		# Set the list of components, separated by spaces, you want to build images for, and deploy.
	export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator"		export TFS_COMPONENTS="context device pathcomp service slice nbi webui"

	# Uncomment to activate Monitoring (old)		# Uncomment to activate Monitoring (old)
	#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"		#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
	@@ -86,6 +86,9 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_gene
	# export TFS_COMPONENTS="${BEFORE} qkd_app service ${AFTER}"		# export TFS_COMPONENTS="${BEFORE} qkd_app service ${AFTER}"
	#fi		#fi

			# Uncomment to activate Load Generator
			#export TFS_COMPONENTS="${TFS_COMPONENTS} load_generator"


	# Set the tag you want to use for your images.		# Set the tag you want to use for your images.
	export TFS_IMAGE_TAG="dev"		export TFS_IMAGE_TAG="dev"