From 56b58177f7f7b84f55d1833ab90e8c3c4df78333 Mon Sep 17 00:00:00 2001 From: Katrina LaCurts Date: Wed, 6 Nov 2013 14:45:34 -0500 Subject: [PATCH] Added option in demo to disable waypoint redirection (and fixed typos in subnet.py) Signed-off-by: Katrina LaCurts --- scripts/affinity_control.py | 9 ++++++++- scripts/demo.py | 2 ++ scripts/subnet.py | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/scripts/affinity_control.py b/scripts/affinity_control.py index b3a3d5b..540fea9 100644 --- a/scripts/affinity_control.py +++ b/scripts/affinity_control.py @@ -56,6 +56,13 @@ class AffinityControl: resp, content = self.http.request(self.url_prefix + "link/%s/enable" % link_name, "PUT") if (resp.status != 201): print "Waypoint could not be enabled for link %s" % link_name - print resp.status return print "Waypoint enabled for link %s" % link_name + + # Disable waypoint + def disable_waypoint(self, link_name): + resp, content = self.http.request(self.url_prefix + "link/%s/disable" % link_name, "PUT") + if (resp.status != 201): + print "Waypoint could not be disabled for link %s" % link_name + return + print "Waypoint disabled for link %s" % link_name diff --git a/scripts/demo.py b/scripts/demo.py index 78c4d6d..fcbe30d 100644 --- a/scripts/demo.py +++ b/scripts/demo.py @@ -66,6 +66,8 @@ class WaypointMonitor(Thread): ac.add_waypoint(link_name, self.waypoint_address) ac.enable_waypoint(link_name) did_waypoint = True + raw_input("[Press Enter to disable waypoint redirection] ") + ac.disable_waypoint(link_name) time.sleep(1) def main(): diff --git a/scripts/subnet.py b/scripts/subnet.py index 2083dd3..d88ba2a 100644 --- a/scripts/subnet.py +++ b/scripts/subnet.py @@ -33,12 +33,12 @@ class SubnetControl: # Add a subnet if it doesn't already exist. def add_subnet(self, subnet_name, subnet): if (self.exists(subnet)): - print "subnet", subnet, "already exists" + print "Subnet", subnet, "already exists" return subnet_config = dict(name=subnet_name, subnet=subnet) json_data = json.dumps(subnet_config) resp, content = self.http.request(self.url_prefix + "subnet/" + subnet_name, "POST", json_data, {'Content-Type': 'application/json'}) if (resp.status == 201): - print "subnet", subnet, "added" + print "Subnet", subnet, "added" else: - print "subnet", subnet, "could not be added" + print "Subnet", subnet, "could not be added" -- 2.36.6