Commit 611278c3 authored by Simon Pastor's avatar Simon Pastor
Browse files

revert changes to subscriptionlinkLink

parent 527490b1

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

+14 −31
Original line number Diff line number Diff line
@@ -2037,45 +2037,28 @@ components: 
    SubscriptionLinkList:

      properties:

        _links:

          description: List of hyperlinks related to the resource.

          description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests.

          properties:

            self:

              # description': ''

              # x-etsi-mec-cardinality': '1'

              # x-etsi-mec-origin-type': LinkType

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

            subscription:

              description: A link to a subscription.

              items:

          type: object

                properties:

                  href:

                    description: The URI referring to the subscription.

                    format: uri

                    type: string

                    x-etsi-mec-cardinality: '1'

                    x-etsi-mec-origin-type: URI

                  subscriptionType:

                    description: "Type of the subscription. The string shall be set according to the \"subscriptionType\" attribute of the associated subscription data type event."

                    type: string

                    x-etsi-mec-cardinality: '1'

                    x-etsi-mec-origin-type: String

              minItems: 0

              required:

              - href

              - subscriptionType

          x-etsi-mec-cardinality: 0..1

          x-etsi-mec-origin-type: Structure (inlined)

        assocStaSubscription:

          items:

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

          type: array

          x-etsi-mec-cardinality: 0..N

              x-etsi-mec-origin-type: Structure (inlined)

          required:

          - self

          type: object

          x-etsi-mec-cardinality: '1'

          x-etsi-mec-origin-type: Structure (inlined)

          x-etsi-mec-origin-type: AssocStaSubscription

        staDataRateSubscription:

          items:

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

          type: array

          x-etsi-mec-cardinality: 0..N

          x-etsi-mec-origin-type: StaDataRateSubscription

      required:

      - _links

      type: object

      x-etsi-ref: not defined

    TimeStamp:

      properties:

        nanoSeconds:

go-apps/meep-wais/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-15T22:25:55.827981-05:00[America/Toronto]

- Build date: 2020-11-16T10:03:15.079-05:00[America/New_York]





### Running the server

go-apps/meep-wais/server/model_subscription_link_list.go

+4 −0
Original line number Diff line number Diff line
@@ -25,4 +25,8 @@ package server 


type SubscriptionLinkList struct {

	Links *SubscriptionLinkListLinks `json:"_links"`



	AssocStaSubscription []AssocStaSubscription `json:"assocStaSubscription,omitempty"`



	StaDataRateSubscription []StaDataRateSubscription `json:"staDataRateSubscription,omitempty"`

}

go-apps/meep-wais/server/model_subscription_link_list__links.go

+2 −4
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ 
 */

package server



// List of hyperlinks related to the resource.

// Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests.

type SubscriptionLinkListLinks struct {

	Self *LinkType `json:"self"`

	// A link to a subscription.

	Subscription []SubscriptionLinkListLinksSubscription `json:"subscription,omitempty"`

	Self *LinkType `json:"self,omitempty"`

}

go-apps/meep-wais/server/wais.go

+1 −4
Original line number Diff line number Diff line
@@ -854,10 +854,7 @@ func createSubscriptionLinkList(subType string) *SubscriptionLinkList { 
		//loop through assocSta map

		for _, assocStaSubscription := range assocStaSubscriptionMap {

			if assocStaSubscription != nil {

				var subscription SubscriptionLinkListLinksSubscription

				subscription.Href = assocStaSubscription.Links.Self.Href

				subscription.SubscriptionType = ASSOC_STA_SUBSCRIPTION

				subscriptionLinkList.Links.Subscription = append(subscriptionLinkList.Links.Subscription, subscription)

				subscriptionLinkList.AssocStaSubscription = append(subscriptionLinkList.AssocStaSubscription, *assocStaSubscription)

			}

		}

	}