Commit 01d6319c authored by Simon Pastor's avatar Simon Pastor
Browse files

new header and new yaml

parent 9e99b30c

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

+275 −365

File changed.

Preview size limit exceeded, changes collapsed.

go-apps/meep-ams/server/.ams_test.go.swp

deleted100644 → 0
−4 KiB

File deleted.

View file

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

+2 −3
Original line number Diff line number Diff line 
# Go API Server for server



ETSI GS MEC 021 Application Mobility Service API described using OpenAPI.

Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.01.01_60/gs_MEC021v020101p.pdf) <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about application mobility in the network <p>**Note**<br>AdvantEDGE supports all of Application Mobility API endpoints (see below).



## Overview

This server was generated by the [swagger-codegen]
@@ -13,8 +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: 2021-08-26T12:48:36.848-04:00[America/New_York]

For more information, please visit [https://forge.etsi.org/rep/mec/gs021-amsi-api](https://forge.etsi.org/rep/mec/gs021-amsi-api)

- Build date: 2021-09-10T13:52:34.090-04:00[America/New_York]





### Running the server

go-apps/meep-ams/server/ams.go

+9 −9
Original line number Diff line number Diff line
@@ -68,11 +68,11 @@ const ( 
	notifExpiry = "ExpiryNotification"

)



const MOBILITY_PROCEDURE_SUBSCRIPTION_INT = 1

const MOBILITY_PROCEDURE_SUBSCRIPTION_INT = int32(1)

const MOBILITY_PROCEDURE_SUBSCRIPTION = "MobilityProcedureSubscription"

const MOBILITY_PROCEDURE_NOTIFICATION = "MobilityProcedureNotification"



const ADJACENT_APP_INFO_SUBSCRIPTION_INT = 2

const ADJACENT_APP_INFO_SUBSCRIPTION_INT = int32(2)

const ADJACENT_APP_INFO_SUBSCRIPTION = "AdjacentAppInfoSubscription"

const ADJACENT_APP_INFO_NOTIFICATION = "AdjacentAppInfoNotification"
@@ -940,7 +940,7 @@ func subscriptionsPost(w http.ResponseWriter, r *http.Request) { 
			return

		}



		link := new(MobilityProcedureSubscriptionLinks)

		link := new(AdjacentAppInfoSubscriptionLinks)

		link.Self = self

		subscription.Links = link
@@ -952,7 +952,7 @@ func subscriptionsPost(w http.ResponseWriter, r *http.Request) { 


		//populate mobilityStatus

		if len(subscription.FilterCriteria.MobilityStatus) == 0 {

			subscription.FilterCriteria.MobilityStatus = append(subscription.FilterCriteria.MobilityStatus, MOBILITY_STATUS_TRIGGERED)

			subscription.FilterCriteria.MobilityStatus = append(subscription.FilterCriteria.MobilityStatus, MobilityStatus_INTERHOST_MOVEOUT_TRIGGERED)

		}



		//registration
@@ -1064,7 +1064,7 @@ func subscriptionsPut(w http.ResponseWriter, r *http.Request) { 


		//populate mobilityStatus

		if len(subscription.FilterCriteria.MobilityStatus) == 0 {

			subscription.FilterCriteria.MobilityStatus = append(subscription.FilterCriteria.MobilityStatus, MOBILITY_STATUS_TRIGGERED)

			subscription.FilterCriteria.MobilityStatus = append(subscription.FilterCriteria.MobilityStatus, MobilityStatus_INTERHOST_MOVEOUT_TRIGGERED)

		}



		//registration
@@ -1245,8 +1245,8 @@ func createSubscriptionLinkList(subType string) *SubscriptionLinkList { 
			if mpSubscription != nil {

				var subscription SubscriptionLinkListSubscription

				subscription.Href = mpSubscription.Links.Self.Href

				subType := SUBSCRIPTION_TYPE_MOBILITY_PROCEDURE

				subscription.SubscriptionType = &subType

				subType := MOBILITY_PROCEDURE_SUBSCRIPTION_INT

				subscription.SubscriptionType = subType

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

			}

		}
@@ -1257,8 +1257,8 @@ func createSubscriptionLinkList(subType string) *SubscriptionLinkList { 
			if adjSubscription != nil {

				var subscription SubscriptionLinkListSubscription

				subscription.Href = adjSubscription.Links.Self.Href

				subType := SUBSCRIPTION_TYPE_ADJACENT_APPINFO

				subscription.SubscriptionType = &subType

				subType := ADJACENT_APP_INFO_SUBSCRIPTION_INT

				subscription.SubscriptionType = subType

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

			}

		}

go-apps/meep-ams/server/ams_test.go

+13 −13
Original line number Diff line number Diff line
@@ -861,9 +861,9 @@ func testServicesPost(t *testing.T) string { 
	/******************************

	 * expected response section

	 ******************************/

	expectedAssocId1 := AssociateId{"1", "1.1.1.1"}

	appMobilityServiceLevel := WITH_CONFIRMATION

	contextTransferState := CONTEXT_TRANSFER_STATE_NOT_TRANSFERRED

	expectedAssocId1 := AssociateId{1, "1.1.1.1"}

	appMobilityServiceLevel := AppMobilityServiceLevel_APP_MOBILITY_WITH_CONFIRMATION

	contextTransferState := ContextTransferState_NOT_TRANSFERRED

	expectedDeviceInfo1 := RegistrationInfoDeviceInformation{&expectedAssocId1, &appMobilityServiceLevel, &contextTransferState}

	expectedDeviceInfo := []RegistrationInfoDeviceInformation{expectedDeviceInfo1}

	expectedRegistrationInfo := RegistrationInfo{strconv.Itoa(nextServiceIdAvailable), expectedDeviceInfo, 0, &RegistrationInfoServiceConsumerId{"myapp", ""}}
@@ -920,9 +920,9 @@ func testServicesPut(t *testing.T, serviceId string, expectSuccess bool) string 
	/******************************

	 * expected response section

	 ******************************/

	expectedAssocId1 := AssociateId{"1", "1.1.1.1"}

	appMobilityServiceLevel := WITH_CONFIRMATION

	contextTransferState := CONTEXT_TRANSFER_STATE_NOT_TRANSFERRED

	expectedAssocId1 := AssociateId{1, "1.1.1.1"}

	appMobilityServiceLevel := AppMobilityServiceLevel_APP_MOBILITY_WITH_CONFIRMATION

	contextTransferState := ContextTransferState_NOT_TRANSFERRED

	expectedDeviceInfo1 := RegistrationInfoDeviceInformation{&expectedAssocId1, &appMobilityServiceLevel, &contextTransferState}

	expectedDeviceInfo := []RegistrationInfoDeviceInformation{expectedDeviceInfo1}

	expectedRegistrationInfo := RegistrationInfo{serviceId, expectedDeviceInfo, 0, &RegistrationInfoServiceConsumerId{"myapp", ""}}
@@ -1103,13 +1103,13 @@ func testSubscriptionMobilityProcedurePost(t *testing.T) string { 
	/******************************

	 * expected response section

	 ******************************/

	expectedAssocId1 := AssociateId{"1", "1.1.1.1"}

	expectedAssocId1 := AssociateId{1, "1.1.1.1"}

	expectedAssocId := []AssociateId{expectedAssocId1}

	expectedFilter := MobilityProcedureSubscriptionFilterCriteria{"myApp", expectedAssocId, []MobilityStatus{MOBILITY_STATUS_TRIGGERED}}

	expectedFilter := MobilityProcedureSubscriptionFilterCriteria{"myApp", expectedAssocId, []MobilityStatus{MobilityStatus_INTERHOST_MOVEOUT_TRIGGERED}}

	expectedCallBackRef := "myCallbakRef"

	expectedLinkType := LinkType{"/" + testScenarioName + "/amsi/v1/subscriptions/" + strconv.Itoa(nextSubscriptionIdAvailable)}

	//expectedExpiry := TimeStamp{0, 1998599770}

	expectedResponse := MobilityProcedureSubscription{&MobilityProcedureSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, &expectedFilter, MOBILITY_PROCEDURE_SUBSCRIPTION}

	expectedResponse := MobilityProcedureSubscription{&AdjacentAppInfoSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, &expectedFilter, MOBILITY_PROCEDURE_SUBSCRIPTION}



	expectedResponseStr, err := json.Marshal(expectedResponse)

	if err != nil {
@@ -1163,13 +1163,13 @@ func testSubscriptionMobilityProcedurePut(t *testing.T, subscriptionId string, e 
	/******************************

	 * expected response section

	 ******************************/

	expectedAssocId1 := AssociateId{"1", "2.2.2.2"}

	expectedAssocId1 := AssociateId{1, "2.2.2.2"}

	expectedAssocId := []AssociateId{expectedAssocId1}

	expectedFilter := MobilityProcedureSubscriptionFilterCriteria{"myApp", expectedAssocId, []MobilityStatus{MOBILITY_STATUS_TRIGGERED}}

	expectedFilter := MobilityProcedureSubscriptionFilterCriteria{"myApp", expectedAssocId, []MobilityStatus{MobilityStatus_INTERHOST_MOVEOUT_TRIGGERED}}

	expectedCallBackRef := "myCallbakRef"

	expectedLinkType := LinkType{"/" + testScenarioName + "/amsi/v1/subscriptions/" + subscriptionId}

	//expectedExpiry := TimeStamp{0, 1998599770}

	expectedResponse := MobilityProcedureSubscription{&MobilityProcedureSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, &expectedFilter, MOBILITY_PROCEDURE_SUBSCRIPTION}

	expectedResponse := MobilityProcedureSubscription{&AdjacentAppInfoSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, &expectedFilter, MOBILITY_PROCEDURE_SUBSCRIPTION}



	expectedResponseStr, err := json.Marshal(expectedResponse)

	if err != nil {
@@ -1185,7 +1185,7 @@ func testSubscriptionMobilityProcedurePut(t *testing.T, subscriptionId string, e 
	/******************************

	 * request body section

	 ******************************/

	mobilityProcedureSubscription1 := MobilityProcedureSubscription{&MobilityProcedureSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, &expectedFilter, MOBILITY_PROCEDURE_SUBSCRIPTION}

	mobilityProcedureSubscription1 := MobilityProcedureSubscription{&AdjacentAppInfoSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, &expectedFilter, MOBILITY_PROCEDURE_SUBSCRIPTION}



	body, err := json.Marshal(mobilityProcedureSubscription1)

	if err != nil {