pr review (6e39cf0f) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-apps/meep-app-enablement/server/app-enablement.go

+5 −2

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import (
		"net/url"
		"os"
		"strings"
		"sync"

		appInfo "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-app-enablement/server/app-info"
		appSupport "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-app-enablement/server/app-support"
		@@ -31,6 +32,8 @@ import (

		const serviceName = "Edge Platform Application Enablement Service"

		var mutex sync.Mutex

		var hostUrl *url.URL
		var sandboxName string

		@@ -61,12 +64,12 @@ func Init() (err error) {
		}
		log.Info("resource URL: ", hostUrl)

		err = servMgmt.Init()
		err = servMgmt.Init(&mutex)
		if err != nil {
		return err
		}

		err = appSupport.Init()
		err = appSupport.Init(&mutex)
		if err != nil {
		return err
		}

go-apps/meep-app-enablement/server/app-info/app-info.go

+0 −4

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import (
		)

		const appInfoBasePath = "/app_info/v1/"
		const appInfoKey = "app-info"
		const appEnablementKey = "app-enablement"
		const ACTIVE = "ACTIVE"
		const INACTIVE = "INACTIVE"
		@@ -51,7 +50,6 @@ var hostUrl *url.URL
		var sandboxName string
		var selfName string
		var basePath string
		var baseKey string
		var appEnablementBaseKey string

		var expiryTicker *time.Ticker
		@@ -115,7 +113,6 @@ func Init() (err error) {
		// Set base path
		basePath = "/" + sandboxName + appInfoBasePath
		// Get base store key
		baseKey = dkm.GetKeyRoot(sandboxName) + appInfoKey
		appEnablementBaseKey = dkm.GetKeyRoot(sandboxName) + selfName + ":" + appEnablementKey

		// Connect to Redis DB
		@@ -125,7 +122,6 @@ func Init() (err error) {
		return err
		}

		_ = rc.DBFlush(baseKey)
		_ = rc.DBFlush(appEnablementBaseKey)

		log.Info("Connected to Redis DB")

go-apps/meep-app-enablement/server/app-support/app-support.go

+26 −22

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		package server

		import (
		"time"
		// "time"

		"encoding/json"
		"errors"
		@@ -25,6 +25,7 @@ import (
		"net/url"
		"os"
		"strings"
		"sync"

		msmgmt "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-app-enablement/server/service-mgmt"
		dkm "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr"
		@@ -40,6 +41,8 @@ const appEnablementKey = "app-enablement"
		const ACTIVE = "ACTIVE"
		const INACTIVE = "INACTIVE"

		var mutex *sync.Mutex

		//const logModuleMSMgmt = "meep-app-enablement"
		//const serviceName = "MEC Service Management"

		@@ -57,7 +60,7 @@ var basePath string
		var baseKey string
		var appEnablementBaseKey string

		var expiryTicker *time.Ticker
		//var expiryTicker *time.Ticker

		var nextSubscriptionIdAvailable int

		@@ -66,7 +69,8 @@ var nextSubscriptionIdAvailable int
		w.WriteHeader(http.StatusNotImplemented)
		}
		*/
		func Init() (err error) {
		func Init(globalMutex *sync.Mutex) (err error) {
		mutex = globalMutex
		// Retrieve Sandbox name from environment variable
		sandboxNameEnv := strings.TrimSpace(os.Getenv("MEEP_SANDBOX_NAME"))
		if sandboxNameEnv != "" {
		@@ -125,13 +129,14 @@ func Init() (err error) {
		log.Info("Connected to Redis DB")

		reInit()

		/*
		expiryTicker = time.NewTicker(time.Second)
		go func() {
		for range expiryTicker.C {
		//checkForExpiredSubscriptions()
		}
		}()
		*/
		return nil
		}

		@@ -141,12 +146,12 @@ func reInit() {
		nextSubscriptionIdAvailable = 1
		}

		// Run - Start WAIS
		// Run - Start APP support
		func Run() (err error) {
		return nil
		}

		// Stop - Stop WAIS
		// Stop - Stop APP support
		func Stop() (err error) {
		return nil
		}
		@@ -276,14 +281,14 @@ func updateAllServices(appInstanceId string, state msmgmt.ServiceState) error {
		var sInfoList msmgmt.ServiceInfoList

		keyName := appEnablementBaseKey + ":apps:" + appInstanceId + ":svcs:*"
		mutex.Lock()
		defer mutex.Unlock()
		err := rc.ForEachJSONEntry(keyName, populateServiceInfoList, &sInfoList)
		if err != nil {
		return err
		}
		if len(sInfoList.ServiceInfos) > 0 {
		for _, sInfo := range sInfoList.ServiceInfos {
		serviceId := sInfo.SerInstanceId
		//sInfoList.ServiceInfos[index].State = &state
		sInfo.State = &state
		err = rc.JSONSetEntry(appEnablementBaseKey+":apps:"+appInstanceId+":svcs:"+serviceId, ".", msmgmt.ConvertServiceInfoToJson(&sInfo))
		if err != nil {
		@@ -291,7 +296,6 @@ func updateAllServices(appInstanceId string, state msmgmt.ServiceState) error {
		}

		}
		}
		return nil
		}

go-apps/meep-app-enablement/server/service-mgmt/service-mgmt.go

+7 −10

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import (
		)

		const msmgmtBasePath = "/mec_service_mgmt/v2/"
		const msmgmtKey = "msmgmt"
		const appEnablementKey = "app-enablement"

		//const logModuleMSMgmt = "meep-app-enablement"
		@@ -55,10 +54,9 @@ var hostUrl *url.URL
		var sandboxName string
		var selfName string
		var basePath string
		var baseKey string
		var appEnablementBaseKey string

		var mutex sync.Mutex
		var mutex *sync.Mutex

		var expiryTicker *time.Ticker

		@@ -84,7 +82,8 @@ type FilterParameters struct {
		w.WriteHeader(http.StatusNotImplemented)
		}
		*/
		func Init() (err error) {
		func Init(globalMutex *sync.Mutex) (err error) {
		mutex = globalMutex
		// Retrieve Sandbox name from environment variable
		sandboxNameEnv := strings.TrimSpace(os.Getenv("MEEP_SANDBOX_NAME"))
		if sandboxNameEnv != "" {
		@@ -126,7 +125,6 @@ func Init() (err error) {
		// Set base path
		basePath = "/" + sandboxName + msmgmtBasePath
		// Get base store key
		baseKey = dkm.GetKeyRoot(sandboxName) + msmgmtKey
		appEnablementBaseKey = dkm.GetKeyRoot(sandboxName) + selfName + ":" + appEnablementKey

		// Connect to Redis DB
		@@ -136,7 +134,6 @@ func Init() (err error) {
		return err
		}

		_ = rc.DBFlush(baseKey)
		_ = rc.DBFlush(appEnablementBaseKey)

		log.Info("Connected to Redis DB")
		@@ -178,14 +175,14 @@ func reInit() {
		nextServiceRegistrationIdAvailable = 1
		}

		// Run - Start WAIS
		// Run - Start Service Mgmt
		func Run() (err error) {
		return nil //sbi.Run()
		return nil
		}

		// Stop - Stop WAIS
		// Stop - Stop Service Mgmt
		func Stop() (err error) {
		return nil //sbi.Stop()
		return nil
		}

		func appServicesGET(w http.ResponseWriter, r *http.Request) {

go-apps/meepctl/cmd/version.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ type versionInfo struct {
		BuildID string `json:"build,omitempty"`
		}

		const meepctlVersion = "1.7.2"
		const meepctlVersion = "1.7.3"
		const na = "NA"

		const versionDesc = `Display version information