remove sandbox name in routers for meep-vis (db332951) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-apps/meep-vis/meep-vis-config.yaml

deleted100644 → 0

+0 −16

Original line number	Diff line number	Diff line
		# This file defines the configuration of DAI edge application. All fields are required to run DAI AdvantEDGE

		# Set where mec application is running either on MEC Sandbox or AdvantEDGE. Expected fields: sandbox \| advantedge
		mode: 'advantedge'
		# Set url of mec platform. Example field format: http://{MEC_IP_ADDRESS}/{SANDBOX_NAME}/{MEP_NAME}/
		sandbox:
		# Set if sandbox url uses https. Expected fields: true \| false
		https: false
		# Set the mec platform name demo-3 will run on. Example field: mep1
		mecplatform: ''
		# Set user-application ID that is generated on MEC Sandbox frontend. Example field format: 7930ba6d-4581-444c-b966-3312517f3a51
		appid: ''
		# Set host address of demo-3.
		localurl: 'http://127.0.0.1'
		# Set host port number of demo-3. Example field: '8093'
		port: '8081'

go-apps/meep-vis/server/routers.go

+17 −17

Original line number	Diff line number	Diff line
		@@ -28,8 +28,8 @@ import (
		"net/http"
		"strings"

		httpLog "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-http-logger"
		met "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metrics"
		// httpLog "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-http-logger"
		// met "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metrics"

		"github.com/gorilla/mux"
		)
		@@ -49,8 +49,8 @@ func NewRouter() *mux.Router {
		for _, route := range routes {
		handler = route.HandlerFunc
		handler = Logger(handler, route.Name)
		handler = met.MetricsHandler(handler, sandboxName, serviceName)
		handler = httpLog.LogRx(handler, "")
		// handler = met.MetricsHandler(handler, sandboxName, serviceName)
		// handler = httpLog.LogRx(handler, "")
		router.
		Methods(route.Method).
		Path(route.Pattern).
		@@ -66,7 +66,7 @@ func NewRouter() *mux.Router {
		Name("Api").
		Handler(handler)
		// User supplied service API files
		handler = http.StripPrefix("/rni/v2/user-api/", http.FileServer(http.Dir("./user-api/")))
		handler = http.StripPrefix("/vis/v2/user-api/", http.FileServer(http.Dir("./user-api/")))
		router.
		PathPrefix("/vis/v2/user-api/").
		Name("UserApi").
		@@ -83,84 +83,84 @@ var routes = Routes{
		Route{
		"Index",
		"GET",
		"/sandboxname/vis/v2/",
		"/vis/v2/",
		Index,
		},

		Route{
		"Mec011AppTerminationPOST",
		strings.ToUpper("Post"),
		"/sandboxname/vis/v2/notifications/mec011/appTermination",
		"/vis/v2/notifications/mec011/appTermination",
		Mec011AppTerminationPOST,
		},

		Route{
		"PredictedQosPOST",
		strings.ToUpper("Post"),
		"/sandboxname/vis/v2/provide_predicted_qos",
		"/vis/v2/provide_predicted_qos",
		PredictedQosPOST,
		},

		Route{
		"IndividualSubscriptionDELETE",
		strings.ToUpper("Delete"),
		"/sandboxname/vis/v2/subscriptions/{subscriptionId}",
		"/vis/v2/subscriptions/{subscriptionId}",
		IndividualSubscriptionDELETE,
		},

		Route{
		"IndividualSubscriptionGET",
		strings.ToUpper("Get"),
		"/sandboxname/vis/v2/subscriptions/{subscriptionId}",
		"/vis/v2/subscriptions/{subscriptionId}",
		IndividualSubscriptionGET,
		},

		Route{
		"IndividualSubscriptionPUT",
		strings.ToUpper("Put"),
		"/sandboxname/vis/v2/subscriptions/{subscriptionId}",
		"/vis/v2/subscriptions/{subscriptionId}",
		IndividualSubscriptionPUT,
		},

		Route{
		"ProvInfoGET",
		strings.ToUpper("Get"),
		"/sandboxname/vis/v2/queries/pc5_provisioning_info",
		"/vis/v2/queries/pc5_provisioning_info",
		ProvInfoGET,
		},

		Route{
		"ProvInfoUuMbmsGET",
		strings.ToUpper("Get"),
		"/sandboxname/vis/v2/queries/uu_mbms_provisioning_info",
		"/vis/v2/queries/uu_mbms_provisioning_info",
		ProvInfoUuMbmsGET,
		},

		Route{
		"ProvInfoUuUnicastGET",
		strings.ToUpper("Get"),
		"/sandboxname/vis/v2/queries/uu_unicast_provisioning_info",
		"/vis/v2/queries/uu_unicast_provisioning_info",
		ProvInfoUuUnicastGET,
		},

		Route{
		"SubGET",
		strings.ToUpper("Get"),
		"/sandboxname/vis/v2/subscriptions",
		"/vis/v2/subscriptions",
		SubGET,
		},

		Route{
		"SubPOST",
		strings.ToUpper("Post"),
		"/sandboxname/vis/v2/subscriptions",
		"/vis/v2/subscriptions",
		SubPOST,
		},

		Route{
		"V2xMessagePOST",
		strings.ToUpper("Post"),
		"/sandboxname/vis/v2/publish_v2x_message",
		"/vis/v2/publish_v2x_message",
		V2xMessagePOST,
		},
		}

go-apps/meep-vis/server/vis.go

+2 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,8 @@ import (
		const moduleName = "meep-vis"
		const visBasePath = "vis/v2/"
		const visKey = "vis"
		const serviceName = "V2XI Service"

		// const serviceName = "V2XI Service"
		const serviceCategory = "V2XI"
		const defaultMepName = "global"
		const defaultScopeOfLocality = "MEC_SYSTEM"