From 2c6ea1e90504edcba1c0c000d40828d532c4ba3f Mon Sep 17 00:00:00 2001 From: checktheroads Date: Tue, 11 Jun 2019 15:06:01 -0700 Subject: [PATCH] migrating away from legacy cmd key for FRR API --- hyperglass/command/construct.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/hyperglass/command/construct.py b/hyperglass/command/construct.py index 51b3c66..3ce3468 100644 --- a/hyperglass/command/construct.py +++ b/hyperglass/command/construct.py @@ -68,7 +68,12 @@ class Construct: source = self.get_src(ip_version) if transport == "rest": query = json.dumps( - {"cmd": query_type, "afi": afi, "source": source, "target": target} + { + "query_type": query_type, + "afi": afi, + "source": source, + "target": target, + } ) if transport == "scrape": conf_command = self.command[afi][query_type] @@ -87,7 +92,12 @@ class Construct: source = self.get_src(ip_version) if transport == "rest": query = json.dumps( - {"cmd": query_type, "afi": afi, "source": source, "target": target} + { + "query_type": query_type, + "afi": afi, + "source": source, + "target": target, + } ) if transport == "scrape": @@ -105,7 +115,7 @@ class Construct: ip_version = IPNetwork(target).ip.version afi = f"ipv{ip_version}" if transport == "rest": - query = json.dumps({"cmd": query_type, "afi": afi, "target": target}) + query = json.dumps({"query_type": query_type, "afi": afi, "target": target}) if transport == "scrape": conf_command = self.command[afi][query_type] fmt_command = conf_command.format(target=target) @@ -120,7 +130,7 @@ class Construct: afi = "dual" query = None if transport == "rest": - query = json.dumps({"cmd": query_type, "afi": afi, "target": target}) + query = json.dumps({"query_type": query_type, "afi": afi, "target": target}) if transport == "scrape": conf_command = self.command[afi][query_type] fmt_command = conf_command.format(target=target) @@ -135,7 +145,7 @@ class Construct: afi = "dual" query = None if transport == "rest": - query = json.dumps({"cmd": query_type, "afi": afi, "target": target}) + query = json.dumps({"query_type": query_type, "afi": afi, "target": target}) if transport == "scrape": conf_command = self.command[afi][query_type] fmt_command = conf_command.format(target=target)