Merge branch 'feat/pathcomp-component' into 'develop' (2a093fe6) · Commits · TFS / controller

.gitignore

+3 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,9 @@ venv.bak/
		# VSCode project settings
		.vscode/

		# Visual Studio project settings
		/.vs

		# Rope project settings
		.ropeproject

.gitlab-ci.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,3 +41,4 @@ include:
		#- local: '/src/l3_attackmitigator/.gitlab-ci.yml'
		#- local: '/src/slice/.gitlab-ci.yml'
		#- local: '/src/interdomain/.gitlab-ci.yml'
		- local: '/src/pathcomp/.gitlab-ci.yml'

deploy.sh

+53 −10

Original line number	Diff line number	Diff line
		@@ -86,6 +86,14 @@ for COMPONENT in $TFS_COMPONENTS; do

		if [ "$COMPONENT" == "automation" ] \|\| [ "$COMPONENT" == "policy" ]; then
		docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile ./src/"$COMPONENT"/ > "$BUILD_LOG"
		elif [ "$COMPONENT" == "pathcomp" ]; then
		BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-frontend.log"
		docker build -t "$COMPONENT-frontend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/frontend/Dockerfile . >> "$BUILD_LOG"

		BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-backend.log"
		docker build -t "$COMPONENT-backend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/backend/Dockerfile . >> "$BUILD_LOG"
		# next command is redundant, but helpful to keep cache updated between rebuilds
		docker build -t "$COMPONENT-backend:$TFS_IMAGE_TAG-builder" --target builder -f ./src/"$COMPONENT"/backend/Dockerfile . >> "$BUILD_LOG"
		else
		docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile . > "$BUILD_LOG"
		fi
		@@ -93,27 +101,62 @@ for COMPONENT in $TFS_COMPONENTS; do
		if [ -n "$TFS_REGISTRY_IMAGE" ]; then
		echo " Pushing Docker image to '$TFS_REGISTRY_IMAGE'..."

		if [ "$COMPONENT" == "pathcomp" ]; then
		TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-frontend.log"
		docker tag "$COMPONENT-frontend:$TFS_IMAGE_TAG" "$IMAGE_URL-frontend" > "$TAG_LOG"

		TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-backend.log"
		docker tag "$COMPONENT-backend:$TFS_IMAGE_TAG" "$IMAGE_URL-backend" > "$TAG_LOG"

		PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-frontend.log"
		docker push "$IMAGE_URL-frontend" > "$PUSH_LOG"

		PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-backend.log"
		docker push "$IMAGE_URL-backend" > "$PUSH_LOG"
		else
		TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}.log"
		docker tag "$IMAGE_NAME" "$IMAGE_URL" > "$TAG_LOG"

		PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}.log"
		docker push "$IMAGE_URL" > "$PUSH_LOG"
		fi
		fi

		echo " Adapting '$COMPONENT' manifest file..."
		MANIFEST="$TMP_MANIFESTS_FOLDER/${COMPONENT}service.yaml"
		cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST"
		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" \| cut -d ":" -f3)

		if [ -n "$TFS_REGISTRY_IMAGE" ]; then
		# Registry is set
		if [ "$COMPONENT" == "pathcomp" ]; then
		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-frontend:" "$MANIFEST" \| cut -d ":" -f3)
		sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-frontend:${VERSION}#image: $IMAGE_URL-frontend#g" "$MANIFEST"

		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-backend:" "$MANIFEST" \| cut -d ":" -f3)
		sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-backend:${VERSION}#image: $IMAGE_URL-backend#g" "$MANIFEST"

		sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Always#g" "$MANIFEST"
		else
		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" \| cut -d ":" -f3)
		sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"
		sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Always#g" "$MANIFEST"
		fi
		else
		# Registry is not set
		if [ "$COMPONENT" == "pathcomp" ]; then
		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-frontend:" "$MANIFEST" \| cut -d ":" -f3)
		sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-frontend:${VERSION}#image: $IMAGE_NAME-frontend#g" "$MANIFEST"

		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-backend:" "$MANIFEST" \| cut -d ":" -f3)
		sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-backend:${VERSION}#image: $IMAGE_NAME-backend#g" "$MANIFEST"

		sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Never#g" "$MANIFEST"
		else
		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" \| cut -d ":" -f3)
		sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_NAME#g" "$MANIFEST"
		sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Never#g" "$MANIFEST"
		fi
		fi

		echo " Deploying '$COMPONENT' component to Kubernetes..."
		DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log"

manifests/pathcompservice.yaml

+28 −2

Original line number	Diff line number	Diff line
		@@ -27,8 +27,8 @@ spec:
		spec:
		terminationGracePeriodSeconds: 5
		containers:
		- name: server
		image: registry.gitlab.com/teraflow-h2020/controller/pathcomp:latest
		- name: frontend
		image: registry.gitlab.com/teraflow-h2020/controller/pathcomp-frontend:latest
		imagePullPolicy: Always
		ports:
		- containerPort: 10020
		@@ -48,6 +48,28 @@ spec:
		limits:
		cpu: 700m
		memory: 1024Mi
		- name: backend
		image: registry.gitlab.com/teraflow-h2020/controller/pathcomp-backend:latest
		imagePullPolicy: Always
		#readinessProbe:
		# httpGet:
		# path: /health
		# port: 8081
		# initialDelaySeconds: 5
		# timeoutSeconds: 5
		#livenessProbe:
		# httpGet:
		# path: /health
		# port: 8081
		# initialDelaySeconds: 5
		# timeoutSeconds: 5
		resources:
		requests:
		cpu: 250m
		memory: 512Mi
		limits:
		cpu: 700m
		memory: 1024Mi
		---
		apiVersion: v1
		kind: Service
		@@ -62,3 +84,7 @@ spec:
		protocol: TCP
		port: 10020
		targetPort: 10020
		- name: http
		protocol: TCP
		port: 8081
		targetPort: 8081

proto/pathcomp.proto

+5 −0

Original line number	Diff line number	Diff line
		@@ -28,11 +28,16 @@ message Algorithm_KShortestPath {
		uint32 k_return = 2;
		}

		message Algorithm_KDisjointPath {
		uint32 num_disjoint = 1;
		}

		message PathCompRequest {
		repeated context.Service services = 1;
		oneof algorithm {
		Algorithm_ShortestPath shortest_path = 10;
		Algorithm_KShortestPath k_shortest_path = 11;
		Algorithm_KDisjointPath k_disjoint_path = 12;
		}
		}