Commit f7780f0d authored by Simon Pastor's avatar Simon Pastor
Browse files

latest implementation after removal of all inline

parent 69a9593e

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

+211 −232
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ paths: 
          content:

            application/json:

              schema:

                $ref: '#/components/schemas/InlineRabInfo'

                $ref: '#/components/schemas/RabInfo'

        '400':

          $ref: '#/components/responses/400'

        '401':
@@ -77,7 +77,7 @@ paths: 
          content:

            application/json:

              schema:

                $ref: '#/components/schemas/InlinePlmnInfo'

                $ref: '#/components/schemas/PlmnInfo'

        '400':

          $ref: '#/components/responses/400'

        '401':
@@ -112,7 +112,7 @@ paths: 
          content:

            application/json:

              schema:

                $ref: '#/components/schemas/InlineS1BearerInfo'

                $ref: '#/components/schemas/S1BearerInfo'

        '400':

          $ref: '#/components/responses/400'

        '401':
@@ -179,7 +179,7 @@ paths: 
          content:

            application/json:

              schema:

                $ref: '#/components/schemas/InlineL2Meas'

                $ref: '#/components/schemas/L2Meas'

        '400':

          $ref: '#/components/responses/400'

        '401':
@@ -210,9 +210,8 @@ paths: 
          content:

            application/json:

              schema:

                $ref: '#/components/schemas/InlineSubscriptionLinkList'

                $ref: '#/components/schemas/SubscriptionLinkList'

              example:

                subscriptionLinkList:

                _links:

                  self:

                    href: 'http://meAppServer.example.com/rni/v2/subscriptions'
@@ -247,9 +246,19 @@ paths: 
        content:

          application/json:

            schema:

              $ref: '#/components/schemas/InlineNotificationSubscription'

              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

            example:

              notificationSubscription:

              subscriptionType: CellChangeSubscription

              callbackReference: 'http://my.callback.com/rni-cell-change/some-id'

              filterCriteriaAssocHo:
@@ -274,9 +283,19 @@ paths: 
          content:

            application/json:

              schema:

                $ref: '#/components/schemas/InlineNotificationSubscription'

                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

              example:

                notificationSubscription:

                subscriptionType: CellChangeSubscription

                callbackReference: 'http://my.callback.com/rni-cell-change/some-id'

                _links:
@@ -327,9 +346,19 @@ paths: 
                content:

                  application/json:

                    schema:

                      $ref: '#/components/schemas/InlineNotification'

                      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

                    example:

                      notification:

                      notificationType: CellChangeNotification

                      associateId:

                      - type: 1
@@ -370,9 +399,19 @@ paths: 
          content:

            application/json:

              schema:

                $ref: '#/components/schemas/InlineNotificationSubscription'

                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

              example:

                notificationSubscription:

                subscriptionType: CellChangeSubscription

                callbackReference: 'http://my.callback.com/rni-cell-change/some-id'

                _links:
@@ -419,9 +458,19 @@ paths: 
        content:

          application/json:

            schema:

              $ref: '#/components/schemas/InlineNotificationSubscription'

              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

            example:

              notificationSubscription:

              subscriptionType: CellChangeSubscription

              callbackReference: 'http://my.callback.com/rni-cell-change/some-id'

              _links:
@@ -451,9 +500,19 @@ paths: 
          content:

            application/json:

              schema:

                $ref: '#/components/schemas/InlineNotificationSubscription'

                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

              example:

                notificationSubscription:

                subscriptionType: CellChangeSubscription

                callbackReference: 'http://my.callback.com/rni-cell-change/some-id'

                _links:
@@ -519,65 +578,64 @@ components: 
    400:

      description: 'Bad Request : used to indicate that incorrect parameters were passed to the request.'

      content:

        application/json:

        application/problem+json:

          schema:

            $ref: '#/components/schemas/InlineProblemDetails'

            $ref: '#/components/schemas/ProblemDetails'

    401:

      description: 'Unauthorized :  used when the client did not submit credentials.'

      content:

        application/json:

        application/problem+json:

          schema:

            $ref: '#/components/schemas/InlineProblemDetails'

            $ref: '#/components/schemas/ProblemDetails'

    403:

      description: 'Forbidden :  operation is not allowed given the current status of the resource.'

      content:

        application/json:

        application/problem+json:

          schema:

            $ref: '#/components/schemas/InlineProblemDetailsRequired'

            $ref: '#/components/schemas/ProblemDetails'

    404:

      description: 'Not Found :  used when a client provided a URI that cannot be mapped to a valid resource URI.'

      content:

        application/json:

        application/problem+json:

          schema:

            $ref: '#/components/schemas/InlineProblemDetails'

            $ref: '#/components/schemas/ProblemDetails'

    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:

        application/problem+json:

          schema:

            $ref: '#/components/schemas/InlineProblemDetails'

            $ref: '#/components/schemas/ProblemDetails'

    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:

        application/problem+json:

          schema:

            $ref: '#/components/schemas/InlineProblemDetails'

            $ref: '#/components/schemas/ProblemDetails'

    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:

        application/problem+json:

          schema:

            $ref: '#/components/schemas/InlineProblemDetails'

            $ref: '#/components/schemas/ProblemDetails'

    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:

        application/problem+json:

          schema:

            $ref: '#/components/schemas/InlineProblemDetails'

            $ref: '#/components/schemas/ProblemDetails'

    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

        JSON request body is syntactically correct but semantically incorrect, for example if the target area for the request is considered too large. This

        error condition can also occur if the capabilities required by the request are not supported.'

      content:

        application/json:

        application/problem+json:

          schema:

            $ref: '#/components/schemas/InlineProblemDetails'

            $ref: '#/components/schemas/ProblemDetails'

          example:

            application/problem+json:

              problemDetails:

              type: 'https://meAppServer.example.com/rni/v2/probs/too-many targets'

              title: Too many targets

              status: '422'
@@ -586,9 +644,9 @@ components: 
    429:

      description: 'Too Many Requests : used when a rate limiter has triggered.'

      content:

        application/json:

        application/problem+json:

          schema:

            $ref: '#/components/schemas/InlineProblemDetails'

            $ref: '#/components/schemas/ProblemDetails'

  parameters:

    Path.subscrId:

      name: subscriptionId
@@ -3580,82 +3638,3 @@ 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/server/README.md

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ To see how to make this your own, look here: 
[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)



- API version: 2.1.1

- Build date: 2020-11-11T18:33:48.053-05:00[America/New_York]

- Build date: 2020-11-12T10:55:28.376-05:00[America/New_York]





### Running the server

go-apps/meep-rnis/server/model_inline_l2_meas.go→go-apps/meep-rnis/server/model_body.go

+1 −2
Original line number Diff line number Diff line
@@ -9,6 +9,5 @@ 
 */

package server



type InlineL2Meas struct {

	L2Meas *L2Meas `json:"l2Meas"`

type Body struct {

}

go-apps/meep-rnis/server/model_inline_rab_info.go→go-apps/meep-rnis/server/model_body_1.go

+1 −2
Original line number Diff line number Diff line
@@ -9,6 +9,5 @@ 
 */

package server



type InlineRabInfo struct {

	RabInfo *RabInfo `json:"rabInfo,omitempty"`

type Body1 struct {

}

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

deleted100644 → 0
+0 −14
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 InlineCaNotification struct {

	Notification *CaReconfNotification `json:"notification,omitempty"`

}