Update the version of MEC013 Location API (3b421356) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

charts/meep-loc-serv/values-template.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ image:
		env:
		MEEP_INSTANCE_ID: {{.InstanceId}}
		MEEP_SANDBOX_NAME: {{.SandboxName}}
		MEEP_SVC_PATH: /location/v2
		MEEP_SVC_PATH: /location/v3
		MEEP_HOST_URL: {{.HostUrl}}
		{{- if .IsMepService }}
		MEEP_MEP_NAME: {{.MepName}}

config/permissions-open.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -276,7 +276,7 @@ default:
		# # Location Service (Sbox)
		# #------------------------------
		# - name: 'meep-loc-serv'
		# path: '/location/v2'
		# path: '/location/v3'
		# sbox: true
		# default:
		# mode: 'allow'

config/permissions-secure.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -191,7 +191,7 @@ services:
		# Location Service (Sbox)
		#------------------------------
		- name: 'meep-loc-serv'
		path: '/location/v2'
		path: '/location/v3'
		sbox: true
		default:
		mode: 'verify'

go-apps/meep-loc-serv/server/loc-serv.go

+1 −1

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

		const moduleName = "meep-loc-serv"
		const LocServBasePath = "location/v2/"
		const LocServBasePath = "location/v3/"
		const locServKey = "loc-serv"
		const serviceName = "Location Service"
		const serviceCategory = "Location"

go-apps/meep-loc-serv/server/routers.go

+50 −50

Original line number	Diff line number	Diff line
		@@ -60,15 +60,15 @@ func NewRouter() *mux.Router {

		// Path prefix router order is important
		// Service Api files
		handler = http.StripPrefix("/location/v2/api/", http.FileServer(http.Dir("./api/")))
		handler = http.StripPrefix("/location/v3/api/", http.FileServer(http.Dir("./api/")))
		router.
		PathPrefix("/location/v2/api/").
		PathPrefix("/location/v3/api/").
		Name("Api").
		Handler(handler)
		// User supplied service API files
		handler = http.StripPrefix("/location/v2/user-api/", http.FileServer(http.Dir("./user-api/")))
		handler = http.StripPrefix("/location/v3/user-api/", http.FileServer(http.Dir("./user-api/")))
		router.
		PathPrefix("/location/v2/user-api/").
		PathPrefix("/location/v3/user-api/").
		Name("UserApi").
		Handler(handler)

		@@ -83,305 +83,305 @@ var routes = Routes{
		Route{
		"Index",
		"GET",
		"/location/v2/",
		"/location/v3/",
		Index,
		},

		Route{
		"ApByIdGET",
		strings.ToUpper("Get"),
		"/location/v2/queries/zones/{zoneId}/accessPoints/{accessPointId}",
		"/location/v3/queries/zones/{zoneId}/accessPoints/{accessPointId}",
		ApByIdGET,
		},

		Route{
		"ApGET",
		strings.ToUpper("Get"),
		"/location/v2/queries/zones/{zoneId}/accessPoints",
		"/location/v3/queries/zones/{zoneId}/accessPoints",
		ApGET,
		},

		Route{
		"AreaSubDELETE",
		strings.ToUpper("Delete"),
		"/location/v2/subscriptions/area/{subscriptionId}",
		"/location/v3/subscriptions/area/{subscriptionId}",
		AreaSubDELETE,
		},

		Route{
		"AreaSubGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/area/{subscriptionId}",
		"/location/v3/subscriptions/area/{subscriptionId}",
		AreaSubGET,
		},

		Route{
		"AreaSubListGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/area",
		"/location/v3/subscriptions/area",
		AreaSubListGET,
		},

		Route{
		"AreaSubPOST",
		strings.ToUpper("Post"),
		"/location/v2/subscriptions/area",
		"/location/v3/subscriptions/area",
		AreaSubPOST,
		},

		Route{
		"AreaSubPUT",
		strings.ToUpper("Put"),
		"/location/v2/subscriptions/area/{subscriptionId}",
		"/location/v3/subscriptions/area/{subscriptionId}",
		AreaSubPUT,
		},

		Route{
		"DistanceGET",
		strings.ToUpper("Get"),
		"/location/v2/queries/distance",
		"/location/v3/queries/distance",
		DistanceGET,
		},

		Route{
		"DistanceSubDELETE",
		strings.ToUpper("Delete"),
		"/location/v2/subscriptions/distance/{subscriptionId}",
		"/location/v3/subscriptions/distance/{subscriptionId}",
		DistanceSubDELETE,
		},

		Route{
		"DistanceSubGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/distance/{subscriptionId}",
		"/location/v3/subscriptions/distance/{subscriptionId}",
		DistanceSubGET,
		},

		Route{
		"DistanceSubListGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/distance",
		"/location/v3/subscriptions/distance",
		DistanceSubListGET,
		},

		Route{
		"DistanceSubPOST",
		strings.ToUpper("Post"),
		"/location/v2/subscriptions/distance",
		"/location/v3/subscriptions/distance",
		DistanceSubPOST,
		},

		Route{
		"DistanceSubPUT",
		strings.ToUpper("Put"),
		"/location/v2/subscriptions/distance/{subscriptionId}",
		"/location/v3/subscriptions/distance/{subscriptionId}",
		DistanceSubPUT,
		},

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

		Route{
		"PeriodicSubDELETE",
		strings.ToUpper("Delete"),
		"/location/v2/subscriptions/periodic/{subscriptionId}",
		"/location/v3/subscriptions/periodic/{subscriptionId}",
		PeriodicSubDELETE,
		},

		Route{
		"PeriodicSubGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/periodic/{subscriptionId}",
		"/location/v3/subscriptions/periodic/{subscriptionId}",
		PeriodicSubGET,
		},

		Route{
		"PeriodicSubListGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/periodic",
		"/location/v3/subscriptions/periodic",
		PeriodicSubListGET,
		},

		Route{
		"PeriodicSubPOST",
		strings.ToUpper("Post"),
		"/location/v2/subscriptions/periodic",
		"/location/v3/subscriptions/periodic",
		PeriodicSubPOST,
		},

		Route{
		"UserSubListGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/users",
		"/location/v3/subscriptions/users",
		UserSubListGET,
		},

		Route{
		"UserSubPOST",
		strings.ToUpper("Post"),
		"/location/v2/subscriptions/users",
		"/location/v3/subscriptions/users",
		UserSubPOST,
		},
		Route{
		"UserSubGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/users/{subscriptionId}",
		"/location/v3/subscriptions/users/{subscriptionId}",
		UserSubGET,
		},
		Route{
		"UserSubDELETE",
		strings.ToUpper("Delete"),
		"/location/v2/subscriptions/users/{subscriptionId}",
		"/location/v3/subscriptions/users/{subscriptionId}",
		UserSubDELETE,
		},

		Route{
		"UserSubPUT",
		strings.ToUpper("Put"),
		"/location/v2/subscriptions/users/{subscriptionId}",
		"/location/v3/subscriptions/users/{subscriptionId}",
		UserSubPUT,
		},

		Route{
		"PeriodicSubPUT",
		strings.ToUpper("Put"),
		"/location/v2/subscriptions/periodic/{subscriptionId}",
		"/location/v3/subscriptions/periodic/{subscriptionId}",
		PeriodicSubPUT,
		},

		Route{
		"UserTrackingSubDELETE",
		strings.ToUpper("Delete"),
		"/location/v2/subscriptions/userTracking/{subscriptionId}",
		"/location/v3/subscriptions/userTracking/{subscriptionId}",
		UserTrackingSubDELETE,
		},

		Route{
		"UserTrackingSubGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/userTracking/{subscriptionId}",
		"/location/v3/subscriptions/userTracking/{subscriptionId}",
		UserTrackingSubGET,
		},

		Route{
		"UserTrackingSubListGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/userTracking",
		"/location/v3/subscriptions/userTracking",
		UserTrackingSubListGET,
		},

		Route{
		"UserTrackingSubPOST",
		strings.ToUpper("Post"),
		"/location/v2/subscriptions/userTracking",
		"/location/v3/subscriptions/userTracking",
		UserTrackingSubPOST,
		},

		Route{
		"UserTrackingSubPUT",
		strings.ToUpper("Put"),
		"/location/v2/subscriptions/userTracking/{subscriptionId}",
		"/location/v3/subscriptions/userTracking/{subscriptionId}",
		UserTrackingSubPUT,
		},

		Route{
		"UsersGET",
		strings.ToUpper("Get"),
		"/location/v2/queries/users",
		"/location/v3/queries/users",
		UsersGET,
		},

		Route{
		"ZonalTrafficSubDELETE",
		strings.ToUpper("Delete"),
		"/location/v2/subscriptions/zonalTraffic/{subscriptionId}",
		"/location/v3/subscriptions/zonalTraffic/{subscriptionId}",
		ZonalTrafficSubDELETE,
		},

		Route{
		"ZonalTrafficSubGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/zonalTraffic/{subscriptionId}",
		"/location/v3/subscriptions/zonalTraffic/{subscriptionId}",
		ZonalTrafficSubGET,
		},

		Route{
		"ZonalTrafficSubListGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/zonalTraffic",
		"/location/v3/subscriptions/zonalTraffic",
		ZonalTrafficSubListGET,
		},

		Route{
		"ZoneSubListGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/zones",
		"/location/v3/subscriptions/zones",
		ZoneSubListGET,
		},

		Route{
		"ZoneSubPOST",
		strings.ToUpper("Post"),
		"/location/v2/subscriptions/zones",
		"/location/v3/subscriptions/zones",
		ZoneSubPOST,
		},

		Route{
		"ZoneSubGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/zones/{subscriptionId}",
		"/location/v3/subscriptions/zones/{subscriptionId}",
		ZoneSubGET,
		},

		Route{
		"ZoneSubDELETE",
		strings.ToUpper("Delete"),
		"/location/v2/subscriptions/zones/{subscriptionId}",
		"/location/v3/subscriptions/zones/{subscriptionId}",
		ZoneSubDELETE,
		},
		Route{
		"zoneSubPUT",
		strings.ToUpper("Put"),
		"/location/v2/subscriptions/zones/{subscriptionId}",
		"/location/v3/subscriptions/zones/{subscriptionId}",
		ZoneSubPUT,
		},

		Route{
		"ZonalTrafficSubPOST",
		strings.ToUpper("Post"),
		"/location/v2/subscriptions/zonalTraffic",
		"/location/v3/subscriptions/zonalTraffic",
		ZonalTrafficSubPOST,
		},

		Route{
		"ZonalTrafficSubPUT",
		strings.ToUpper("Put"),
		"/location/v2/subscriptions/zonalTraffic/{subscriptionId}",
		"/location/v3/subscriptions/zonalTraffic/{subscriptionId}",
		ZonalTrafficSubPUT,
		},

		Route{
		"ZoneStatusSubDELETE",
		strings.ToUpper("Delete"),
		"/location/v2/subscriptions/zoneStatus/{subscriptionId}",
		"/location/v3/subscriptions/zoneStatus/{subscriptionId}",
		ZoneStatusSubDELETE,
		},

		Route{
		"ZoneStatusSubGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/zoneStatus/{subscriptionId}",
		"/location/v3/subscriptions/zoneStatus/{subscriptionId}",
		ZoneStatusSubGET,
		},

		Route{
		"ZoneStatusSubListGET",
		strings.ToUpper("Get"),
		"/location/v2/subscriptions/zoneStatus",
		"/location/v3/subscriptions/zoneStatus",
		ZoneStatusSubListGET,
		},

		@@ -402,14 +402,14 @@ var routes = Routes{
		Route{
		"ZonesGET",
		strings.ToUpper("Get"),
		"/location/v2/queries/zones",
		"/location/v3/queries/zones",
		ZonesGET,
		},

		Route{
		"ZonesGetById",
		strings.ToUpper("Get"),
		"/location/v2/queries/zones/{zoneId}",
		"/location/v3/queries/zones/{zoneId}",
		ZonesGetById,
		},
		}