loc-serv with inline response objects (db5fb52f) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-apps/meep-loc-serv/api/swagger.yaml

+2971 −2924

File changed.

Preview size limit exceeded, changes collapsed.

go-apps/meep-loc-serv/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-10T14:51:39.749-05:00[America/New_York]
		- Build date: 2020-11-11T09:41:30.086-05:00[America/New_York]


		### Running the server

go-apps/meep-loc-serv/server/loc-serv.go

+32 −32

Original line number	Diff line number	Diff line
		@@ -621,7 +621,7 @@ func usersGet(w http.ResponseWriter, r *http.Request) {
		userData.queryAddress = q.Get("address")

		// Get user list from DB
		var response InlineResponseUserList
		var response InlineUserList
		var userList UserList
		userList.ResourceURL = hostUrl.String() + basePath + "users"
		response.UserList = &userList
		@@ -694,7 +694,7 @@ func apGet(w http.ResponseWriter, r *http.Request) {
		userData.queryInterestRealm = q.Get("interestRealm")

		// Get user list from DB
		var response InlineResponseAccessPointList
		var response InlineAccessPointList
		var apList AccessPointList
		apList.ZoneId = vars["zoneId"]
		apList.ResourceURL = hostUrl.String() + basePath + "zones/" + vars["zoneId"] + "/accessPoints"
		@@ -724,7 +724,7 @@ func apByIdGet(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
		vars := mux.Vars(r)

		var response InlineResponseAccessPointInfo
		var response InlineAccessPointInfo
		var apInfo AccessPointInfo
		response.AccessPointInfo = &apInfo

		@@ -754,7 +754,7 @@ func apByIdGet(w http.ResponseWriter, r *http.Request) {
		func zonesGet(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")

		var response InlineResponseZoneList
		var response InlineZoneList
		var zoneList ZoneList
		zoneList.ResourceURL = hostUrl.String() + basePath + "zones"
		response.ZoneList = &zoneList
		@@ -781,7 +781,7 @@ func zonesByIdGet(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
		vars := mux.Vars(r)

		var response InlineResponseZoneInfo
		var response InlineZoneInfo
		var zoneInfo ZoneInfo
		response.ZoneInfo = &zoneInfo

		@@ -870,7 +870,7 @@ func userTrackingSubDelete(w http.ResponseWriter, r *http.Request) {
		func userTrackingSubListGet(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")

		var response InlineResponseNotificationSubscriptionList
		var response InlineNotificationSubscriptionList
		var userTrackingSubList NotificationSubscriptionList
		userTrackingSubList.ResourceURL = hostUrl.String() + basePath + "subscriptions/userTracking"
		response.NotificationSubscriptionList = &userTrackingSubList
		@@ -897,9 +897,9 @@ func userTrackingSubGet(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
		vars := mux.Vars(r)

		var response InlineResponseUserTrackingNotificationSubscription
		var response InlineUserTrackingSubscription
		var userTrackingSub UserTrackingSubscription
		response.UserTrackingNotificationSubscription = &userTrackingSub
		response.UserTrackingSubscription = &userTrackingSub

		jsonUserTrackingSub, _ := rc.JSONGetEntry(baseKey+typeUserSubscription+":"+vars["subscriptionId"], ".")
		if jsonUserTrackingSub == "" {
		@@ -927,9 +927,9 @@ func userTrackingSubGet(w http.ResponseWriter, r *http.Request) {
		func userTrackingSubPost(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")

		var response InlineResponseUserTrackingNotificationSubscription
		var response InlineUserTrackingSubscription

		var body InlineRequestBodyUserTrackingNotificationSubscription
		var body InlineUserTrackingSubscription
		decoder := json.NewDecoder(r.Body)
		err := decoder.Decode(&body)
		if err != nil {
		@@ -953,7 +953,7 @@ func userTrackingSubPost(w http.ResponseWriter, r *http.Request) {

		_ = rc.JSONSetEntry(baseKey+typeUserSubscription+":"+subsIdStr, ".", convertUserSubscriptionToJson(userTrackingSub))

		response.UserTrackingNotificationSubscription = userTrackingSub
		response.UserTrackingSubscription = userTrackingSub

		jsonResponse, err := json.Marshal(response)
		if err != nil {
		@@ -969,9 +969,9 @@ func userTrackingSubPut(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
		vars := mux.Vars(r)

		var response InlineResponseUserTrackingNotificationSubscription
		var response InlineUserTrackingSubscription

		var body InlineRequestBodyUserTrackingNotificationSubscription
		var body InlineUserTrackingSubscription
		decoder := json.NewDecoder(r.Body)
		err := decoder.Decode(&body)
		if err != nil {
		@@ -1021,7 +1021,7 @@ func userTrackingSubPut(w http.ResponseWriter, r *http.Request) {
		deregisterUser(subsIdStr)
		registerUser(userTrackingSub.Address, userTrackingSub.UserEventCriteria, subsIdStr)

		response.UserTrackingNotificationSubscription = userTrackingSub
		response.UserTrackingSubscription = userTrackingSub

		jsonResponse, err := json.Marshal(response)
		if err != nil {
		@@ -1064,7 +1064,7 @@ func zonalTrafficSubDelete(w http.ResponseWriter, r *http.Request) {
		func zonalTrafficSubListGet(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")

		var response InlineResponseNotificationSubscriptionList
		var response InlineNotificationSubscriptionList
		var zonalTrafficSubList NotificationSubscriptionList
		zonalTrafficSubList.ResourceURL = hostUrl.String() + basePath + "subscriptions/zonalTraffic"
		response.NotificationSubscriptionList = &zonalTrafficSubList
		@@ -1091,9 +1091,9 @@ func zonalTrafficSubGet(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
		vars := mux.Vars(r)

		var response InlineResponseZonalTrafficNotificationSubscription
		var response InlineZonalTrafficSubscription
		var zonalTrafficSub ZonalTrafficSubscription
		response.ZonalTrafficNotificationSubscription = &zonalTrafficSub
		response.ZonalTrafficSubscription = &zonalTrafficSub
		jsonZonalTrafficSub, _ := rc.JSONGetEntry(baseKey+typeZonalSubscription+":"+vars["subscriptionId"], ".")
		if jsonZonalTrafficSub == "" {
		w.WriteHeader(http.StatusNotFound)
		@@ -1120,9 +1120,9 @@ func zonalTrafficSubGet(w http.ResponseWriter, r *http.Request) {
		func zonalTrafficSubPost(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")

		var response InlineResponseZonalTrafficNotificationSubscription
		var response InlineZonalTrafficSubscription

		var body InlineRequestBodyZonalTrafficNotificationSubscription
		var body InlineZonalTrafficSubscription
		decoder := json.NewDecoder(r.Body)
		err := decoder.Decode(&body)
		if err != nil {
		@@ -1158,7 +1158,7 @@ func zonalTrafficSubPost(w http.ResponseWriter, r *http.Request) {

		registerZonal(zonalTrafficSub.ZoneId, zonalTrafficSub.UserEventCriteria, subsIdStr)

		response.ZonalTrafficNotificationSubscription = zonalTrafficSub
		response.ZonalTrafficSubscription = zonalTrafficSub

		jsonResponse, err := json.Marshal(response)
		if err != nil {
		@@ -1174,9 +1174,9 @@ func zonalTrafficSubPut(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
		vars := mux.Vars(r)

		var response InlineResponseZonalTrafficNotificationSubscription
		var response InlineZonalTrafficSubscription

		var body InlineRequestBodyZonalTrafficNotificationSubscription
		var body InlineZonalTrafficSubscription
		decoder := json.NewDecoder(r.Body)
		err := decoder.Decode(&body)
		if err != nil {
		@@ -1226,7 +1226,7 @@ func zonalTrafficSubPut(w http.ResponseWriter, r *http.Request) {
		deregisterZonal(subsIdStr)
		registerZonal(zonalTrafficSub.ZoneId, zonalTrafficSub.UserEventCriteria, subsIdStr)

		response.ZonalTrafficNotificationSubscription = zonalTrafficSub
		response.ZonalTrafficSubscription = zonalTrafficSub

		jsonResponse, err := json.Marshal(response)
		if err != nil {
		@@ -1269,7 +1269,7 @@ func zoneStatusSubDelete(w http.ResponseWriter, r *http.Request) {
		func zoneStatusSubListGet(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")

		var response InlineResponseNotificationSubscriptionList
		var response InlineNotificationSubscriptionList
		var zoneStatusSubList NotificationSubscriptionList
		zoneStatusSubList.ResourceURL = hostUrl.String() + basePath + "subscriptions/zoneStatus"
		response.NotificationSubscriptionList = &zoneStatusSubList
		@@ -1296,9 +1296,9 @@ func zoneStatusSubGet(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
		vars := mux.Vars(r)

		var response InlineResponseZoneStatusNotificationSubscription
		var response InlineZoneStatusSubscription
		var zoneStatusSub ZoneStatusSubscription
		response.ZoneStatusNotificationSubscription = &zoneStatusSub
		response.ZoneStatusSubscription = &zoneStatusSub

		jsonZoneStatusSub, _ := rc.JSONGetEntry(baseKey+typeZoneStatusSubscription+":"+vars["subscriptionId"], ".")
		if jsonZoneStatusSub == "" {
		@@ -1326,9 +1326,9 @@ func zoneStatusSubGet(w http.ResponseWriter, r *http.Request) {
		func zoneStatusSubPost(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")

		var response InlineResponseZoneStatusNotificationSubscription
		var response InlineZoneStatusSubscription

		var body InlineRequestBodyZoneStatusNotificationSubscription
		var body InlineZoneStatusSubscription
		decoder := json.NewDecoder(r.Body)
		err := decoder.Decode(&body)
		if err != nil {
		@@ -1354,7 +1354,7 @@ func zoneStatusSubPost(w http.ResponseWriter, r *http.Request) {
		registerZoneStatus(zoneStatusSub.ZoneId, zoneStatusSub.NumberOfUsersZoneThreshold, zoneStatusSub.NumberOfUsersAPThreshold,
		zoneStatusSub.OperationStatus, subsIdStr)

		response.ZoneStatusNotificationSubscription = zoneStatusSub
		response.ZoneStatusSubscription = zoneStatusSub

		jsonResponse, err := json.Marshal(response)
		if err != nil {
		@@ -1370,9 +1370,9 @@ func zoneStatusSubPut(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
		vars := mux.Vars(r)

		var response InlineResponseZoneStatusNotificationSubscription
		var response InlineZoneStatusSubscription

		var body InlineRequestBodyZoneStatusNotificationSubscription
		var body InlineZoneStatusSubscription
		decoder := json.NewDecoder(r.Body)
		err := decoder.Decode(&body)
		if err != nil {
		@@ -1423,7 +1423,7 @@ func zoneStatusSubPut(w http.ResponseWriter, r *http.Request) {
		registerZoneStatus(zoneStatusSub.ZoneId, zoneStatusSub.NumberOfUsersZoneThreshold, zoneStatusSub.NumberOfUsersAPThreshold,
		zoneStatusSub.OperationStatus, subsIdStr)

		response.ZoneStatusNotificationSubscription = zoneStatusSub
		response.ZoneStatusSubscription = zoneStatusSub

		jsonResponse, err := json.Marshal(response)
		if err != nil {

go-apps/meep-loc-serv/server/loc-serv_test.go

+30 −30

Original line number	Diff line number	Diff line
		@@ -576,7 +576,7 @@ func testZonalSubscriptionList(t *testing.T) {
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseNotificationSubscriptionList
		var respBody InlineNotificationSubscriptionList
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -602,7 +602,7 @@ func testZonalSubscriptionPost(t *testing.T) string {

		expectedZonalTrafficSubscription := ZonalTrafficSubscription{&CallbackReference{"", nil, requestCallbackReference}, requestClientCorrelator, requestDuration, nil, requestResourceURL, requestUserEvent, requestZoneId}

		expectedResponse := InlineResponseZonalTrafficNotificationSubscription{&expectedZonalTrafficSubscription}
		expectedResponse := InlineZonalTrafficSubscription{&expectedZonalTrafficSubscription}
		expectedResponseStr, err := json.Marshal(expectedResponse)
		if err != nil {
		t.Fatalf(err.Error())
		@@ -615,7 +615,7 @@ func testZonalSubscriptionPost(t *testing.T) string {
		/******************************
		* request body section
		******************************/
		expectedBody := InlineRequestBodyZonalTrafficNotificationSubscription{&expectedZonalTrafficSubscription}
		expectedBody := InlineZonalTrafficSubscription{&expectedZonalTrafficSubscription}
		body, err := json.Marshal(expectedBody)
		if err != nil {
		t.Fatalf(err.Error())
		@@ -634,7 +634,7 @@ func testZonalSubscriptionPost(t *testing.T) string {
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseZonalTrafficNotificationSubscription
		var respBody InlineZonalTrafficSubscription
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -659,7 +659,7 @@ func testZonalSubscriptionPut(t *testing.T, subscriptionId string, expectSuccess

		expectedZonalTrafficSubscription := ZonalTrafficSubscription{&CallbackReference{"", nil, requestCallbackReference}, requestClientCorrelator, requestDuration, nil, requestResourceURL, requestUserEvent, requestZoneId}

		expectedResponse := InlineResponseZonalTrafficNotificationSubscription{&expectedZonalTrafficSubscription}
		expectedResponse := InlineZonalTrafficSubscription{&expectedZonalTrafficSubscription}
		expectedResponseStr, err := json.Marshal(expectedResponse)
		if err != nil {
		t.Fatalf(err.Error())
		@@ -674,7 +674,7 @@ func testZonalSubscriptionPut(t *testing.T, subscriptionId string, expectSuccess
		/******************************
		* request body section
		******************************/
		expectedBody := InlineRequestBodyZonalTrafficNotificationSubscription{&expectedZonalTrafficSubscription}
		expectedBody := InlineZonalTrafficSubscription{&expectedZonalTrafficSubscription}
		body, err := json.Marshal(expectedBody)
		if err != nil {
		t.Fatalf(err.Error())
		@@ -694,7 +694,7 @@ func testZonalSubscriptionPut(t *testing.T, subscriptionId string, expectSuccess
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseZonalTrafficNotificationSubscription
		var respBody InlineZonalTrafficSubscription
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -749,7 +749,7 @@ func testZonalSubscriptionGet(t *testing.T, subscriptionId string, expectedRespo
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseZonalTrafficNotificationSubscription
		var respBody InlineZonalTrafficSubscription
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -913,7 +913,7 @@ func testUserSubscriptionList(t *testing.T) {
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseNotificationSubscriptionList
		var respBody InlineNotificationSubscriptionList
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -938,7 +938,7 @@ func testUserSubscriptionPost(t *testing.T) string {

		expectedUserTrackingSubscription := UserTrackingSubscription{requestAddr, &CallbackReference{"", nil, requestCallbackReference}, requestClientCorrelator, requestResourceURL, requestUserEvent}

		expectedResponse := InlineResponseUserTrackingNotificationSubscription{&expectedUserTrackingSubscription}
		expectedResponse := InlineUserTrackingSubscription{&expectedUserTrackingSubscription}
		expectedResponseStr, err := json.Marshal(expectedResponse)
		if err != nil {
		t.Fatalf(err.Error())
		@@ -951,7 +951,7 @@ func testUserSubscriptionPost(t *testing.T) string {
		/******************************
		* request body section
		******************************/
		expectedBody := InlineRequestBodyUserTrackingNotificationSubscription{&expectedUserTrackingSubscription}
		expectedBody := InlineUserTrackingSubscription{&expectedUserTrackingSubscription}
		body, err := json.Marshal(expectedBody)
		if err != nil {
		t.Fatalf(err.Error())
		@@ -969,7 +969,7 @@ func testUserSubscriptionPost(t *testing.T) string {
		if err != nil {
		t.Fatalf("Failed to get expected response")
		}
		var respBody InlineResponseUserTrackingNotificationSubscription
		var respBody InlineUserTrackingSubscription
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -993,7 +993,7 @@ func testUserSubscriptionPut(t *testing.T, subscriptionId string, expectSuccess

		expectedUserTrackingSubscription := UserTrackingSubscription{requestAddr, &CallbackReference{"", nil, requestCallbackReference}, requestClientCorrelator, requestResourceURL, requestUserEvent}

		expectedResponse := InlineResponseUserTrackingNotificationSubscription{&expectedUserTrackingSubscription}
		expectedResponse := InlineUserTrackingSubscription{&expectedUserTrackingSubscription}

		expectedResponseStr, err := json.Marshal(expectedResponse)
		if err != nil {
		@@ -1009,7 +1009,7 @@ func testUserSubscriptionPut(t *testing.T, subscriptionId string, expectSuccess
		/******************************
		* request body section
		******************************/
		expectedBody := InlineRequestBodyUserTrackingNotificationSubscription{&expectedUserTrackingSubscription}
		expectedBody := InlineUserTrackingSubscription{&expectedUserTrackingSubscription}
		body, err := json.Marshal(expectedBody)
		if err != nil {
		t.Fatalf(err.Error())
		@@ -1029,7 +1029,7 @@ func testUserSubscriptionPut(t *testing.T, subscriptionId string, expectSuccess
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseUserTrackingNotificationSubscription
		var respBody InlineUserTrackingSubscription
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -1084,7 +1084,7 @@ func testUserSubscriptionGet(t *testing.T, subscriptionId string, expectedRespon
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseUserTrackingNotificationSubscription
		var respBody InlineUserTrackingSubscription
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -1248,7 +1248,7 @@ func testZoneStatusSubscriptionList(t *testing.T) {
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseNotificationSubscriptionList
		var respBody InlineNotificationSubscriptionList
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -1275,7 +1275,7 @@ func testZoneStatusSubscriptionPost(t *testing.T) string {

		expectedZoneStatusSubscription := ZoneStatusSubscription{&CallbackReference{"", nil, requestCallbackReference}, requestClientCorrelator, requestNumberOfUsersAPThreshold, requestNumberOfUsersZoneThreshold, requestOperationStatus, requestResourceURL, requestZoneId}

		expectedResponse := InlineResponseZoneStatusNotificationSubscription{&expectedZoneStatusSubscription}
		expectedResponse := InlineZoneStatusSubscription{&expectedZoneStatusSubscription}
		expectedResponseStr, err := json.Marshal(expectedResponse)
		if err != nil {
		t.Fatalf(err.Error())
		@@ -1288,7 +1288,7 @@ func testZoneStatusSubscriptionPost(t *testing.T) string {
		/******************************
		* request body section
		******************************/
		expectedBody := InlineRequestBodyZoneStatusNotificationSubscription{&expectedZoneStatusSubscription}
		expectedBody := InlineZoneStatusSubscription{&expectedZoneStatusSubscription}
		body, err := json.Marshal(expectedBody)
		if err != nil {
		t.Fatalf(err.Error())
		@@ -1306,7 +1306,7 @@ func testZoneStatusSubscriptionPost(t *testing.T) string {
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseZoneStatusNotificationSubscription
		var respBody InlineZoneStatusSubscription
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -1332,7 +1332,7 @@ func testZoneStatusSubscriptionPut(t *testing.T, subscriptionId string, expectSu

		expectedZoneStatusSubscription := ZoneStatusSubscription{&CallbackReference{"", nil, requestCallbackReference}, requestClientCorrelator, requestNumberOfUsersAPThreshold, requestNumberOfUsersZoneThreshold, requestOperationStatus, requestResourceURL, requestZoneId}

		expectedResponse := InlineResponseZoneStatusNotificationSubscription{&expectedZoneStatusSubscription}
		expectedResponse := InlineZoneStatusSubscription{&expectedZoneStatusSubscription}
		expectedResponseStr, err := json.Marshal(expectedResponse)
		if err != nil {
		t.Fatalf(err.Error())
		@@ -1347,7 +1347,7 @@ func testZoneStatusSubscriptionPut(t *testing.T, subscriptionId string, expectSu
		/******************************
		* request body section
		******************************/
		expectedBody := InlineRequestBodyZoneStatusNotificationSubscription{&expectedZoneStatusSubscription}
		expectedBody := InlineZoneStatusSubscription{&expectedZoneStatusSubscription}
		body, err := json.Marshal(expectedBody)
		if err != nil {
		t.Fatalf(err.Error())
		@@ -1367,7 +1367,7 @@ func testZoneStatusSubscriptionPut(t *testing.T, subscriptionId string, expectSu
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseZoneStatusNotificationSubscription
		var respBody InlineZoneStatusSubscription
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -1422,7 +1422,7 @@ func testZoneStatusSubscriptionGet(t *testing.T, subscriptionId string, expected
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseZoneStatusNotificationSubscription
		var respBody InlineZoneStatusSubscription
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -1543,7 +1543,7 @@ func testUserInfo(t *testing.T, userId string, expectedResponse string) {
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseUserList
		var respBody InlineUserList
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -1634,7 +1634,7 @@ func testZoneInfo(t *testing.T, zoneId string, expectedResponse string) {
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseZoneInfo
		var respBody InlineZoneInfo
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -1731,7 +1731,7 @@ func testAPInfo(t *testing.T, zoneId string, apId string, expectedResponse strin
		t.Fatalf("Failed to get expected response")
		}

		var respBody InlineResponseAccessPointInfo
		var respBody InlineAccessPointInfo
		err = json.Unmarshal([]byte(rr), &respBody)
		if err != nil {
		t.Fatalf("Failed to get expected response")
		@@ -1798,7 +1798,7 @@ func TestUserSubscriptionNotification(t *testing.T) {
		/******************************
		* request body section
		******************************/
		expectedBody := InlineRequestBodyUserTrackingNotificationSubscription{&expectedUserTrackingSubscription}
		expectedBody := InlineUserTrackingSubscription{&expectedUserTrackingSubscription}
		body, err := json.Marshal(expectedBody)
		if err != nil {
		t.Fatalf(err.Error())
		@@ -1909,13 +1909,13 @@ func TestZoneSubscriptionNotification(t *testing.T) {
		/******************************
		* request body section
		******************************/
		expectedBody := InlineRequestBodyZonalTrafficNotificationSubscription{&expectedZonalTrafficSubscription}
		expectedBody := InlineZonalTrafficSubscription{&expectedZonalTrafficSubscription}
		body, err := json.Marshal(expectedBody)
		if err != nil {
		t.Fatalf(err.Error())
		}

		expectedBody2 := InlineRequestBodyZonalTrafficNotificationSubscription{&expectedZonalTrafficSubscription2}
		expectedBody2 := InlineZonalTrafficSubscription{&expectedZonalTrafficSubscription2}
		body2, err := json.Marshal(expectedBody2)
		if err != nil {
		t.Fatalf(err.Error())

go-apps/meep-loc-serv/server/model_inline_response_access_point_info.go→go-apps/meep-loc-serv/server/model_inline_access_point_info.go

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@
		*/
		package server

		// Successful response to an access point id request
		type InlineResponseAccessPointInfo struct {
		type InlineAccessPointInfo struct {
		AccessPointInfo *AccessPointInfo `json:"accessPointInfo,omitempty"`
		}