Commit 8fd50ae4 authored by Simon Pastor's avatar Simon Pastor
Browse files

loc-serv with no inline response or body

parent e07c542a

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

+813 −1140

File changed.

Preview size limit exceeded, changes collapsed.

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

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



Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/01.01.01_60/gs_mec013v010101p.pdf) <p>The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about Users (UE) and Zone locations <p>**Details**<br>API details available at _your-AdvantEDGE-ip-address/api_

The ETSI MEC ISG MEC013 WLAN Access Information API described using OpenAPI.



## Overview

This server was generated by the [swagger-codegen]
@@ -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:54.369-05:00

- API version: 2.1.1

- Build date: 2020-11-10T10:38:07.463-05:00[America/New_York]





### Running the server

go-apps/meep-loc-serv/server/api_.go→go-apps/meep-loc-serv/server/api_location.go

+3 −2
Original line number Diff line number Diff line
@@ -13,11 +13,12 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 * ETSI GS MEC 013 - Location API

 * AdvantEDGE Location Service REST API

 *

 * The ETSI MEC ISG MEC013 WLAN Access Information API described using OpenAPI.

 * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.01.01_60/gs_mec013v020101p.pdf) <p>The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence <p>[Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about Users (UE) and Zone locations <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

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

+81 −67
Original line number Diff line number Diff line
@@ -358,7 +358,6 @@ func checkNotificationRegisteredZoneStatus(zoneId string, apId string, nbUsersIn 
		}



		if zoneStatus.ZoneId == zoneId {

			nbUsersInZone := 0

			nbUsersInAP := -1

			zoneWarning := false

			apWarning := false
@@ -622,7 +621,7 @@ func usersGet(w http.ResponseWriter, r *http.Request) { 
	userData.queryAddress = q.Get("address")



	// Get user list from DB

	var response InlineResponse2001

	var response InlineResponseUserList

	var userList UserList

	userList.ResourceURL = hostUrl.String() + basePath + "users"

	response.UserList = &userList
@@ -695,7 +694,7 @@ func apGet(w http.ResponseWriter, r *http.Request) { 
	userData.queryInterestRealm = q.Get("interestRealm")



	// Get user list from DB

	var response InlineResponse2004

	var response InlineResponseAccessPointList

	var apList AccessPointList

	apList.ZoneId = vars["zoneId"]

	apList.ResourceURL = hostUrl.String() + basePath + "zones/" + vars["zoneId"] + "/accessPoints"
@@ -725,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 InlineResponse2005

	var response InlineResponseAccessPointInfo

	var apInfo AccessPointInfo

	response.AccessPointInfo = &apInfo
@@ -755,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 InlineResponse2002

	var response InlineResponseZoneList

	var zoneList ZoneList

	zoneList.ResourceURL = hostUrl.String() + basePath + "zones"

	response.ZoneList = &zoneList
@@ -782,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 InlineResponse2003

	var response InlineResponseZoneInfo

	var zoneInfo ZoneInfo

	response.ZoneInfo = &zoneInfo
@@ -871,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 InlineResponse20012

	var response InlineResponseNotificationSubscriptionList

	var userTrackingSubList NotificationSubscriptionList

	userTrackingSubList.ResourceURL = hostUrl.String() + basePath + "subscriptions/userTracking"

	response.NotificationSubscriptionList = &userTrackingSubList
@@ -898,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 InlineResponse20013

	var response InlineResponseUserTrackingNotificationSubscription

	var userTrackingSub UserTrackingSubscription

	response.UserTrackingSubscription = &userTrackingSub

	response.UserTrackingNotificationSubscription = &userTrackingSub



	jsonUserTrackingSub, _ := rc.JSONGetEntry(baseKey+typeUserSubscription+":"+vars["subscriptionId"], ".")

	if jsonUserTrackingSub == "" {
@@ -928,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 InlineResponse2013

	var response InlineResponseUserTrackingNotificationSubscription



	var body Body6

	var body InlineRequestBodyUserTrackingNotificationSubscription

	decoder := json.NewDecoder(r.Body)

	err := decoder.Decode(&body)

	if err != nil {
@@ -954,7 +953,7 @@ func userTrackingSubPost(w http.ResponseWriter, r *http.Request) { 


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



	response.UserTrackingSubscription = userTrackingSub

	response.UserTrackingNotificationSubscription = userTrackingSub



	jsonResponse, err := json.Marshal(response)

	if err != nil {
@@ -970,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 InlineResponse20014

	var response InlineResponseUserTrackingNotificationSubscription



	var body Body6

	var body InlineRequestBodyUserTrackingNotificationSubscription

	decoder := json.NewDecoder(r.Body)

	err := decoder.Decode(&body)

	if err != nil {
@@ -987,6 +986,11 @@ func userTrackingSubPut(w http.ResponseWriter, r *http.Request) { 
		return

	}



	if userTrackingSub.ResourceURL == "" {

		w.WriteHeader(http.StatusBadRequest)

		return

	}



	subsIdParamStr := vars["subscriptionId"]



	selfUrl := strings.Split(userTrackingSub.ResourceURL, "/")
@@ -1000,7 +1004,7 @@ func userTrackingSubPut(w http.ResponseWriter, r *http.Request) { 


	userTrackingSub.ResourceURL = hostUrl.String() + basePath + "subscriptions/userTracking/" + subsIdStr



	subsId, _ := strconv.Atoi(subsIdStr)

	subsId, err := strconv.Atoi(subsIdStr)

	if err != nil {

		log.Error(err)

		w.WriteHeader(http.StatusBadRequest)
@@ -1017,7 +1021,7 @@ func userTrackingSubPut(w http.ResponseWriter, r *http.Request) { 
	deregisterUser(subsIdStr)

	registerUser(userTrackingSub.Address, userTrackingSub.UserEventCriteria, subsIdStr)



	response.UserTrackingSubscription = userTrackingSub

	response.UserTrackingNotificationSubscription = userTrackingSub



	jsonResponse, err := json.Marshal(response)

	if err != nil {
@@ -1060,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 InlineResponse20015

	var response InlineResponseNotificationSubscriptionList

	var zonalTrafficSubList NotificationSubscriptionList

	zonalTrafficSubList.ResourceURL = hostUrl.String() + basePath + "subscriptions/zonalTraffic"

	response.NotificationSubscriptionList = &zonalTrafficSubList
@@ -1087,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 InlineResponse20016

	var response InlineResponseZonalTrafficNotificationSubscription

	var zonalTrafficSub ZonalTrafficSubscription

	response.ZonalTrafficSubscription = &zonalTrafficSub

	response.ZonalTrafficNotificationSubscription = &zonalTrafficSub

	jsonZonalTrafficSub, _ := rc.JSONGetEntry(baseKey+typeZonalSubscription+":"+vars["subscriptionId"], ".")

	if jsonZonalTrafficSub == "" {

		w.WriteHeader(http.StatusNotFound)
@@ -1116,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 InlineResponse2014

	var response InlineResponseZonalTrafficNotificationSubscription



	var body Body8

	var body InlineRequestBodyZonalTrafficNotificationSubscription

	decoder := json.NewDecoder(r.Body)

	err := decoder.Decode(&body)

	if err != nil {
@@ -1154,7 +1158,7 @@ func zonalTrafficSubPost(w http.ResponseWriter, r *http.Request) { 


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



	response.ZonalTrafficSubscription = zonalTrafficSub

	response.ZonalTrafficNotificationSubscription = zonalTrafficSub



	jsonResponse, err := json.Marshal(response)

	if err != nil {
@@ -1170,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 InlineResponse20017

	var response InlineResponseZonalTrafficNotificationSubscription



	var body Body8

	var body InlineRequestBodyZonalTrafficNotificationSubscription

	decoder := json.NewDecoder(r.Body)

	err := decoder.Decode(&body)

	if err != nil {
@@ -1187,6 +1191,11 @@ func zonalTrafficSubPut(w http.ResponseWriter, r *http.Request) { 
		return

	}



	if zonalTrafficSub.ResourceURL == "" {

		w.WriteHeader(http.StatusBadRequest)

		return

	}



	subsIdParamStr := vars["subscriptionId"]



	selfUrl := strings.Split(zonalTrafficSub.ResourceURL, "/")
@@ -1217,7 +1226,7 @@ func zonalTrafficSubPut(w http.ResponseWriter, r *http.Request) { 
	deregisterZonal(subsIdStr)

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



	response.ZonalTrafficSubscription = zonalTrafficSub

	response.ZonalTrafficNotificationSubscription = zonalTrafficSub



	jsonResponse, err := json.Marshal(response)

	if err != nil {
@@ -1260,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 InlineResponse20018

	var response InlineResponseNotificationSubscriptionList

	var zoneStatusSubList NotificationSubscriptionList

	zoneStatusSubList.ResourceURL = hostUrl.String() + basePath + "subscriptions/zoneStatus"

	response.NotificationSubscriptionList = &zoneStatusSubList
@@ -1287,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 InlineResponse20019

	var response InlineResponseZoneStatusNotificationSubscription

	var zoneStatusSub ZoneStatusSubscription

	response.ZoneStatusSubscription = &zoneStatusSub

	response.ZoneStatusNotificationSubscription = &zoneStatusSub



	jsonZoneStatusSub, _ := rc.JSONGetEntry(baseKey+typeZoneStatusSubscription+":"+vars["subscriptionId"], ".")

	if jsonZoneStatusSub == "" {
@@ -1317,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 InlineResponse2015

	var response InlineResponseZoneStatusNotificationSubscription



	var body Body10

	var body InlineRequestBodyZoneStatusNotificationSubscription

	decoder := json.NewDecoder(r.Body)

	err := decoder.Decode(&body)

	if err != nil {
@@ -1345,7 +1354,7 @@ func zoneStatusSubPost(w http.ResponseWriter, r *http.Request) { 
	registerZoneStatus(zoneStatusSub.ZoneId, zoneStatusSub.NumberOfUsersZoneThreshold, zoneStatusSub.NumberOfUsersAPThreshold,

		zoneStatusSub.OperationStatus, subsIdStr)



	response.ZoneStatusSubscription = zoneStatusSub

	response.ZoneStatusNotificationSubscription = zoneStatusSub



	jsonResponse, err := json.Marshal(response)

	if err != nil {
@@ -1361,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 InlineResponse20020

	var response InlineResponseZoneStatusNotificationSubscription



	var body Body10

	var body InlineRequestBodyZoneStatusNotificationSubscription

	decoder := json.NewDecoder(r.Body)

	err := decoder.Decode(&body)

	if err != nil {
@@ -1378,6 +1387,11 @@ func zoneStatusSubPut(w http.ResponseWriter, r *http.Request) { 
		return

	}



	if zoneStatusSub.ResourceURL == "" {

		w.WriteHeader(http.StatusBadRequest)

		return

	}



	subsIdParamStr := vars["subscriptionId"]



	selfUrl := strings.Split(zoneStatusSub.ResourceURL, "/")
@@ -1409,7 +1423,7 @@ func zoneStatusSubPut(w http.ResponseWriter, r *http.Request) { 
	registerZoneStatus(zoneStatusSub.ZoneId, zoneStatusSub.NumberOfUsersZoneThreshold, zoneStatusSub.NumberOfUsersAPThreshold,

		zoneStatusSub.OperationStatus, subsIdStr)



	response.ZoneStatusSubscription = zoneStatusSub

	response.ZoneStatusNotificationSubscription = zoneStatusSub



	jsonResponse, err := json.Marshal(response)

	if err != nil {
@@ -1496,7 +1510,7 @@ func updateUserInfo(address string, zoneId string, accessPointId string, longitu 
			userInfo.LocationInfo.Accuracy = 1

		}

		//we only support shape != 7 in locationInfo

		userInfo.LocationInfo.Shape = "2"

		userInfo.LocationInfo.Shape = 2

		userInfo.LocationInfo.Longitude = nil

		userInfo.LocationInfo.Longitude = append(userInfo.LocationInfo.Longitude, *longitude)

		userInfo.LocationInfo.Latitude = nil
@@ -1577,7 +1591,7 @@ func updateAccessPointInfo(zoneId string, apId string, conTypeStr string, opStat 
		}



		//we only support shape != 7 in locationInfo

		apInfo.LocationInfo.Shape = "2"

		apInfo.LocationInfo.Shape = 2

		apInfo.LocationInfo.Longitude = nil

		apInfo.LocationInfo.Longitude = append(apInfo.LocationInfo.Longitude, *longitude)

		apInfo.LocationInfo.Latitude = 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 InlineResponse20015

	var respBody InlineResponseNotificationSubscriptionList

	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 := InlineResponse2014{&expectedZonalTrafficSubscription}

	expectedResponse := InlineResponseZonalTrafficNotificationSubscription{&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 := Body8{&expectedZonalTrafficSubscription}

	expectedBody := InlineRequestBodyZonalTrafficNotificationSubscription{&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 InlineResponse20014

	var respBody InlineResponseZonalTrafficNotificationSubscription

	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 := InlineResponse20017{&expectedZonalTrafficSubscription}

	expectedResponse := InlineResponseZonalTrafficNotificationSubscription{&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 := Body8{&expectedZonalTrafficSubscription}

	expectedBody := InlineRequestBodyZonalTrafficNotificationSubscription{&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 InlineResponse20017

		var respBody InlineResponseZonalTrafficNotificationSubscription

		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 InlineResponse2003

		var respBody InlineResponseZonalTrafficNotificationSubscription

		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 InlineResponse20012

	var respBody InlineResponseNotificationSubscriptionList

	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 := InlineResponse2013{&expectedUserTrackingSubscription}

	expectedResponse := InlineResponseUserTrackingNotificationSubscription{&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 := Body6{&expectedUserTrackingSubscription}

	expectedBody := InlineRequestBodyUserTrackingNotificationSubscription{&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 InlineResponse2013

	var respBody InlineResponseUserTrackingNotificationSubscription

	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 := InlineResponse20014{&expectedUserTrackingSubscription}

	expectedResponse := InlineResponseUserTrackingNotificationSubscription{&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 := Body6{&expectedUserTrackingSubscription}

	expectedBody := InlineRequestBodyUserTrackingNotificationSubscription{&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 InlineResponse20014

		var respBody InlineResponseUserTrackingNotificationSubscription

		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 InlineResponse20013

		var respBody InlineResponseUserTrackingNotificationSubscription

		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 InlineResponse20018

	var respBody InlineResponseNotificationSubscriptionList

	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 := InlineResponse2015{&expectedZoneStatusSubscription}

	expectedResponse := InlineResponseZoneStatusNotificationSubscription{&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 := Body10{&expectedZoneStatusSubscription}

	expectedBody := InlineRequestBodyZoneStatusNotificationSubscription{&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 InlineResponse2015

	var respBody InlineResponseZoneStatusNotificationSubscription

	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 := InlineResponse20020{&expectedZoneStatusSubscription}

	expectedResponse := InlineResponseZoneStatusNotificationSubscription{&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 := Body10{&expectedZoneStatusSubscription}

	expectedBody := InlineRequestBodyZoneStatusNotificationSubscription{&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 InlineResponse20020

		var respBody InlineResponseZoneStatusNotificationSubscription

		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 InlineResponse20019

		var respBody InlineResponseZoneStatusNotificationSubscription

		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 InlineResponse2001

	var respBody InlineResponseUserList

	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 InlineResponse2003

		var respBody InlineResponseZoneInfo

		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 InlineResponse2005

		var respBody InlineResponseAccessPointInfo

		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 := Body6{&expectedUserTrackingSubscription}

	expectedBody := InlineRequestBodyUserTrackingNotificationSubscription{&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 := Body8{&expectedZonalTrafficSubscription}

	expectedBody := InlineRequestBodyZonalTrafficNotificationSubscription{&expectedZonalTrafficSubscription}

	body, err := json.Marshal(expectedBody)

	if err != nil {

		t.Fatalf(err.Error())

	}



	expectedBody2 := Body8{&expectedZonalTrafficSubscription2}

	expectedBody2 := InlineRequestBodyZonalTrafficNotificationSubscription{&expectedZonalTrafficSubscription2}

	body2, err := json.Marshal(expectedBody2)

	if err != nil {

		t.Fatalf(err.Error())