Removing main_flow.sh; fixing flow to take time series plots from non DNS data

[pingpong.git] / run.sh

diff --git a/run.sh b/run.sh
index 15f46d891fedcd8fcaf9d3600fca23997fcd4e1a..5a7cb3bf68b1d2b9676edf6c1e7f752ce7d91be0 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -37,11 +37,22 @@ PATH_SETUP=/scratch/traffic_measurements/Switches-Feb2018/dlink/setup
 PATH_LOCAL=/scratch/traffic_measurements/Switches-Feb2018/dlink/local
 PATH_REMOTE=/scratch/traffic_measurements/Switches-Feb2018/dlink/remote
 
+#PREFIX=smartthings-plug
+#DEVICE=SmartThings_Plug
+#DEVICE_MAC=d0:52:a8:a3:60:0f
+#PATH_SETUP=/scratch/traffic_measurements/Switches-Feb2018/smartthings/setup
+#PATH_LOCAL=/scratch/traffic_measurements/Switches-Feb2018/smartthings/local
+#PATH_REMOTE=/scratch/traffic_measurements/Switches-Feb2018/smartthings/remote
+
 PATH_SETUP_WLAN_JSON=$PREFIX.wlan1.setup.json
 PATH_SETUP_ETH_JSON=$PREFIX.eth0.setup.json
+PATH_LOCAL_WLAN_DNS_JSON=$PREFIX.wlan1.local.dns.json
 PATH_LOCAL_WLAN_JSON=$PREFIX.wlan1.local.json
+PATH_LOCAL_ETH_DNS_JSON=$PREFIX.eth0.local.dns.json
 PATH_LOCAL_ETH_JSON=$PREFIX.eth0.local.json
+PATH_REMOTE_WLAN_DNS_JSON=$PREFIX.wlan1.remote.dns.json
 PATH_REMOTE_WLAN_JSON=$PREFIX.wlan1.remote.json
+PATH_REMOTE_ETH_DNS_JSON=$PREFIX.eth0.remote.dns.json
 PATH_REMOTE_ETH_JSON=$PREFIX.eth0.remote.json
 PATH_GNUPLOT=./plot_scripts/plot_ts_graph_$PREFIX
 PATH_GNUPLOT_COMBINED=./plot_scripts/plot_ts_graph_$PREFIX\_combined
@@ -55,13 +66,21 @@ PATH_RESULT_REMOTE_ETH=$PREFIX\_switch_eth_remote
 PATH_RESULT_PHONE_LOCAL_WLAN=$PREFIX\_phone_wlan_local
 PATH_RESULT_PHONE_REMOTE_WLAN=$PREFIX\_phone_wlan_remote
 
-./main_flow.sh $PATH_SETUP/$PATH_SETUP_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_SETUP_WLAN $DEVICE $DEVICE_MAC
-./main_flow.sh $PATH_SETUP/$PATH_SETUP_ETH_JSON $PATH_DIR_RESULT/$PATH_RESULT_SETUP_ETH $ROUTER $ROUTER_MAC
-./main_flow.sh $PATH_LOCAL/$PATH_LOCAL_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_WLAN $DEVICE $DEVICE_MAC
-./main_flow.sh $PATH_LOCAL/$PATH_LOCAL_ETH_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_ETH $ROUTER $ROUTER_MAC
-./main_flow.sh $PATH_REMOTE/$PATH_REMOTE_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_WLAN $DEVICE $DEVICE_MAC
-./main_flow.sh $PATH_REMOTE/$PATH_REMOTE_ETH_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_ETH $ROUTER $ROUTER_MAC
-./main_flow.sh $PATH_LOCAL/$PATH_LOCAL_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_PHONE_LOCAL_WLAN $PHONE $PHONE_MAC
-./main_flow.sh $PATH_REMOTE/$PATH_REMOTE_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_PHONE_REMOTE_WLAN $PHONE $PHONE_MAC
-#gnuplot $PATH_GNUPLOT
+#python ./base_gexf_generator.py $PATH_SETUP/$PATH_SETUP_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_SETUP_WLAN.gexf
+#python ./base_gexf_generator.py $PATH_SETUP/$PATH_SETUP_ETH_JSON $PATH_DIR_RESULT/$PATH_RESULT_SETUP_ETH.gexf
+
+python ./base_gexf_generator.py $PATH_LOCAL/$PATH_LOCAL_WLAN_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_WLAN.gexf
+python ./parser/parse_packet_frequency.py $PATH_LOCAL/$PATH_LOCAL_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_WLAN $DEVICE $DEVICE_MAC
+python ./base_gexf_generator.py $PATH_LOCAL/$PATH_LOCAL_ETH_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_ETH.gexf
+python ./parser/parse_packet_frequency.py $PATH_LOCAL/$PATH_LOCAL_ETH_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_ETH $ROUTER $ROUTER_MAC
+
+python ./base_gexf_generator.py $PATH_REMOTE/$PATH_REMOTE_WLAN_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_WLAN.gexf
+python ./parser/parse_packet_frequency.py $PATH_REMOTE/$PATH_REMOTE_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_WLAN $DEVICE $DEVICE_MAC
+python ./base_gexf_generator.py $PATH_REMOTE/$PATH_REMOTE_ETH_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_ETH.gexf
+python ./parser/parse_packet_frequency.py $PATH_REMOTE/$PATH_REMOTE_ETH_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_ETH $ROUTER $ROUTER_MAC
+
+python ./parser/parse_packet_frequency.py $PATH_LOCAL/$PATH_LOCAL_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_PHONE_LOCAL_WLAN $PHONE $PHONE_MAC
+python ./parser/parse_packet_frequency.py $PATH_REMOTE/$PATH_REMOTE_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_PHONE_REMOTE_WLAN $PHONE $PHONE_MAC
+
+gnuplot $PATH_GNUPLOT
 gnuplot $PATH_GNUPLOT_COMBINED