Demo script enables waypoint now. Fixed original analytics script so that it can...

[affinity.git] / scripts / analytics.py

diff --git a/scripts/analytics.py b/scripts/analytics.py
index ebfb6b7866ec0b9f4580d3fd8e110ec99d25cc44..6ef2b9092f942f8f0cf119a6ec50f4c03e210913 100644 (file)
--- a/scripts/analytics.py
+++ b/scripts/analytics.py
@@ -37,25 +37,23 @@ def run_interactive_mode():
             if (request_type == "host"):
                 action = request[1]
                 src, dst = request[2:4]
-                host_stat = Stats("host", src=src, dst=dst)
+                host_stat = Stats(Stats.TYPE_HOST, src=src, dst=dst)
                 if (action == "bytes"):
                     print("%d bytes between %s and %s" % (host_stat.get_bytes(), src, dst))
                 elif (action == "rate"):
                     print("%f bit/s between %s and %s" % (host_stat.get_bit_rate(), src, dst))
                 else:
-                    print "wrong action"
                     raise Exception
 
             elif (request_type == "link"):
                 action = request[1]
                 link = request[2]
-                link_stat = Stats("affinityLink", al=link)
+                link_stat = Stats(Stats.TYPE_AL, al=link)
                 if (action == "bytes"):
                     print("%d bytes on %s" % (link_stat.get_bytes(), link))
                 elif (action == "rate"):
                     print("%f bit/s on %s" % (link_stat.get_bit_rate(), link))
                 else:
-                    print "wrong action 2"
                     raise Exception
 
             elif (request_type == "prefix"):
@@ -67,45 +65,12 @@ def run_interactive_mode():
                 if (resp.status == 200):
                     data = json.loads(content)
                     print data['byteCount'], "bytes"
-
             else:
-                print "something else"
                 raise Exception
         except Exception as e:
             print "Error"
             print e
 
-
-def get_all_hosts():
-
-    h = httplib2.Http(".cache")
-    h.add_credentials("admin", "admin")
-
-    resp, content = h.request("http://localhost:8080/controller/nb/v2/hosttracker/default/hosts/active", "GET")
-    host_content = json.loads(content)
-
-    # Even if there are no active hosts, host_content['hostConfig']
-    # still exists (and is empty)
-    active_hosts = []
-    for host_data in host_content['hostConfig']:
-        active_hosts.append(host_data['networkAddress'])
-    return active_hosts
-
-
-def run_passive_mode(affinity_links):
-    # TODO: Get affinity_links automatically
-    affinity_link_stats = {}
-
-    # Go through all affinity link stats
-    while True:
-        for al in affinity_links:
-            if al not in affinity_link_stats:
-                affinity_link_stats[al] = Stats("affinityLink", al=al)
-            stat = affinity_link_stats[al]
-            stat.refresh()
-            print "%d bytes (%1.1f Mbit/s) on %s" % (stat.get_bytes(), (stat.get_bit_rate() / (10**6)), al)
-        time.sleep(2)
-
 def main():
 
     # Default subnet is required for the host tracker to work.
@@ -114,17 +79,12 @@ def main():
 
     # Set up an affinity link
     affinity_control = AffinityControl()
-    affinity_control.add_affinity_group("testAG1", ["10.0.0.1", "10.0.0.2"])
-    affinity_control.add_affinity_group("testAG2", ["10.0.0.3", "10.0.0.4"])
+    affinity_control.add_affinity_group("testAG1", ips=["10.0.0.1", "10.0.0.2"])
+    affinity_control.add_affinity_group("testAG2", ips=["10.0.0.3", "10.0.0.4"])
     affinity_control.add_affinity_link("testAL", "testAG1", "testAG2")
     raw_input("[Press enter to continue]" )
 
-    interactive_mode = True
-
-    if interactive_mode:
-        run_interactive_mode()
-    else:
-        run_passive_mode(["testAL"])
+    run_interactive_mode()
 
 if __name__ == "__main__":
     main()