Commit 873bd777 authored by Yann Garcia's avatar Yann Garcia
Browse files

Fixing communication issue betwenn MN-CSE & IN-CSE

parent 483d1cfc

go-apps/meep-federation/entrypoint.sh

+15 −10
Original line number Diff line number Diff line
@@ -6,16 +6,21 @@ echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}" 
echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}"

echo "MEEP_CODECOV: ${MEEP_CODECOV}"



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://$SERVICE_NAME:${NODE_PORT_MEEP_CLOUD_MOSQUITTO:-1883}

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_IP_MEEP_CLOUD_MOSQUITTO=$(curl -sSk \

#  -H "Authorization: Bearer $TOKEN" \

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

#  | jq -r '.spec.clusterIP')

#echo "Internal IP exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $NODE_IP_MEEP_CLOUD_MOSQUITTO"

#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].targetPort')

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

#MEEP_BROCKER=mqtt://$${NODE_IP_MEEP_CLOUD_MOSQUITTO:-meep-cloud-mosquitto}:${NODE_PORT_MEEP_CLOUD_MOSQUITTO:-1883}

#echo "MEEP_BROCKER: ${MEEP_BROCKER}"



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

    svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}"

go-apps/meep-iot-pltf/meep-acme-in-cse/entrypoint.sh

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ echo "MQTT_PASSWORD: ${MQTT_PASSWORD}" 
#  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"



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

    svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}"

else

go-apps/meep-iot-pltf/meep-acme-mn-cse/entrypoint.sh

+23 −6
Original line number Diff line number Diff line
@@ -4,21 +4,38 @@ set -e 
echo "MEEP_HOST_URL: ${MEEP_HOST_URL}"

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



# Retrieve the internal meep-mosquitto IP address

SERVICE_NAME="meep-mosquitto"

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

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

MOSQUITTO_NODE_IP_ADDRESS=$(curl -sSk \

  -H "Authorization: Bearer $TOKEN" \

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

  | jq -r '.spec.clusterIP')

echo "Internal IP exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $MOSQUITTO_NODE_IP_ADDRESS"



# Retrieve the internal meep-mosquitto port id

MOSQUITTO_NODE_PORT=$(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: $MOSQUITTO_NODE_PORT"

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

echo "Internal NodePort exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $MOSQUITTO_NODE_PORT"



# Retrieve the internal meep-acme-in-cse IP address

SERVICE_NAME="meep-acme-in-cse"

REMOTE_CSE_IP_ADDRESS=$(curl -sSk \

  -H "Authorization: Bearer $TOKEN" \

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

  | jq -r '.spec.clusterIP')

echo "Internal IP exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $REMOTE_CSE_IP_ADDRESS"



# Retrieve the internal meep-acme-in-cse port id

SERVICE_NAME="meep-acme-in-cse"

NODE_PORT_IN_CSE=$(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_IN_CSE"

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

echo "Internal NodePort exposed for service [$SERVICE_NAME] in namespace [$NAMESPACE] is: $NODE_PORT_IN_CSE"



SERVICE_NAME="meep-acme-mn-cse"

NODE_PORT=$(curl -sSk \
@@ -43,7 +60,7 @@ sleep 5 # Wait for ETSI MEC Platform up and stable 


SERVER_IP=`echo $SERVER_IP | sed -e "s/https:\/\///g"` # Remove https://

MQTT_ENABLE=${MQTT_ENABLE:-true}

MQTT_HOST=${SERVER_IP:-"test.mosquitto.org"}

MQTT_HOST=${MOSQUITTO_NODE_IP_ADDRESS:-"meep-mosquito"}

MQTT_PORT=${MOSQUITTO_NODE_PORT:-1883}

MQTT_USERNAME=${MQTT_USERNAME:-"acme-mn-cse"}

MQTT_PASSWORD=${MQTT_PASSWORD:-"mqtt"}
@@ -52,7 +69,7 @@ SERVER_IP="${SERVER_IP:-"meep-acme-mn-cse"}" 
SERVER_PORT=${SERVER_PORT:-3004}

CSE_BASE_NAME=${CSE_BASE_NAME:-"mep-cse-mn"}

CSE_BASE_RI=${CSE_BASE_RI:-"acme-mep-id-mn-cse"}

REMOTE_CSE_HOST="${SERVER_IP:-"meep-acme-in-cse"}"

REMOTE_CSE_HOST="${REMOTE_CSE_IP_ADDRESS:-"meep-acme-in-cse"}"

REMOTE_CSE_PORT=${NODE_PORT_IN_CSE:-3003}

REMOTE_CSE_ID=${REMOTE_CSE_ID:-"laboai-id-in"}

REMOTE_CSE_NAME=${REMOTE_CSE_NAME:-"laboai-cse-in"}