x/broadview-lib
Code Issues Proposed changes

Fix bogus config POST URL that was accepted by 2.x agents, but not by 3.x agents

Browse Source 
Change-Id: I09051a93eda590bffeb5603b2644d907fbf2cf8b
This commit is contained in:
Vitaliy Kharechko 2016-04-12 17:25:22 +03:00
parent 2350501da5
commit 8c23258ae8
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
broadview_lib/config/agentapi.py
View File

@ -49,6 +49,12 @@ class AgentAPI(object):
def getFeature(self): def getFeature(self):
return self.__feature return self.__feature
def getMethod(self):
ret = None
if self.__payload:
ret = self.__payload["method"]
return ret
def _send(self, o, timeout): def _send(self, o, timeout):
self.__payload = {} self.__payload = {}
self.__payload["jsonrpc"] = "2.0" self.__payload["jsonrpc"] = "2.0"

8
broadview_lib/config/agentconnection.py
View File

@ -83,9 +83,9 @@ class AgentConnection():
if False and isGet: if False and isGet:
payload = request.getjson().encode("utf-8") payload = request.getjson().encode("utf-8")
if self.feature: 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: 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: try:
r = requests.get(url, timeout=self._timeout, headers=headers) r = requests.get(url, timeout=self._timeout, headers=headers)
except requests.exceptions.Timeout: except requests.exceptions.Timeout:
@ -93,9 +93,9 @@ class AgentConnection():
else: else:
payload = request.getjson().encode("utf-8") payload = request.getjson().encode("utf-8")
if self.feature: 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: 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: if isGet:
try: try:
r = requests.get(url, timeout=self._timeout, data=payload, headers=headers) r = requests.get(url, timeout=self._timeout, data=payload, headers=headers)