From 8c23258ae81d39ecf5dd02a6dcad88908a4ef619 Mon Sep 17 00:00:00 2001 From: Vitaliy Kharechko Date: Tue, 12 Apr 2016 17:25:22 +0300 Subject: [PATCH] Fix bogus config POST URL that was accepted by 2.x agents, but not by 3.x agents Change-Id: I09051a93eda590bffeb5603b2644d907fbf2cf8b --- broadview_lib/config/agentapi.py | 6 ++++++ broadview_lib/config/agentconnection.py | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/broadview_lib/config/agentapi.py b/broadview_lib/config/agentapi.py index 7f7f752..832fb16 100644 --- a/broadview_lib/config/agentapi.py +++ b/broadview_lib/config/agentapi.py @@ -49,6 +49,12 @@ class AgentAPI(object): def getFeature(self): return self.__feature + def getMethod(self): + ret = None + if self.__payload: + ret = self.__payload["method"] + return ret + def _send(self, o, timeout): self.__payload = {} self.__payload["jsonrpc"] = "2.0" diff --git a/broadview_lib/config/agentconnection.py b/broadview_lib/config/agentconnection.py index 6490f37..2af45c1 100644 --- a/broadview_lib/config/agentconnection.py +++ b/broadview_lib/config/agentconnection.py @@ -83,9 +83,9 @@ class AgentConnection(): if False and isGet: payload = request.getjson().encode("utf-8") if self.feature: - url = "http://%s:%d/broadview/%s/%s%s%s" % (self.host, self.port, self.feature, request.getHttpMethod(), "?req=", payload) + url = "http://%s:%d/broadview/%s/%s%s%s" % (self.host, self.port, self.feature, request.getMethod(), "?req=", payload) else: - url = "http://%s:%d/broadview/%s%s%s" % (self.host, self.port, request.getHttpMethod(), "?req=", payload) + url = "http://%s:%d/broadview/%s%s%s" % (self.host, self.port, request.getMethod(), "?req=", payload) try: r = requests.get(url, timeout=self._timeout, headers=headers) except requests.exceptions.Timeout: @@ -93,9 +93,9 @@ class AgentConnection(): else: payload = request.getjson().encode("utf-8") if self.feature: - url = "http://%s:%d/broadview/%s/%s" % (self.host, self.port, self.feature, request.getHttpMethod()) + url = "http://%s:%d/broadview/%s/%s" % (self.host, self.port, self.feature, request.getMethod()) else: - url = "http://%s:%d/broadview/%s" % (self.host, self.port, request.getHttpMethod()) + url = "http://%s:%d/broadview/%s" % (self.host, self.port, request.getMethod()) if isGet: try: r = requests.get(url, timeout=self._timeout, data=payload, headers=headers)