Commit 1b1718ad authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

fixed demo-server

parent b95a7e6a

examples/demo1/src/demo-server/go.sum

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL 
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=

golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=

golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

examples/demo1/src/demo-server/go/localDB.go

+10 −12
Original line number Diff line number Diff line
@@ -27,9 +27,10 @@ import ( 
)



const eventTypeStateUpdate = "STATE-UPDATE"

const eventTypeStateTransferStart = "STATE-TRANSFER-START"

const eventTypeStateTransferComplete = "STATE-TRANSFER-COMPLETE"

const eventTypeStateTransferCancel = "STATE-TRANSFER-CANCEL"



// const eventTypeStateTransferStart = "STATE-TRANSFER-START"

// const eventTypeStateTransferComplete = "STATE-TRANSFER-COMPLETE"

// const eventTypeStateTransferCancel = "STATE-TRANSFER-CANCEL"



var mgManager *mgm.APIClient

var mgName string
@@ -41,7 +42,6 @@ var ueIdToTickerMap map[string]*time.Ticker 
var ueIdToUserInfoMap map[string]*UserInfo



func Init() {



	ueIdToStateValueMap = make(map[string]UeState)

	ueIdToTickerMap = make(map[string]*time.Ticker)

	ueIdToUserInfoMap = make(map[string]*UserInfo)
@@ -66,7 +66,7 @@ func Init() { 


	// Create client for MG Manager API

	mgmCfg := mgm.NewConfiguration()

	mgmCfg.BasePath = "http://meep-mg-manager/v1"

	mgmCfg.BasePath = "http://meep-mg-manager/mgm/v1"

	mgManager = mgm.NewAPIClient(mgmCfg)

	if mgManager == nil {

		log.Println("Cannot find the MG Manager API")
@@ -83,7 +83,6 @@ func Init() { 
		log.Println(err.Error())

		//return err

	}



}



func updateUe(ueId string, ueState UeState) {
@@ -99,10 +98,9 @@ func updateUe(ueId string, ueState UeState) { 


func getUe(ueId string) *UeState {

	ueState, ok := ueIdToStateValueMap[ueId]

	if ok == false {

	if !ok {

		return nil

	}



	return &ueState

}
@@ -135,7 +133,6 @@ func restartUe(ueId string) { 
}



func startTicker(ueId string) *time.Ticker {



	ticker := time.NewTicker(1000 * time.Millisecond)

	go func() {

		for range ticker.C {
@@ -192,6 +189,9 @@ func localDBHandleEvent(w http.ResponseWriter, r *http.Request) { 


		//marshal the data

		jsonResponse, err := json.Marshal(ueState)

		if err != nil {

			log.Println(err.Error())

		}

		mgAppState.UeState = string(jsonResponse)



		_, err = mgManager.StateTransferApi.TransferAppState(nil, mgName, mgAppId, mgAppState)
@@ -227,11 +227,9 @@ func localDBUpdateTrackedUes(w http.ResponseWriter, r *http.Request) { 
}



func getLocalDBUserInfo(ueId string) *UserInfo {



	userInfo, ok := ueIdToUserInfoMap[ueId]

	if ok == false {

	if !ok {

		return nil

	}



	return userInfo

}

examples/demo1/src/demo-server/go/routers.go

+1 −2
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ type Routes []Route 
func NewRouter() *mux.Router {

	router := mux.NewRouter().StrictSlash(true)

	for _, route := range routes {

		var handler http.Handler

		handler = route.HandlerFunc

		var handler http.Handler = route.HandlerFunc

		handler = Logger(handler, route.Name)



		router.

examples/demo1/src/demo-server/main.go

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ func main() { 


func registerLocServ(ue string) {

	locServCfg := locServClient.NewConfiguration()

	locServCfg.BasePath = "http://meep-loc-serv/etsi-013/location/v1"

	locServCfg.BasePath = "http://meep-loc-serv/location/v1"



	locServ := locServClient.NewAPIClient(locServCfg)

	log.Printf("Created Location Service client before")