Commit 859d65eb authored by Simon Pastor's avatar Simon Pastor
Browse files

demo app server and location service update

parent 5ffff3b2

examples/demo1/src/demo-frontend/src/js/demo-svc.js

+6 −6
Original line number Diff line number Diff line
@@ -225,11 +225,11 @@ function defaultUserInfo2(address, defaultLocation) { 
}



function updateUserInfo(address, data) {

    if (address == "ue1-iperf") {

    if (address == "ue1") {

        $('#demo-svc-loc-serv-address-1').text(data.address);

        $('#demo-svc-loc-serv-location-1').text(data.zoneId + " / " + data.accessPointId);

    }

    if (address == "ue2-svc") {

    if (address == "ue2-ext") {

        $('#demo-svc-loc-serv-address-2').text(data.address);

        $('#demo-svc-loc-serv-location-2').text(data.zoneId + " / " + data.accessPointId);

    }
@@ -267,13 +267,13 @@ function initializeUI() { 


    targetedUeAppNameDialogTextfield1 = new mdc.textField.MDCTextField(document.querySelector('#targeted-ue-app-name-1-tf-div'));

    //setting a default value for now

    targetedUeAppNameDialogTextfield1.value = "ue1-iperf";

    targetedUeAppNameDialogTextfield1.value = "ue1";

    targetedUeAppNameDialogTextfield1.valid = true;

    $('#targeted-ue-app-name-1-tf-div').hide();



    targetedUeAppNameDialogTextfield2 = new mdc.textField.MDCTextField(document.querySelector('#targeted-ue-app-name-2-tf-div'));

    //setting a default value for now

    targetedUeAppNameDialogTextfield2.value = "ue2-svc";

    targetedUeAppNameDialogTextfield2.value = "ue2-ext";

    targetedUeAppNameDialogTextfield2.valid = true;

    $('#targeted-ue-app-name-2-tf-div').hide();
@@ -281,8 +281,8 @@ function initializeUI() { 
    //and this app only tracks notifications, not queries where they are located

    //a work-around would be to have the demo-server do a get for the location knowing it is registering for the event, and then fake

    //a notification to trigger the app

    defaultUserInfo1("ue1-iperf", "zone1 / zone1-poa1")

    defaultUserInfo2("ue2-svc", "zone1 / zone1-poa1")

    defaultUserInfo1("ue1", "zone1 / zone1-poa1")

    defaultUserInfo2("ue2-ext", "zone1 / zone1-poa1")





    iperfBwDialogTextfield = new mdc.textField.MDCTextField(document.querySelector('#iperf-bw-tf-div'));

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

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ func main() { 
        methods := handlers.AllowedMethods([]string{"OPTIONS", "DELETE", "GET", "HEAD", "POST", "PUT"})

        header := handlers.AllowedHeaders([]string{"content-type"})



	registerLocServ("ue2-svc")

	registerLocServ("ue1-iperf")

	registerLocServ("ue2-ext")

	registerLocServ("ue1")



        http.ListenAndServe(":80", handlers.CORS(methods, header)(router))

}

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

+6 −10
Original line number Diff line number Diff line
@@ -127,21 +127,17 @@ func parseScenario(scenario ceModel.Scenario) { 
				// Parse Physical locations

				for _, pl := range nl.PhysicalLocations {



					// Parse Processes

					for _, proc := range pl.Processes {



					switch pl.Type_ {

					case "UE":

							updateUserInfoCB(proc.Name, zone.Name, nl.Name)

						updateUserInfoCB(pl.Name, zone.Name, nl.Name)

						nbApUsers++

					default:

					}

				}

				}



				switch nl.Type_ {

				case "POA":

					updateAccessPointInfoCB(zone.Name, nl.Name, "WIFI", "SERVICEABLE", nbApUsers)

					updateAccessPointInfoCB(zone.Name, nl.Name, "UNKNOWN", "SERVICEABLE", nbApUsers)

					nbAccessPoints++

					nbZoneUsers += nbApUsers

				default: