Fix FB-AH usecase GUI. (#108)

* add enable-fbah-gui target

* Update 1.2 chart cid

* Fix syntax error in enable-fbah-gui target

* Update fbah doc

Makefile

@@ -35,7 +35,7 @@ else ifeq ($(OPT), ric)
 riab: option version preliminaries infra-k8s infra-atomix infra-onos-op ric
 	@echo Done
 else ifeq ($(OPT), fbah)
-riab: option version preliminaries infra-k8s infra-atomix infra-onos-op ric
+riab: option version preliminaries infra-k8s infra-atomix infra-onos-op ric enable-fbah-gui
 	@echo Done
 else ifeq ($(OPT), mlb)
 riab: option version preliminaries infra-k8s infra-atomix infra-onos-op ric

MakefileVar.mk

@@ -20,7 +20,7 @@ SDRANCHARTCID-LATEST		?= origin/master
 SDRANCHARTCID-V1.0.0		?= v1.0.0 #branch: v1.0.0
 SDRANCHARTCID-V1.1.0		?= 6670e6da25129b665b024a7c6d0fd79cfda52f25
 SDRANCHARTCID-V1.1.1		?= 479ff0b59d4ae9f09cd9f7be6ea9a189f207b810
-SDRANCHARTCID-V1.2.0		?= e98e5c2b20bde69b9b9d1ec4b3166c2aeab589da
+SDRANCHARTCID-V1.2.0		?= a30fbd674f97212ea77d4db1401dab0544e20905
 
 #  Helm arguments
 DEFAULT_HELM_ARGS			:= --set import.ran-simulator.enabled=true --set import.onos-pci.enabled=true

docs/Installation_RANSim_FBAH.md

@@ -131,11 +131,23 @@ Node ID          Cell Object ID       Cell Global ID            Time    RRC.Conn
 
 * Use Facebook-AirHop GUI page: for SD-RAN release 1.1, release 1.1.1, and release 1.2, master-stable, latest, and dev versions
 
+### GUI [for SD-RAN release 1.2]
+
+To access GUI, we should open web browser like [Chrome](https://www.google.com/chrome/) or [Safari](https://www.apple.com/safari/).
+Next, go to `http://<RiaB server IP address>:30095`
+Then, we can see the xAPP webpage.
+
+![FBAH WEB GUI](./figures/fbah-with-map-v1.2.png)
+
+*Note: If we put the mouse cursor over the black circles, some tool tips should pop up.*
+
+### GUI [for SD-RAN release 1.1 and 1.1.1]
+
 To access GUI, we should open web browser like [Chrome](https://www.google.com/chrome/) or [Safari](https://www.apple.com/safari/).
 Next, go to `http://<RiaB server IP address>:30095`
 Then, we can see the xAPP webpage.
 
-![FBAH WEB GUI](./figures/fbah-no-map.png)
+![FBAH WEB GUI](./figures/fbah-no-map-v1.1.png)
 
 On this page, we can see the `Cells` table which shows ECGI, PCI, and each cell's neighbor cells.
 
@@ -145,7 +157,7 @@ $ ssh <id>@<RiaB server IP address> -L "*:8080:<RiaB server IP address>:30095"
 ```
 After that, go to `http://localhost:8080` on the web browser.
 
-![FBAH WEB GUI](./figures/fbah-with-map.png)
+![FBAH WEB GUI](./figures/fbah-with-map-v1.1.png)
 
 Since the Google Map API only allows us to use the url `localhost:8080` to show Google Map view, we should make the SSH tunnel.
 

docs/Troubleshooting.md

@@ -102,6 +102,11 @@ docker tag atomix/dragonboat-raft-storage-node:latest  atomix/raft-storage-node:
 After that proceed with the execution of the Riab setup again.
 
 ## Cannot see Google Map view on the Facebook-AirHop xAPP GUI
+### for all SD-RAN releases
+Please remove caches and then try again.
+Or, it would be good to use `Incognito window` in Chrome.
+
+### only for SD-RAN release 1.1 and 1.1.1
 The Google Map API in the Facebook-AirHop xAPP GUI only allows us to use `localhost:8080` URL.
 If we runs Facebook-AirHop xAPP on the remote machine, we have to make a SSH tunnel from the local machine to the remote machine:
 ```bash

mk/ric.mk

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 
 # PHONY definitions
-RIC_PHONY					:= omec
+RIC_PHONY					:= ric
 
 ric: $(M)/ric
 

mk/utils.mk

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 
 # PHONY definitions
-UTIL_PHONY					:= detach-ue fetch-all-charts
+UTIL_PHONY					:= detach-ue fetch-all-charts enable-fbah-gui routing-hw-oai routing-hw-omec
 
 detach-ue: | $(M)/oai-enb-cu $(M)/oai-enb-du $(M)/oai-ue
 	echo -en "AT+CPIN=0000\r" | nc -u -w 1 localhost 10000
@@ -40,4 +40,15 @@ routing-hw-omec:
 	kubectl exec -it router -- sudo ethtool -K core-rtr tx off rx off gro off gso off || true
 	kubectl exec -it upf-0 -n $(RIAB_NAMESPACE) -- ip l set mtu 1550 dev access || true
 	kubectl exec -it upf-0 -n $(RIAB_NAMESPACE) -- ip l set mtu 1550 dev core || true
-	sudo route add -net $(UE_IP_POOL)/$(UE_IP_MASK) gw $(shell echo $(ENB_GATEWAY) | awk -F '/' '{print $$1}') dev enb || true
+	sudo route add -net $(UE_IP_POOL)/$(UE_IP_MASK) gw $(shell echo $(ENB_GATEWAY) | awk -F '/' '{print $$1}') dev enb || true
+
+enable-fbah-gui:
+	kubectl wait --for=condition=available deployment/fb-ah-xapp -n riab --timeout=300s
+	kubectl wait --for=condition=available deployment/fb-ah-gui -n riab --timeout=300s
+	kubectl wait --for=condition=available deployment/fb-kpimon-xapp -n riab --timeout=300s
+	until [ $(shell kubectl exec -it deployment/onos-cli -n riab -- onos topo get entity --no-headers | grep e2cell | wc -l) -eq 6 ]; do sleep 1; done
+	$(SCRIPTDIR)/push-cell-loc.sh
+	kubectl rollout -n riab restart deployments/fb-ah-gui
+	kubectl rollout -n riab status deployments/fb-ah-gui
+	kubectl rollout -n riab restart deployments/fb-ah-xapp
+	kubectl rollout -n riab status deployments/fb-ah-xapp

scripts/push-cell-loc.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+kubectl exec -it deployment/onos-cli -n riab -- onos topo set entity 14550001 --aspect onos.topo.Location='{"lat":52.504315,"lng":13.453262}'
+kubectl exec -it deployment/onos-cli -n riab -- onos topo set entity 14550002 --aspect onos.topo.Location='{"lat":52.504315,"lng":13.453262}'
+kubectl exec -it deployment/onos-cli -n riab -- onos topo set entity 14550003 --aspect onos.topo.Location='{"lat":52.504315,"lng":13.453262}'
+kubectl exec -it deployment/onos-cli -n riab -- onos topo set entity 1454c001 --aspect onos.topo.Location='{"lat":52.486405,"lng":13.412234}'
+kubectl exec -it deployment/onos-cli -n riab -- onos topo set entity 1454c002 --aspect onos.topo.Location='{"lat":52.486405,"lng":13.412234}'
+kubectl exec -it deployment/onos-cli -n riab -- onos topo set entity 1454c003 --aspect onos.topo.Location='{"lat":52.486405,"lng":13.412234}'
+kubectl exec -it deployment/onos-cli -n riab -- onos topo set entity 14550001 --aspect onos.topo.Coverage='{"arc_width":120,"tilt":-15,"height":46,"azimuth":0}'
+kubectl exec -it deployment/onos-cli -n riab -- onos topo set entity 14550002 --aspect onos.topo.Coverage='{"arc_width":120,"tilt":10,"height":49,"azimuth":120}'
+kubectl exec -it deployment/onos-cli -n riab -- onos topo set entity 14550003 --aspect onos.topo.Coverage='{"arc_width":120,"tilt":-6,"height":29,"azimuth":240}'
+kubectl exec -it deployment/onos-cli -n riab -- onos topo set entity 1454c001 --aspect onos.topo.Coverage='{"arc_width":120,"tilt":1,"height":43,"azimuth":0}'
+kubectl exec -it deployment/onos-cli -n riab -- onos topo set entity 1454c002 --aspect onos.topo.Coverage='{"arc_width":120,"tilt":-10,"height":28,"azimuth":120}'
+kubectl exec -it deployment/onos-cli -n riab -- onos topo set entity 1454c003 --aspect onos.topo.Coverage='{"arc_width":120,"tilt":-10,"height":22,"azimuth":240}'