Commit 7223812a authored by Ikram Haq's avatar Ikram Haq
Browse files

Fix issue related to the ConnectionType

parent 42b8d3ec

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

+2 −2
Original line number Diff line number Diff line
@@ -361,9 +361,9 @@ func processActiveScenarioUpdate() { 


			switch poaType {

			case mod.NodeTypePoa4G:

				conType = "Macro"

				conType = "LTE"

			case mod.NodeTypePoa5G:

				conType = "Smallcell"

				conType = "5G NR"

			case mod.NodeTypePoaWifi:

				conType = "Wifi"

			default:

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

+4 −14
Original line number Diff line number Diff line
@@ -243,22 +243,12 @@ func convertStringToOperationStatus(opStatus string) OperationStatus { 
func convertStringToConnectionType(conType string) ConnectionType {



	switch conType {

	case "Femto":

		return FEMTO_ConnectionType

	case "LTE-femto":

		return LTE_FEMTO_ConnectionType

	case "Smallcell":

		return SMALLCELL_ConnectionType

	case "LTE-smallcell":

		return LTE_SMALLCELL_ConnectionType

	case "5G NR":

		return _5GNR_ConnectionType

	case "LTE":

		return LTE_ConnectionType

	case "Wifi":

		return WIFI_ConnectionType

	case "Pico":

		return PICO_ConnectionType

	case "Micro":

		return MICRO_ConnectionType

	case "Macro":

		return MACRO_ConnectionType

	case "Wimax":

		return WIMAX_ConnectionType

	default:

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

+5 −0
Original line number Diff line number Diff line
@@ -1786,6 +1786,11 @@ func usersGet(w http.ResponseWriter, r *http.Request) { 
	userList.ResourceURL = hostUrl.String() + basePath + "queries/users"

	response.UserList = &userList

	userData.userList = &userList

	jsonUserInfo, _ := rc.JSONGetEntry(baseKey+typeUser+":"+q.Get("address"), ".")

	if jsonUserInfo == "" {

		w.WriteHeader(http.StatusNotFound)

		return

	}



	keyName := baseKey + typeUser + ":*"

	err := rc.ForEachJSONEntry(keyName, populateUserList, &userData)

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

+5 −10
Original line number Diff line number Diff line
@@ -14,14 +14,9 @@ type ConnectionType string 


// List of ConnectionType

const (

	FEMTO_ConnectionType         ConnectionType = "Femto"

	LTE_FEMTO_ConnectionType     ConnectionType = "LTE-femto"

	SMALLCELL_ConnectionType     ConnectionType = "Smallcell"

	LTE_SMALLCELL_ConnectionType ConnectionType = "LTE-smallcell"

	LTE_ConnectionType     ConnectionType = "LTE"

	WIFI_ConnectionType    ConnectionType = "Wifi"

	PICO_ConnectionType          ConnectionType = "Pico"

	MICRO_ConnectionType         ConnectionType = "Micro"

	MACRO_ConnectionType         ConnectionType = "Macro"

	WIMAX_ConnectionType   ConnectionType = "Wimax"

	_5GNR_ConnectionType   ConnectionType = "5G NR"

	UNKNOWN_ConnectionType ConnectionType = "Unknown"

)