|
|
@ -117,11 +117,11 @@ class FortiOSHandler(object):
|
|
|
|
|
|
|
|
|
|
|
|
if status == 200:
|
|
|
|
if status == 200:
|
|
|
|
if vdom == "global":
|
|
|
|
if vdom == "global":
|
|
|
|
return json.loads(result_data)[0]['results']
|
|
|
|
return json.loads(to_text(result_data))[0]['results']
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
return json.loads(result_data)['results']
|
|
|
|
return json.loads(to_text(result_data))['results']
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
return json.loads(result_data)
|
|
|
|
return json.loads(to_text(result_data))
|
|
|
|
|
|
|
|
|
|
|
|
def get_mkeyname(self, path, name, vdom=None):
|
|
|
|
def get_mkeyname(self, path, name, vdom=None):
|
|
|
|
schema = self.schema(path, name, vdom=vdom)
|
|
|
|
schema = self.schema(path, name, vdom=vdom)
|
|
|
@ -200,10 +200,10 @@ class FortiOSHandler(object):
|
|
|
|
|
|
|
|
|
|
|
|
def formatresponse(self, res, vdom=None):
|
|
|
|
def formatresponse(self, res, vdom=None):
|
|
|
|
if vdom == "global":
|
|
|
|
if vdom == "global":
|
|
|
|
resp = json.loads(res)[0]
|
|
|
|
resp = json.loads(to_text(res))[0]
|
|
|
|
resp['vdom'] = "global"
|
|
|
|
resp['vdom'] = "global"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
resp = json.loads(res)
|
|
|
|
resp = json.loads(to_text(res))
|
|
|
|
return resp
|
|
|
|
return resp
|
|
|
|
|
|
|
|
|
|
|
|
# BEGIN DEPRECATED
|
|
|
|
# BEGIN DEPRECATED
|
|
|
|