from osmclient.common import utils
from osmclient.common.exceptions import ClientException
from osmclient.common.exceptions import NotFound
-from osmclient.common.exceptions import OsmHttpException
import json
import yaml
import logging
role["permissions"] = role_permissions
http_code, resp = self._http.post_cmd(endpoint=self._apiBase,
- postfields_dict=role)
+ postfields_dict=role,
+ skip_query_admin=True)
# print('HTTP CODE: {}'.format(http_code))
# print('RESP: {}'.format(resp))
#if http_code in (200, 201, 202, 204):
if resp:
resp = json.loads(resp)
if not resp or 'id' not in resp:
- raise OsmHttpException('Unexpected response from server - {}'.format(
- resp))
+ raise ClientException('Unexpected response from server - {}'.format(
+ resp))
print(resp['id'])
#else:
# msg = ""
del new_role_obj["permissions"]
http_code, resp = self._http.patch_cmd(endpoint='{}/{}'.format(self._apiBase, role_obj['_id']),
- postfields_dict=new_role_obj)
+ postfields_dict=new_role_obj,
+ skip_query_admin=True)
# print('HTTP CODE: {}'.format(http_code))
# print('RESP: {}'.format(resp))
if http_code in (200, 201, 202):
if resp:
resp = json.loads(resp)
if not resp or 'id' not in resp:
- raise OsmHttpException('Unexpected response from server - {}'.format(
- resp))
+ raise ClientException('Unexpected response from server - {}'.format(
+ resp))
print(resp['id'])
elif http_code == 204:
print("Updated")
if force:
querystring = '?FORCE=True'
http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase,
- role['_id'], querystring))
+ role['_id'], querystring),
+ skip_query_admin=True)
# print('HTTP CODE: {}'.format(http_code))
# print('RESP: {}'.format(resp))
if http_code == 202:
elif resp and 'result' in resp:
print('Deleted')
else:
- msg = ""
- if resp:
- try:
- msg = json.loads(resp)
- except ValueError:
- msg = resp
- raise OsmHttpException("Failed to delete role {} - {}".format(name, msg))
+ msg = resp or ""
+ # if resp:
+ # try:
+ # msg = json.loads(resp)
+ # except ValueError:
+ # msg = resp
+ raise ClientException("Failed to delete role {} - {}".format(name, msg))
def list(self, filter=None):
"""
filter_string = ''
if filter:
filter_string = '?{}'.format(filter)
- _, resp = self._http.get2_cmd('{}{}'.format(self._apiBase, filter_string))
+ _, resp = self._http.get2_cmd('{}{}'.format(self._apiBase, filter_string),skip_query_admin=True)
# print('RESP: {}'.format(resp))
if resp:
return json.loads(resp)