Commit deb7c0c3 authored by Yann Garcia's avatar Yann Garcia
Browse files

Minor bug fixed on 4g-5g-macro-v2x-fed scenario

parent b86bb691

charts/meep-federation/values-template.yaml

+1 −1
Changes for charts/meep-federation/values-template.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ image: 
    MEEP_SANDBOX_NAME: {{.SandboxName}}

    MEEP_SVC_PATH: /fed_enablement/v1

    MEEP_HOST_URL: {{.HostUrl}}

    MEEP_BROKER: mqtt://172.29.10.56:1883

    MEEP_BROKER: mqtt://meep-cloud-mosquitto:1883

    MEEP_TOPIC: ETSI/MEC/Federation

    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

go-apps/meep-federation/entrypoint.sh

+19 −16
Changes for go-apps/meep-federation/entrypoint.sh: 19 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -5,23 +5,17 @@ echo "MEEP_HOST_URL: ${MEEP_HOST_URL}" 
echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}"

echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}"

echo "MEEP_CODECOV: ${MEEP_CODECOV}"

SERVER_IP="${MEEP_HOST_URL#http://}"

echo "SERVER_IP: ${SERVER_IP}"



# MEEP_SANDBOX_NAME

SERVICE_NAME="meep-cloud-mosquitto"

# Get the namespace from the service account

NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)

# Get the token from the service account

TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)

# Query the Kubernetes API to get the NodePort for the service

NODE_PORT_MEEP_CLOUD_MOSQUITTO=$(curl -sSk \

  -H "Authorization: Bearer $TOKEN" \

  https://kubernetes.default.svc/api/v1/namespaces/$NAMESPACE/services/$SERVICE_NAME \

  | jq -r '.spec.ports[0].nodePort')

echo "External NodePort exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $NODE_PORT_MEEP_CLOUD_MOSQUITTO"

MEEP_BROCKER=mqtt://$SERVER_IP:$NODE_PORT_MEEP_CLOUD_MOSQUITTO

echo "MEEP_BROCKER: ${MEEP_BROCKER}"

#SERVICE_NAME="meep-cloud-mosquitto"

#NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)

#TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)

#NODE_PORT_MEEP_CLOUD_MOSQUITTO=$(curl -sSk \

#  -H "Authorization: Bearer $TOKEN" \

#  https://kubernetes.default.svc/api/v1/namespaces/$NAMESPACE/services/$SERVICE_NAME \

#  | jq -r '.spec.ports[0].nodePort')

#echo "External NodePort exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $NODE_PORT_MEEP_CLOUD_MOSQUITTO"

#MEEP_BROCKER=mqtt://$SERVER_IP:$NODE_PORT_MEEP_CLOUD_MOSQUITTO

#echo "MEEP_BROCKER: ${MEEP_BROCKER}"



if [[ ! -z "${MEEP_MEP_NAME}" ]]; then

    svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}"
@@ -55,6 +49,15 @@ for file in /user-api/*; do 
    setBasepath "$file"

done



echo "Environment variables set:"

echo "MEEP_HOST_URL: ${MEEP_HOST_URL}"

echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}"

echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}"

echo "MEEP_CODECOV: ${MEEP_CODECOV}"

echo "MEEP_INSTANCE_ID: ${MEEP_INSTANCE_ID}"

echo "MEEP_BROKER: ${MEEP_BROKER}"

echo "MEEP_TOPIC: ${MEEP_TOPIC}"



# Start service

currenttime=`date "+%Y%m%d-%H%M%S"`

filepath="/codecov/codecov-meep-federation-"

go-apps/meep-sandbox-ctrl/server/app-ctrl.go

+6 −3
Changes for go-apps/meep-sandbox-ctrl/server/app-ctrl.go: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -679,9 +679,12 @@ func appStoreUpdateCb(eventType string, eventData interface{}, userData interfac 
}



func startMECFederationDiscovery(hostUrl string) {

	log.Debug(">>> startMECFederationDiscovery")

	log.Debug(">>> startMECFederationDiscovery: ", hostUrl)



	// Add MEC platform to the map if it not already present

	if _, ok := fed_list[hostUrl]; !ok {

		fed_list[hostUrl] = false

	}

	log.Debug("startMECFederationDiscovery: fed_list=", fed_list)



	// Make sure ticker is not running
@@ -736,7 +739,7 @@ func startMECFederationDiscovery(hostUrl string) { 
						if err != nil {

							log.Error(err.Error())

						} else {

							log.Info("startMECFederationDiscovery: Successfuly registered to MEC Federation: ", fedResources)

							log.Info(" ", fedResources)

							delete(fed_list, k)

							fed_list[k] = true

						}
@@ -755,7 +758,7 @@ func startMECFederationDiscovery(hostUrl string) { 
			} // End of 'for' statement

			//log.Debug("startMECFederationDiscovery: Stop MEC federation discovery timer: ", stop)

			if stop {

				log.Info("startMECFederationDiscovery: Stop MEC federation discovery timer")

				log.Info("startMECFederationDiscovery: Terminate MEC federation discovery timer, all registration done")

				stopMECFederationDiscovery()

				return

			}