Bug fixed in startMECFederationDiscovery (ebb27731) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

etsi-mec-sandbox.code-workspace

+0 −6

Original line number	Diff line number	Diff line
		@@ -3,14 +3,8 @@
		{
		"path": "."
		},
		{
		"path": "../etsi-mec-sandbox-frontend"
		},
		{
		"path": "../mec-sandbox-scenarios"
		},
		{
		"path": "../tmp/to_be_deleted"
		}
		],
		"extensions": {

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

+10 −4

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package server

		import (
		"context"
		"crypto/tls"
		"encoding/json"
		"errors"
		"fmt"
		@@ -705,7 +706,7 @@ func startMECFederationDiscovery(hostUrl string) {

		for k, v := range fed_list {
		if !v { // Not register yet
		log.Info("startMECFederationDiscovery: Try to connect to MEC federation " + k)
		log.Debug("startMECFederationDiscovery: Try to connect to MEC federation " + k)
		cfg := mfed.NewConfiguration()
		u, err := url.Parse(k)
		if err != nil {
		@@ -713,20 +714,25 @@ func startMECFederationDiscovery(hostUrl string) {
		stopMECFederationDiscovery()
		return
		}
		log.Debug("startMECFederationDiscovery: u:", u)
		s := strings.Split(u.Host, "-") // Extract MEP identifier
		if len(s) == 0 {
		log.Error("startMECFederationDiscovery: Failed to extract MEP identifier")
		stopMECFederationDiscovery()
		return
		}
		log.Debug("startMECFederationDiscovery: s: ", s)
		h := os.Getenv("MEEP_HOST_URL")
		if len(h) == 0 {
		log.Error("startMECFederationDiscovery: MEEP_HOST_URL env. variable not set")
		stopMECFederationDiscovery()
		return
		}
		cfg.BasePath = os.Getenv("MEEP_HOST_URL") + "/" + appCtrl.sandboxName + "/" + s[0] + u.Path
		//log.Debug("startMECFederationDiscovery: cfg.BasePath: ", cfg.BasePath)
		cfg.BasePath = h + "/" + appCtrl.sandboxName + "/" + s[0] + u.Path
		log.Debug("startMECFederationDiscovery: cfg.BasePath: ", cfg.BasePath)
		tr := &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}
		cfg.HTTPClient = &http.Client{Transport: tr}
		log.Debug("startMECFederationDiscovery: cfg.HTTPClient: ", cfg.HTTPClient)
		fed = mfed.NewAPIClient(cfg)
		if fed != nil {
		// Send registration
		@@ -739,7 +745,7 @@ func startMECFederationDiscovery(hostUrl string) {
		if err != nil {
		log.Error(err.Error())
		} else {
		log.Info(" ", fedResources)
		log.Debug("startMECFederationDiscovery: ", fedResources)
		delete(fed_list, k)
		fed_list[k] = true
		}