rnis final merge (69a9593e) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

.meepctl-repocfg.yaml

+1 −9

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ repo:
		# platform ingress configuration
		ingress:
		# host name
		host: my-advantedge.com
		host: 10.3.16.150
		# enable https only (redirect http requests to https port)
		https-only: true
		# bind to host ports (true) or node ports (false)
		@@ -290,7 +290,6 @@ repo:
		- sandbox.go-apps.meep-gis-engine
		- sandbox.go-apps.meep-loc-serv
		- sandbox.go-apps.meep-rnis
		- packages.go-packages.meep-rnis-notification-client
		- sandbox.go-apps.meep-wais
		- packages.go-packages.meep-wais-notification-client
		- sandbox.go-apps.meep-metrics-engine
		@@ -723,13 +722,6 @@ repo:
		src: go-packages/meep-rnis-client
		# supports linting
		lint: false
		meep-rnis-notification-client:
		# location of source code
		src: go-packages/meep-rnis-notification-client
		# supports linting
		lint: false
		# location of API specification
		api: go-packages/meep-rnis-notification-client/api/swagger.yaml
		meep-sandbox-ctrl-client:
		# location of source code
		src: go-packages/meep-sandbox-ctrl-client

go-apps/meep-rnis/api/swagger.yaml

+287 −350

Original line number	Diff line number	Diff line
		@@ -48,10 +48,7 @@ paths:
		content:
		application/json:
		schema:
		type: object
		properties:
		rabInfo:
		$ref: '#/components/schemas/RabInfo'
		$ref: '#/components/schemas/InlineRabInfo'
		'400':
		$ref: '#/components/responses/400'
		'401':
		@@ -80,12 +77,7 @@ paths:
		content:
		application/json:
		schema:
		type: "object"
		properties:
		plmnInfo:
		type: "array"
		items:
		$ref: '#/components/schemas/PlmnInfo'
		$ref: '#/components/schemas/InlinePlmnInfo'
		'400':
		$ref: '#/components/responses/400'
		'401':
		@@ -120,12 +112,7 @@ paths:
		content:
		application/json:
		schema:
		type: "object"
		required:
		- "s1BearerInfo"
		properties:
		s1BearerInfo:
		$ref: '#/components/schemas/S1BearerInfo'
		$ref: '#/components/schemas/InlineS1BearerInfo'
		'400':
		$ref: '#/components/responses/400'
		'401':
		@@ -192,12 +179,7 @@ paths:
		content:
		application/json:
		schema:
		type: "object"
		required:
		- "l2Meas"
		properties:
		l2Meas:
		$ref: '#/components/schemas/L2Meas'
		$ref: '#/components/schemas/InlineL2Meas'
		'400':
		$ref: '#/components/responses/400'
		'401':
		@@ -228,12 +210,7 @@ paths:
		content:
		application/json:
		schema:
		type: object
		required:
		- subscriptionLinkList
		properties:
		subscriptionLinkList:
		$ref: '#/components/schemas/SubscriptionLinkList'
		$ref: '#/components/schemas/InlineSubscriptionLinkList'
		example:
		subscriptionLinkList:
		_links:
		@@ -270,21 +247,7 @@ paths:
		content:
		application/json:
		schema:
		type: object
		properties:
		notificationSubscription:
		oneOf:
		- $ref: '#/components/schemas/CellChangeSubscription'
		- $ref: '#/components/schemas/RabEstSubscription'
		- $ref: '#/components/schemas/RabModSubscription'
		- $ref: '#/components/schemas/RabRelSubscription'
		- $ref: '#/components/schemas/MeasRepUeSubscription'
		- $ref: '#/components/schemas/NrMeasRepUeSubscription'
		- $ref: '#/components/schemas/MeasTaSubscription'
		- $ref: '#/components/schemas/CaReconfSubscription'
		- $ref: '#/components/schemas/S1BearerSubscription'
		discriminator:
		propertyName: subscriptionType
		$ref: '#/components/schemas/InlineNotificationSubscription'
		example:
		notificationSubscription:
		subscriptionType: CellChangeSubscription
		@@ -311,21 +274,7 @@ paths:
		content:
		application/json:
		schema:
		type: object
		properties:
		notificationSubscription:
		oneOf:
		- $ref: '#/components/schemas/CellChangeSubscription'
		- $ref: '#/components/schemas/RabEstSubscription'
		- $ref: '#/components/schemas/RabModSubscription'
		- $ref: '#/components/schemas/RabRelSubscription'
		- $ref: '#/components/schemas/MeasRepUeSubscription'
		- $ref: '#/components/schemas/NrMeasRepUeSubscription'
		- $ref: '#/components/schemas/MeasTaSubscription'
		- $ref: '#/components/schemas/CaReconfSubscription'
		- $ref: '#/components/schemas/S1BearerSubscription'
		discriminator:
		propertyName: subscriptionType
		$ref: '#/components/schemas/InlineNotificationSubscription'
		example:
		notificationSubscription:
		subscriptionType: CellChangeSubscription
		@@ -378,21 +327,7 @@ paths:
		content:
		application/json:
		schema:
		type: object
		properties:
		notification:
		oneOf:
		- $ref: '#/components/schemas/CellChangeNotification'
		- $ref: '#/components/schemas/RabEstNotification'
		- $ref: '#/components/schemas/RabModNotification'
		- $ref: '#/components/schemas/RabRelNotification'
		- $ref: '#/components/schemas/MeasRepUeNotification'
		- $ref: '#/components/schemas/NrMeasRepUeNotification'
		- $ref: '#/components/schemas/MeasTaNotification'
		- $ref: '#/components/schemas/CaReconfNotification'
		- $ref: '#/components/schemas/S1BearerNotification'
		discriminator:
		propertyName: notificationType
		$ref: '#/components/schemas/InlineNotification'
		example:
		notification:
		notificationType: CellChangeNotification
		@@ -435,23 +370,7 @@ paths:
		content:
		application/json:
		schema:
		type: object
		required:
		- notificationSubscription
		properties:
		notificationSubscription:
		oneOf:
		- $ref: '#/components/schemas/CellChangeSubscription'
		- $ref: '#/components/schemas/RabEstSubscription'
		- $ref: '#/components/schemas/RabModSubscription'
		- $ref: '#/components/schemas/RabRelSubscription'
		- $ref: '#/components/schemas/MeasRepUeSubscription'
		- $ref: '#/components/schemas/NrMeasRepUeSubscription'
		- $ref: '#/components/schemas/MeasTaSubscription'
		- $ref: '#/components/schemas/CaReconfSubscription'
		- $ref: '#/components/schemas/S1BearerSubscription'
		discriminator:
		propertyName: subscriptionType
		$ref: '#/components/schemas/InlineNotificationSubscription'
		example:
		notificationSubscription:
		subscriptionType: CellChangeSubscription
		@@ -500,21 +419,7 @@ paths:
		content:
		application/json:
		schema:
		type: object
		properties:
		notificationSubscription:
		oneOf:
		- $ref: '#/components/schemas/CellChangeSubscription'
		- $ref: '#/components/schemas/RabEstSubscription'
		- $ref: '#/components/schemas/RabModSubscription'
		- $ref: '#/components/schemas/RabRelSubscription'
		- $ref: '#/components/schemas/MeasRepUeSubscription'
		- $ref: '#/components/schemas/NrMeasRepUeSubscription'
		- $ref: '#/components/schemas/MeasTaSubscription'
		- $ref: '#/components/schemas/CaReconfSubscription'
		- $ref: '#/components/schemas/S1BearerSubscription'
		discriminator:
		propertyName: subscriptionType
		$ref: '#/components/schemas/InlineNotificationSubscription'
		example:
		notificationSubscription:
		subscriptionType: CellChangeSubscription
		@@ -546,21 +451,7 @@ paths:
		content:
		application/json:
		schema:
		type: object
		properties:
		notificationSubscription:
		oneOf:
		- $ref: '#/components/schemas/CellChangeSubscription'
		- $ref: '#/components/schemas/RabEstSubscription'
		- $ref: '#/components/schemas/RabModSubscription'
		- $ref: '#/components/schemas/RabRelSubscription'
		- $ref: '#/components/schemas/MeasRepUeSubscription'
		- $ref: '#/components/schemas/NrMeasRepUeSubscription'
		- $ref: '#/components/schemas/MeasTaSubscription'
		- $ref: '#/components/schemas/CaReconfSubscription'
		- $ref: '#/components/schemas/S1BearerSubscription'
		discriminator:
		propertyName: subscriptionType
		$ref: '#/components/schemas/InlineNotificationSubscription'
		example:
		notificationSubscription:
		subscriptionType: CellChangeSubscription
		@@ -630,77 +521,51 @@ components:
		content:
		application/json:
		schema:
		type: object
		properties:
		problemDetails:
		$ref: '#/components/schemas/ProblemDetails'
		$ref: '#/components/schemas/InlineProblemDetails'
		401:
		description: 'Unauthorized : used when the client did not submit credentials.'
		content:
		application/json:
		schema:
		type: object
		properties:
		problemDetails:
		$ref: '#/components/schemas/ProblemDetails'
		$ref: '#/components/schemas/InlineProblemDetails'
		403:
		description: 'Forbidden : operation is not allowed given the current status of the resource.'
		content:
		application/json:
		schema:
		type: object
		required:
		- problemDetails
		properties:
		problemDetails:
		$ref: '#/components/schemas/ProblemDetails'
		$ref: '#/components/schemas/InlineProblemDetailsRequired'
		404:
		description: 'Not Found : used when a client provided a URI that cannot be mapped to a valid resource URI.'
		content:
		application/json:
		schema:
		type: object
		properties:
		problemDetails:
		$ref: '#/components/schemas/ProblemDetails'
		$ref: '#/components/schemas/InlineProblemDetails'
		406:
		description: 'Not Acceptable : used to indicate that the server cannot provide the any of the content formats supported by the client.'
		content:
		application/json:
		schema:
		type: object
		properties:
		problemDetails:
		$ref: '#/components/schemas/ProblemDetails'
		$ref: '#/components/schemas/InlineProblemDetails'
		412:
		description: 'Precondition failed : used when a condition has failed during conditional requests, e.g. when
		using ETags to avoid write conflicts when using PUT'
		content:
		application/json:
		schema:
		type: object
		properties:
		problemDetails:
		$ref: '#/components/schemas/ProblemDetails'
		$ref: '#/components/schemas/InlineProblemDetails'
		414:
		description: 'URI Too Long : used to indicate that the server is refusing to process the request because the request URI is
		longer than the server is willing or able to process.'
		content:
		application/json:
		schema:
		type: object
		properties:
		problemDetails:
		$ref: '#/components/schemas/ProblemDetails'
		$ref: '#/components/schemas/InlineProblemDetails'
		415:
		description: 'Unsupported Media Type : used to indicate that the server or the client does not support the content type of the entity body.'
		content:
		application/json:
		schema:
		type: object
		properties:
		problemDetails:
		$ref: '#/components/schemas/ProblemDetails'
		$ref: '#/components/schemas/InlineProblemDetails'
		422:
		description: 'Unprocessable Entity : used to indicate that the server understands the content type of the request entity and that the
		syntax of the request entity is correct but that the server is unable to process the contained instructions. This error condition can occur if an
		@@ -709,10 +574,7 @@ components:
		content:
		application/json:
		schema:
		type: object
		properties:
		problemDetails:
		$ref: '#/components/schemas/ProblemDetails'
		$ref: '#/components/schemas/InlineProblemDetails'
		example:
		application/problem+json:
		problemDetails:
		@@ -726,10 +588,7 @@ components:
		content:
		application/json:
		schema:
		type: object
		properties:
		problemDetails:
		$ref: '#/components/schemas/ProblemDetails'
		$ref: '#/components/schemas/InlineProblemDetails'
		parameters:
		Path.subscrId:
		name: subscriptionId
		@@ -3399,6 +3258,7 @@ components:
		type: object
		x-etsi-mec-cardinality: 0..1
		x-etsi-mec-origin-type: Structure (inlined)
		type: object
		minItems: 1
		required:
		- associateId
		@@ -3430,7 +3290,6 @@ components:
		x-etsi-mec-origin-type: Enum
		s1UeInfo:
		description: Information on specific UE that matches the criteria in S1BearerSubscription as defined below.
		items:
		properties:
		associateId:
		description: 0 to N identifiers to associate the information for a specific UE or flow.
		@@ -3721,4 +3580,82 @@ components:
		- 30
		- 31
		type: integer
		InlineRabInfo:
		type: object
		properties:
		rabInfo:
		$ref: '#/components/schemas/RabInfo'
		InlinePlmnInfo:
		type: "object"
		properties:
		plmnInfo:
		type: "array"
		items:
		$ref: '#/components/schemas/PlmnInfo'
		InlineS1BearerInfo:
		type: "object"
		required:
		- "s1BearerInfo"
		properties:
		s1BearerInfo:
		$ref: '#/components/schemas/S1BearerInfo'
		InlineL2Meas:
		type: "object"
		required:
		- "l2Meas"
		properties:
		l2Meas:
		$ref: '#/components/schemas/L2Meas'
		InlineSubscriptionLinkList:
		description: Response body contains the list of links to requestors subscriptions.
		type: object
		required:
		- subscriptionLinkList
		properties:
		subscriptionLinkList:
		$ref: '#/components/schemas/SubscriptionLinkList'
		InlineNotificationSubscription:
		type: object
		properties:
		notificationSubscription:
		oneOf:
		- $ref: '#/components/schemas/CellChangeSubscription'
		- $ref: '#/components/schemas/RabEstSubscription'
		- $ref: '#/components/schemas/RabModSubscription'
		- $ref: '#/components/schemas/RabRelSubscription'
		- $ref: '#/components/schemas/MeasRepUeSubscription'
		- $ref: '#/components/schemas/NrMeasRepUeSubscription'
		- $ref: '#/components/schemas/MeasTaSubscription'
		- $ref: '#/components/schemas/CaReconfSubscription'
		- $ref: '#/components/schemas/S1BearerSubscription'
		discriminator:
		propertyName: subscriptionType
		InlineNotification:
		type: object
		properties:
		notification:
		oneOf:
		- $ref: '#/components/schemas/CellChangeNotification'
		- $ref: '#/components/schemas/RabEstNotification'
		- $ref: '#/components/schemas/RabModNotification'
		- $ref: '#/components/schemas/RabRelNotification'
		- $ref: '#/components/schemas/MeasRepUeNotification'
		- $ref: '#/components/schemas/NrMeasRepUeNotification'
		- $ref: '#/components/schemas/MeasTaNotification'
		- $ref: '#/components/schemas/CaReconfNotification'
		- $ref: '#/components/schemas/S1BearerNotification'
		discriminator:
		propertyName: notificationType
		InlineProblemDetails:
		type: object
		properties:
		problemDetails:
		$ref: '#/components/schemas/ProblemDetails'
		InlineProblemDetailsRequired:
		type: object
		required:
		- problemDetails
		properties:
		problemDetails:
		$ref: '#/components/schemas/ProblemDetails'

go-apps/meep-rnis/go.mod

+0 −2

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@ require (
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-client v0.0.0 // indirect
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-notification-client v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sessions v0.0.0
		github.com/antihax/optional v1.0.0 // indirect
		github.com/gorilla/handlers v1.4.0
		@@ -33,6 +32,5 @@ replace (
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq => ../../go-packages/meep-mq
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis => ../../go-packages/meep-redis
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-client => ../../go-packages/meep-rnis-client
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-notification-client => ../../go-packages/meep-rnis-notification-client
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sessions => ../../go-packages/meep-sessions
		)

go-apps/meep-rnis/server/README.md

+2 −2

Original line number	Diff line number	Diff line
		@@ -12,8 +12,8 @@ To see how to make this your own, look here:

		[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)

		- API version: 1.1.1
		- Build date: 2020-11-06T11:19:56.637-05:00
		- API version: 2.1.1
		- Build date: 2020-11-11T18:33:48.053-05:00[America/New_York]


		### Running the server

go-apps/meep-rnis/server/model_all_ofbody_notification_subscription.go

deleted100644 → 0

+0 −34

Original line number	Diff line number	Diff line
		/*
		* AdvantEDGE Radio Network Information Service REST API
		*
		* Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.01.01_60/gs_MEC012v020101p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>Micro-service<br>[meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis) <p>Type & Usage<br>Edge Service used by edge applications that want to get information about radio conditions in the network <p>Details<br>API details available at _your-AdvantEDGE-ip-address/api_
		*
		* API version: 2.1.1
		* Contact: AdvantEDGE@InterDigital.com
		* Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
		*/
		package server

		type AllOfbodyNotificationSubscription struct {
		Links *CaReconfSubscriptionLinks `json:"_links,omitempty"`
		// URI selected by the service consumer, to receive notifications on the subscribed RNIS information. This shall be included in the request and response.
		CallbackReference string `json:"callbackReference"`

		ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"`

		FilterCriteriaQci *RabModSubscriptionFilterCriteriaQci `json:"filterCriteriaQci"`
		// Shall be set to \"S1BearerSubscription\".
		SubscriptionType string `json:"subscriptionType"`

		FilterCriteriaAssocTri *MeasRepUeSubscriptionFilterCriteriaAssocTri `json:"filterCriteriaAssocTri"`

		FilterCriteriaNrMrs *NrMeasRepUeSubscriptionFilterCriteriaNrMrs `json:"filterCriteriaNrMrs"`

		FilterCriteriaAssoc *CaReconfSubscriptionFilterCriteriaAssoc `json:"filterCriteriaAssoc"`

		S1BearerSubscriptionCriteria *S1BearerSubscriptionS1BearerSubscriptionCriteria `json:"S1BearerSubscriptionCriteria"`
		// Description of the subscribed event. The event is included both in the request and in the response. \\nFor the eventType, the following values are currently defined: 0 = RESERVED. 1 = S1_BEARER_ESTABLISH. 2 = S1_BEARER_MODIFY. 3 = S1_BEARER_RELEASE.
		EventType []string `json:"eventType"`

		FilterCriteriaAssocHo *CellChangeSubscriptionFilterCriteriaAssocHo `json:"filterCriteriaAssocHo"`
		}