Merge branch 'STF625_TASK4' into 'master' (d1a0e25f) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox Frontend

README.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -289,5 +289,5 @@ The following procedure should be used to upgrade a running MEC Sandbox deployme
		## Licensing
		MEC Sandbox is a private repo with all rights reserved to ETSI.
		```
		Copyright (c) 2020 ETSI. All rights reserved.
		Copyright (c) 2022 ETSI. All rights reserved.
		```

config/.meepctl-repocfg.yaml

+17 −2

Original line number	Diff line number	Diff line
		version: 1.8.1
		# Copyright (c) 2022 The AdvantEDGE Authors
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.

		version: 1.8.2
		repo:
		name: AdvantEDGE

		@@ -49,7 +63,7 @@ repo:
		# session encryption key k8s secret (data: encryption-key)
		key-secret: meep-session
		# maximum simultaneous sessions
		max-sessions: 9
		max-sessions: 10
		# GitHub OAuth provider config
		github:
		# enable GitHub OAuth
		@@ -430,6 +444,7 @@ repo:
		meep-mon-engine-api: js-packages/meep-mon-engine-client
		meep-gis-engine-api: js-packages/meep-gis-engine-client
		meep-auth-svc-client: js-packages/meep-auth-svc-client
		meep-metrics-engine-api: js-packages/meep-metrics-engine-client

		#------------------------------
		# Sandbox Subsystem

config/api/bwm-api.yaml

+38 −42

Original line number	Diff line number	Diff line
		@@ -426,21 +426,13 @@ components:
		requestType: 0
		sessionFilter:
		- protocol: protocol
		sourcePort:
		- sourcePort
		- sourcePort
		dstPort:
		- dstPort
		- dstPort
		sourcePort: sourcePort
		dstPort: dstPort
		sourceIp: sourceIp
		dstAddress: dstAddress
		- protocol: protocol
		sourcePort:
		- sourcePort
		- sourcePort
		dstPort:
		- dstPort
		- dstPort
		sourcePort: sourcePort
		dstPort: dstPort
		sourceIp: sourceIp
		dstAddress: dstAddress
		appName: appName
		@@ -544,16 +536,18 @@ components:
		properties:
		dstAddress:
		type: string
		description: Destination address identity of session (including range)
		description: >-
		Destination address identity of session. The string for a IPv4
		address shall be formatted in the "dotted decimal" notation as
		defined in IETF RFC 1166 [10]. The string for a IPv6 address shall
		be formatted according to clause 4 of IETF RFC 5952 [11], with in
		CIDR notation [12] used to provide the routing prefix.
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: String
		dstPort:
		minItems: 0
		type: array
		description: Destination port identity of session
		items:
		type: string
		x-etsi-mec-cardinality: 0..N
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: String
		protocol:
		type: string
		@@ -562,25 +556,23 @@ components:
		x-etsi-mec-origin-type: String
		sourceIp:
		type: string
		description: Source address identity of session (including range)
		description: >-
		Source address identity of session. The string for a IPv4 address
		shall be formatted in the "dotted decimal" notation as defined in
		IETF RFC 1166 [10]. The string for a IPv6 address shall be formatted
		according to clause 4 of IETF RFC 5952 [11], with in CIDR notation
		[12] used to provide the routing prefix.
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: String
		sourcePort:
		minItems: 0
		type: array
		description: Source port identity of session
		items:
		type: string
		x-etsi-mec-cardinality: 0..N
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: String
		example:
		protocol: protocol
		sourcePort:
		- sourcePort
		- sourcePort
		dstPort:
		- dstPort
		- dstPort
		sourcePort: sourcePort
		dstPort: dstPort
		sourceIp: sourceIp
		dstAddress: dstAddress
		BwInfo_timeStamp:
		@@ -613,16 +605,18 @@ components:
		properties:
		dstAddress:
		type: string
		description: Destination address identity of session (including range)
		description: >-
		Destination address identity of session. The string for a IPv4
		address shall be formatted in the "dotted decimal" notation as
		defined in IETF RFC 1166 [10]. The string for a IPv6 address shall
		be formatted according to clause 4 of IETF RFC 5952 [11], with in
		CIDR notation [12] used to provide the routing prefix.
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: String
		dstPort:
		minItems: 0
		type: array
		description: Destination port identity of session
		items:
		type: string
		x-etsi-mec-cardinality: 0..N
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: String
		protocol:
		type: string
		@@ -631,16 +625,18 @@ components:
		x-etsi-mec-origin-type: String
		sourceIp:
		type: string
		description: Source address identity of session (including range)
		description: >-
		Source address identity of session. The string for a IPv4 address
		shall be formatted in the "dotted decimal" notation as defined in
		IETF RFC 1166 [10]. The string for a IPv6 address shall be formatted
		according to clause 4 of IETF RFC 5952 [11], with in CIDR notation
		[12] used to provide the routing prefix.
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: String
		sourcePort:
		minItems: 0
		type: array
		description: 'Source port identity of session '
		items:
		type: string
		x-etsi-mec-cardinality: 0..N
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: String
		responses:
		"204":

config/api/mts-api.yaml

+24 −32

Original line number	Diff line number	Diff line
		@@ -458,24 +458,16 @@ components:
		flowFilter:
		- flowlabel: 1
		protocol: 5
		sourcePort:
		- 5
		- 5
		sourcePort: 5
		dscp: 0
		dstPort:
		- 6
		- 6
		dstPort: 6
		sourceIp: sourceIp
		dstIp: dstIp
		- flowlabel: 1
		protocol: 5
		sourcePort:
		- 5
		- 5
		sourcePort: 5
		dscp: 0
		dstPort:
		- 6
		- 6
		dstPort: 6
		sourceIp: sourceIp
		dstIp: dstIp
		requestType: 7
		@@ -598,18 +590,20 @@ components:
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: Uint32
		dstIp:
		description: >-
		Destination address identity of session. The string for a IPv4
		address shall be formatted in the "dotted decimal" notation as
		defined in IETF RFC 1166 [10]. The string for a IPv6 address shall
		be formatted according to clause 4 of IETF RFC 5952 [11], with in
		CIDR notation [12] used to provide the routing prefix.
		type: string
		description: Destination address identity of session (including range)
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: String
		dstPort:
		minItems: 0
		type: array
		description: Destination port identity of session
		items:
		type: integer
		format: uint32
		x-etsi-mec-cardinality: 0..N
		type: integer
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: Uint32
		flowlabel:
		type: integer
		@@ -625,29 +619,27 @@ components:
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: Uint32
		sourceIp:
		description: >-
		Source address identity of session. The string for a IPv4 address
		shall be formatted in the "dotted decimal" notation as defined in
		IETF RFC 1166 [10]. The string for a IPv6 address shall be formatted
		according to clause 4 of IETF RFC 5952 [11], with in CIDR notation
		[12] used to provide the routing prefix.
		type: string
		description: Source address identity of session (including range)
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: String
		sourcePort:
		minItems: 0
		type: array
		description: Source port identity of session
		items:
		type: integer
		format: uint32
		x-etsi-mec-cardinality: 0..N
		type: integer
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: Uint32
		example:
		flowlabel: 1
		protocol: 5
		sourcePort:
		- 5
		- 5
		sourcePort: 5
		dscp: 0
		dstPort:
		- 6
		- 6
		dstPort: 6
		sourceIp: sourceIp
		dstIp: dstIp
		MtsSessionInfo_qosD:

config/api/vis-api.yaml

+91 −8

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ paths:
		/queries/uu_unicast_provisioning_info:
		get:
		tags:
		- 'unsupported'
		- 'v2xi'
		summary: 'Used to query provisioning information for V2X communication over Uu unicast.'
		description: 'Used to query provisioning information for V2X communication over Uu unicast.'
		operationId: prov_info_uu_unicastGET
		@@ -157,7 +157,7 @@ paths:
		/publish_v2x_message:
		post:
		tags:
		- 'unsupported'
		- 'v2xi'
		summary: 'Used to publish a V2X message.'
		description: 'Used to publish a V2X message.'
		operationId: v2x_messagePOST
		@@ -167,6 +167,11 @@ paths:
		application/json:
		schema:
		$ref: '#/components/schemas/V2xMsgPublication'
		example:
		msgContent: 'Hello World'
		msgEncodeFormat: 'base64'
		msgType: 1
		stdOrganization: 'ETSI'
		responses:
		'204':
		$ref: '#/components/responses/204'
		@@ -186,7 +191,7 @@ paths:
		/subscriptions:
		get:
		tags:
		- 'unsupported'
		- 'v2xi'
		summary: 'Request information about the subscriptions for this requestor.'
		description: 'Request information about the subscriptions for this requestor.'
		operationId: subGET
		@@ -204,6 +209,16 @@ paths:
		application/json:
		schema:
		$ref: '#/components/schemas/SubscriptionLinkList'
		example:
		_links:
		self:
		href: 'http://meAppServer.example.com/vis/v2/subscriptions'
		subscription:
		- _links:
		self:
		href: 'http://meAppServer.example.com/vis/v2/subscriptions/123'
		callbackReference: 'http://my.callback.com/vis-v2x-msg/some-id'
		subscriptionType: V2xMsgSubscription
		'400':
		$ref: '#/components/responses/400'
		'401':
		@@ -218,7 +233,7 @@ paths:
		$ref: '#/components/responses/429'
		post:
		tags:
		- 'unsupported'
		- 'v2xi'
		summary: ' create a new subscription to VIS notifications.'
		description: ' create a new subscription to VIS notifications.'
		operationId: subPOST
		@@ -232,6 +247,17 @@ paths:
		- $ref: '#/components/schemas/ProvChgUuMbmsSubscription'
		- $ref: '#/components/schemas/ProvChgPc5Subscription'
		- $ref: '#/components/schemas/V2xMsgSubscription'
		example:
		subscriptionType: V2xMsgSubscription
		callbackReference: 'http://my.callback.com/vis-v2x-msg/some-id'
		filterCriteria:
		stdOrganization: 'ETSI'
		msgType:
		- 1
		- 2
		expiryDeadline:
		seconds: 1977836800
		nanoseconds: 0
		responses:
		'201':
		description: 'In the returned NotificationSubscription structure, the created subscription is described using the appropriate data type.'
		@@ -243,6 +269,20 @@ paths:
		- $ref: '#/components/schemas/ProvChgUuMbmsSubscription'
		- $ref: '#/components/schemas/ProvChgPc5Subscription'
		- $ref: '#/components/schemas/V2xMsgSubscription'
		example:
		subscriptionType: V2xMsgSubscription
		callbackReference: 'http://my.callback.com/vis-v2x-msg/some-id'
		_links:
		self:
		href: 'http://meAppServer.example.com/vis/v2/subscriptions/123'
		filterCriteria:
		stdOrganization: 'ETSI'
		msgType:
		- 1
		- 2
		expiryDeadline:
		seconds: 1977836800
		nanoseconds: 0
		'400':
		$ref: '#/components/responses/400'
		'401':
		@@ -293,7 +333,7 @@ paths:

		get:
		tags:
		- 'unsupported'
		- 'v2xi'
		summary: 'Retrieve information about this subscription.'
		description: 'Retrieve information about this subscription.'
		operationId: individualSubscriptionGET
		@@ -309,6 +349,20 @@ paths:
		- $ref: '#/components/schemas/ProvChgUuMbmsSubscription'
		- $ref: '#/components/schemas/ProvChgPc5Subscription'
		- $ref: '#/components/schemas/V2xMsgSubscription'
		example:
		subscriptionType: V2xMsgSubscription
		callbackReference: 'http://my.callback.com/vis-v2x-msg/some-id'
		_links:
		self:
		href: 'http://meAppServer.example.com/vis/v2/subscriptions/123'
		filterCriteria:
		stdOrganization: 'ETSI'
		msgType:
		- 1
		- 2
		expiryDeadline:
		seconds: 1977836800
		nanoseconds: 0
		'400':
		$ref: '#/components/responses/400'
		'401':
		@@ -324,7 +378,7 @@ paths:

		put:
		tags:
		- 'unsupported'
		- 'v2xi'
		summary: 'Used to update the existing subscription.'
		description: 'Used to update the existing subscription.'
		operationId: individualSubscriptionPUT
		@@ -338,6 +392,20 @@ paths:
		- $ref: '#/components/schemas/ProvChgUuMbmsSubscription'
		- $ref: '#/components/schemas/ProvChgPc5Subscription'
		- $ref: '#/components/schemas/V2xMsgSubscription'
		example:
		subscriptionType: V2xMsgSubscription
		callbackReference: 'http://my.callback.com/vis-v2x-msg/some-id'
		_links:
		self:
		href: 'http://meAppServer.example.com/vis/v2/subscriptions/123'
		filterCriteria:
		stdOrganization: 'ETSI'
		msgType:
		- 3
		- 4
		expiryDeadline:
		seconds: 1977836800
		nanoseconds: 0
		responses:
		'200':
		description: 'A response body containing data type describing the updated subscription is returned'
		@@ -349,6 +417,21 @@ paths:
		- $ref: '#/components/schemas/ProvChgUuMbmsSubscription'
		- $ref: '#/components/schemas/ProvChgPc5Subscription'
		- $ref: '#/components/schemas/V2xMsgSubscription'
		example:
		example:
		subscriptionType: V2xMsgSubscription
		callbackReference: 'http://my.callback.com/vis-v2x-msg/some-id'
		_links:
		self:
		href: 'http://meAppServer.example.com/vis/v2/subscriptions/123'
		filterCriteria:
		stdOrganization: 'ETSI'
		msgType:
		- 3
		- 4
		expiryDeadline:
		seconds: 1977836800
		nanoseconds: 0
		'400':
		$ref: '#/components/responses/400'
		'401':
		@@ -373,7 +456,7 @@ paths:
		$ref: '#/components/responses/429'
		delete:
		tags:
		- 'unsupported'
		- 'v2xi'
		summary: 'Used to cancel the existing subscription.'
		description: 'Used to cancel the existing subscription.'
		operationId: individualSubscriptionDELETE
		@@ -1502,7 +1585,7 @@ components:
		msgType:
		description: Subscribed V2X message type. Its value is defined by the standardization organization indicated by the attribute stdOrganization. See note 3.
		items:
		type: string
		type: integer
		minItems: 0
		type: array
		x-etsi-mec-cardinality: 0..N