Merge branch 'develop' into feat/compute-etsi_mec_015 (f8bd53bc) · Commits · TFS / controller

deploy/mock_blockchain.sh

+9 −8

proto/context.proto

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -192,7 +192,7 @@ enum DeviceDriverEnum {
	DEVICEDRIVER_TRANSPORT_API = 2;		DEVICEDRIVER_TRANSPORT_API = 2;
	DEVICEDRIVER_P4 = 3;		DEVICEDRIVER_P4 = 3;
	DEVICEDRIVER_IETF_NETWORK_TOPOLOGY = 4;		DEVICEDRIVER_IETF_NETWORK_TOPOLOGY = 4;
	DEVICEDRIVER_ONF_TR_352 = 5;		DEVICEDRIVER_ONF_TR_532 = 5;
	DEVICEDRIVER_XR = 6;		DEVICEDRIVER_XR = 6;
	DEVICEDRIVER_IETF_L2VPN = 7;		DEVICEDRIVER_IETF_L2VPN = 7;
	DEVICEDRIVER_GNMI_OPENCONFIG = 8;		DEVICEDRIVER_GNMI_OPENCONFIG = 8;

src/automation/src/main/java/eu/teraflow/automation/Serializer.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -849,8 +849,8 @@ public class Serializer {
	return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_P4;		return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_P4;
	case IETF_NETWORK_TOPOLOGY:		case IETF_NETWORK_TOPOLOGY:
	return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY;		return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY;
	case ONF_TR_352:		case ONF_TR_532:
	return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352;		return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_532;
	case XR:		case XR:
	return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR;		return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR;
	case IETF_L2VPN:		case IETF_L2VPN:
	@@ -872,8 +872,8 @@ public class Serializer {
	return DeviceDriverEnum.P4;		return DeviceDriverEnum.P4;
	case DEVICEDRIVER_IETF_NETWORK_TOPOLOGY:		case DEVICEDRIVER_IETF_NETWORK_TOPOLOGY:
	return DeviceDriverEnum.IETF_NETWORK_TOPOLOGY;		return DeviceDriverEnum.IETF_NETWORK_TOPOLOGY;
	case DEVICEDRIVER_ONF_TR_352:		case DEVICEDRIVER_ONF_TR_532:
	return DeviceDriverEnum.ONF_TR_352;		return DeviceDriverEnum.ONF_TR_532;
	case DEVICEDRIVER_XR:		case DEVICEDRIVER_XR:
	return DeviceDriverEnum.XR;		return DeviceDriverEnum.XR;
	case DEVICEDRIVER_IETF_L2VPN:		case DEVICEDRIVER_IETF_L2VPN:

src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceDriverEnum.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@ public enum DeviceDriverEnum {
	TRANSPORT_API,		TRANSPORT_API,
	P4,		P4,
	IETF_NETWORK_TOPOLOGY,		IETF_NETWORK_TOPOLOGY,
	ONF_TR_352,		ONF_TR_532,
	XR,		XR,
	IETF_L2VPN		IETF_L2VPN
	}		}

src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1212,8 +1212,8 @@ class SerializerTest {
	DeviceDriverEnum.IETF_NETWORK_TOPOLOGY,		DeviceDriverEnum.IETF_NETWORK_TOPOLOGY,
	ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY),		ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY),
	Arguments.of(		Arguments.of(
	DeviceDriverEnum.ONF_TR_352,		DeviceDriverEnum.ONF_TR_532,
	ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352),		ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_532),
	Arguments.of(DeviceDriverEnum.XR, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR),		Arguments.of(DeviceDriverEnum.XR, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR),
	Arguments.of(		Arguments.of(
	DeviceDriverEnum.IETF_L2VPN,		DeviceDriverEnum.IETF_L2VPN,

Original line number	Original line	Diff line number	Diff line
	@@ -38,20 +38,21 @@ GITLAB_REPO_URL="labs.etsi.org:5050/tfs/controller"
	TMP_FOLDER="./tmp"		TMP_FOLDER="./tmp"

	# Create a tmp folder for files modified during the deployment		# Create a tmp folder for files modified during the deployment
	TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests"		TMP_MANIFESTS_FOLDER="${TMP_FOLDER}/${K8S_NAMESPACE}/manifests"
	mkdir -p $TMP_MANIFESTS_FOLDER		mkdir -p $TMP_MANIFESTS_FOLDER
	TMP_LOGS_FOLDER="$TMP_FOLDER/logs"		TMP_LOGS_FOLDER="${TMP_FOLDER}/${K8S_NAMESPACE}/logs"
	mkdir -p $TMP_LOGS_FOLDER		mkdir -p $TMP_LOGS_FOLDER

	echo "Deleting and Creating a new namespace..."		echo "Deleting and Creating a new namespace..."
	kubectl delete namespace $K8S_NAMESPACE		kubectl delete namespace $K8S_NAMESPACE --ignore-not-found
	kubectl create namespace $K8S_NAMESPACE		kubectl create namespace $K8S_NAMESPACE
	printf "\n"		printf "\n"

	echo "Deploying components and collecting environment variables..."		echo "Deploying components and collecting environment variables..."
	ENV_VARS_SCRIPT=tfs_bchain_runtime_env_vars.sh		ENV_VARS_SCRIPT=tfs_bchain_runtime_env_vars.sh
	echo "# Environment variables for TeraFlow Mock-Blockchain deployment" > $ENV_VARS_SCRIPT		echo "# Environment variables for TeraFlowSDN Mock-Blockchain deployment" > $ENV_VARS_SCRIPT
	PYTHONPATH=$(pwd)/src		PYTHONPATH=$(pwd)/src
			echo "export PYTHONPATH=${PYTHONPATH}" >> $ENV_VARS_SCRIPT

	echo "Processing '$COMPONENT' component..."		echo "Processing '$COMPONENT' component..."
	IMAGE_NAME="$COMPONENT:$IMAGE_TAG"		IMAGE_NAME="$COMPONENT:$IMAGE_TAG"
	@@ -77,12 +78,12 @@ cp ./manifests/"${COMPONENT}".yaml "$MANIFEST"

	if [ -n "$REGISTRY_IMAGE" ]; then		if [ -n "$REGISTRY_IMAGE" ]; then
	# Registry is set		# Registry is set
	VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" \| cut -d ":" -f3)		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" \| cut -d ":" -f4)
	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"
	sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Always#g" "$MANIFEST"		sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Always#g" "$MANIFEST"
	else		else
	# Registry is not set		# Registry is not set
	VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" \| cut -d ":" -f3)		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" \| cut -d ":" -f4)
	sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_NAME#g" "$MANIFEST"		sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_NAME#g" "$MANIFEST"
	sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Never#g" "$MANIFEST"		sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Never#g" "$MANIFEST"
	fi		fi
	@@ -91,8 +92,8 @@ echo " Deploying '$COMPONENT' component to Kubernetes..."
	DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log"		DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log"
	kubectl --namespace $K8S_NAMESPACE apply -f "$MANIFEST" > "$DEPLOY_LOG"		kubectl --namespace $K8S_NAMESPACE apply -f "$MANIFEST" > "$DEPLOY_LOG"
	COMPONENT_OBJNAME=$(echo "${COMPONENT}" \| sed "s/\_/-/")		COMPONENT_OBJNAME=$(echo "${COMPONENT}" \| sed "s/\_/-/")
	kubectl --namespace $K8S_NAMESPACE scale deployment --replicas=0 ${COMPONENT_OBJNAME} >> "$DEPLOY_LOG"		#kubectl --namespace $K8S_NAMESPACE scale deployment --replicas=0 ${COMPONENT_OBJNAME} >> "$DEPLOY_LOG"