X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=lib%2Fosm%2Fosmclient%2Fclientv2.py;h=9e9973cf341425c200c2c2c1040ca32f18c8427a;hb=refs%2Ftags%2Fv8.0.2;hp=2025277a6447b098d777a499d0943227da7b4b01;hpb=76483c324d672f50620cc1fb3c838e03fa5f8819;p=osm%2FLW-UI.git diff --git a/lib/osm/osmclient/clientv2.py b/lib/osm/osmclient/clientv2.py index 2025277..9e9973c 100644 --- a/lib/osm/osmclient/clientv2.py +++ b/lib/osm/osmclient/clientv2.py @@ -22,6 +22,7 @@ import StringIO from lib.util import Util import hashlib import os +import re from requests.packages.urllib3.exceptions import InsecureRequestWarning requests.packages.urllib3.disable_warnings(InsecureRequestWarning) @@ -37,19 +38,22 @@ class Client(object): self._user_endpoint = 'admin/v1/users' self._host = os.getenv('OSM_SERVER', "localhost") self._so_port = 9999 - self._base_path = 'https://{0}:{1}/osm'.format(self._host, self._so_port) + self._base_path = 'https://{0}:{1}/osm'.format( + self._host, self._so_port) def auth(self, args): result = {'error': True, 'data': ''} token_url = "{0}/{1}".format(self._base_path, self._token_endpoint) - headers = {"Content-Type": "application/yaml", "accept": "application/json"} + headers = {"Content-Type": "application/yaml", + "accept": "application/json"} try: - r = requests.post(token_url, json=args, verify=False, headers=headers) + r = requests.post(token_url, json=args, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -59,20 +63,116 @@ class Client(object): def switch_project(self, args): result = {'error': True, 'data': ''} token_url = "{0}/{1}".format(self._base_path, self._token_endpoint) - headers = {"Content-Type": "application/yaml", "accept": "application/json"} + headers = {"Content-Type": "application/yaml", + "accept": "application/json"} try: - r = requests.post(token_url, json=args, verify=False, headers=headers) + r = requests.post(token_url, json=args, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result + def role_list(self, token): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/roles".format(self._base_path) + try: + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + + return result + + def role_create(self, token, role_data): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + _url = "{0}/admin/v1/roles".format(self._base_path) + + try: + r = requests.post(_url, json=role_data, + verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + + def role_update(self, token, role_id, role_data): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + _url = "{0}/admin/v1/roles/{1}".format(self._base_path, role_id) + try: + r = requests.patch(_url, json=role_data, + verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + else: + result['data'] = Util.json_loads_byteified(r.text) + return result + + def role_delete(self, token, id, force=None): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + query_path = '' + if force: + query_path = '?FORCE=true' + _url = "{0}/admin/v1/roles/{1}{2}".format( + self._base_path, id, query_path) + try: + r = requests.delete(_url, params=None, + verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + else: + result['data'] = Util.json_loads_byteified(r.text) + return result + + def role_get(self, token, id): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/roles/{1}".format(self._base_path, id) + try: + r = requests.get(_url, params=None, verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + def user_list(self, token): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/json", "accept": "application/json", @@ -80,12 +180,13 @@ class Client(object): _url = "{0}/admin/v1/users".format(self._base_path) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -99,12 +200,13 @@ class Client(object): _url = "{0}/admin/v1/users".format(self._base_path) try: - r = requests.post(_url, json=user_data, verify=False, headers=headers) + r = requests.post(_url, json=user_data, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -116,12 +218,13 @@ class Client(object): _url = "{0}/admin/v1/users/{1}".format(self._base_path, id) try: - r = requests.patch(_url, json=user_data, verify=False, headers=headers) + r = requests.patch(_url, json=user_data, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.no_content: + if r.status_code in (200, 201, 202, 204): result['error'] = False else: result['data'] = Util.json_loads_byteified(r.text) @@ -134,12 +237,13 @@ class Client(object): _url = "{0}/admin/v1/users/{1}".format(self._base_path, id) try: - r = requests.delete(_url, params=None, verify=False, headers=headers) + r = requests.delete(_url, params=None, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.no_content: + if r.status_code in (200, 201, 202, 204): result['error'] = False else: result['data'] = Util.json_loads_byteified(r.text) @@ -151,16 +255,58 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/admin/v1/users/{1}".format(self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result + def get_domains(self, token): + result = {'error': False, 'data': ''} + headers = {"accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/domains".format(self._base_path) + try: + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + + result['data'] = Util.json_loads_byteified(r.text) + return result + + def get_projects(self, token, uuids): + result = {'error': False, 'data': ''} + headers = {"Content-Type": "application/yaml", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + projects = [] + try: + for uuid in uuids: + _url = "{0}/admin/v1/projects/{1}".format( + self._base_path, uuid) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) + if r.status_code not in (200, 201, 202, 204): + raise Exception() + projects.append(Util.json_loads_byteified(r.text)) + except Exception as e: + log.exception(e) + result['error'] = True + result['data'] = str(e) + return result + result['data'] = projects + return result + def project_list(self, token): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/yaml", "accept": "application/json", @@ -168,12 +314,13 @@ class Client(object): _url = "{0}/admin/v1/projects".format(self._base_path) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -185,12 +332,13 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/admin/v1/projects/{1}".format(self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -204,12 +352,13 @@ class Client(object): _url = "{0}/admin/v1/projects".format(self._base_path) try: - r = requests.post(_url, json=project_data, verify=False, headers=headers) + r = requests.post(_url, json=project_data, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -223,14 +372,14 @@ class Client(object): _url = "{0}/admin/v1/projects/{1}".format(self._base_path, id) try: - r = requests.put(_url, json=project_data, verify=False, headers=headers) + r = requests.patch(_url, json=project_data, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.no_content: + if r.status_code in (200, 201, 202, 204): result['error'] = False - result['data'] = Util.json_loads_byteified(r.text) return result def project_delete(self, token, id): @@ -240,12 +389,13 @@ class Client(object): _url = "{0}/admin/v1/projects/{1}".format(self._base_path, id) try: - r = requests.delete(_url, params=None, verify=False, headers=headers) + r = requests.delete(_url, params=None, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.no_content: + if r.status_code in (200, 201, 202, 204): result['error'] = False else: result['data'] = Util.json_loads_byteified(r.text) @@ -255,14 +405,15 @@ class Client(object): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/json", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nst/v1/netslice_templates/{1}".format(self._base_path,id) + _url = "{0}/nst/v1/netslice_templates/{1}".format(self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -272,16 +423,18 @@ class Client(object): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/json", "accept": "text/plain", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nst/v1/netslice_templates/{1}/nst".format(self._base_path,id) + _url = "{0}/nst/v1/netslice_templates/{1}/nst".format( + self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False - result['data'] = Util.json2yaml(yaml.load(str(r.text))) + result['data'] = Util.json2yaml(yaml.load(str(r.text))) return result @@ -289,15 +442,16 @@ class Client(object): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/yaml", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - + _url = "{0}/nst/v1/netslice_templates".format(self._base_path) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -310,14 +464,16 @@ class Client(object): query_path = '' if filter: query_path = '?_admin.type='+filter - _url = "{0}/nsd/v1/ns_descriptors_content{1}".format(self._base_path, query_path) + _url = "{0}/nsd/v1/ns_descriptors_content{1}".format( + self._base_path, query_path) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -330,14 +486,16 @@ class Client(object): query_path = '' if filter: query_path = '?_admin.type='+filter - _url = "{0}/vnfpkgm/v1/vnf_packages_content{1}".format(self._base_path, query_path) + _url = "{0}/vnfpkgm/v1/vnf_packages_content{1}".format( + self._base_path, query_path) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -349,29 +507,31 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/nsilcm/v1/netslice_instances".format(self._base_path) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result - + def ns_list(self, token): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/yaml", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/nslcm/v1/ns_instances_content".format(self._base_path) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -383,12 +543,13 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/nslcm/v1/vnfrs".format(self._base_path) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -400,12 +561,13 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/pdu/v1/pdu_descriptors".format(self._base_path) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -416,16 +578,18 @@ class Client(object): headers = {"Content-Type": "application/yaml", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nst/v1/netslice_templates/{1}?FORCE=True".format(self._base_path, id) + _url = "{0}/nst/v1/netslice_templates/{1}?FORCE=True".format( + self._base_path, id) try: - r = requests.delete(_url, params=None, verify=False, headers=headers) + r = requests.delete(_url, params=None, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.no_content: + if r.status_code in (200, 201, 202, 204): result['error'] = False - + return result def nsd_delete(self, token, id): @@ -433,9 +597,11 @@ class Client(object): headers = {"Content-Type": "application/yaml", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nsd/v1/ns_descriptors_content/{1}".format(self._base_path, id) + _url = "{0}/nsd/v1/ns_descriptors_content/{1}".format( + self._base_path, id) try: - r = requests.delete(_url, params=None, verify=False, headers=headers) + r = requests.delete(_url, params=None, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) @@ -451,9 +617,11 @@ class Client(object): headers = {"Content-Type": "application/yaml", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/vnfpkgm/v1/vnf_packages_content/{1}".format(self._base_path, id) + _url = "{0}/vnfpkgm/v1/vnf_packages_content/{1}".format( + self._base_path, id) try: - r = requests.delete(_url, params=None, verify=False, headers=headers) + r = requests.delete(_url, params=None, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) @@ -475,12 +643,13 @@ class Client(object): headers["Content-Type"] = "application/gzip" else: headers["Content-Type"] = "application/yaml" - r = requests.post(_url, data=template, verify=False, headers=headers) + r = requests.post(_url, data=template, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -492,15 +661,17 @@ class Client(object): with open('/tmp/' + package.name, 'wb+') as destination: for chunk in package.chunks(): destination.write(chunk) - headers['Content-File-MD5'] = self.md5(open('/tmp/' + package.name, 'rb')) + headers['Content-File-MD5'] = self.md5( + open('/tmp/' + package.name, 'rb')) _url = "{0}/nsd/v1/ns_descriptors_content/".format(self._base_path) try: - r = requests.post(_url, data=open('/tmp/' + package.name, 'rb'), verify=False, headers=headers) + r = requests.post(_url, data=open( + '/tmp/' + package.name, 'rb'), verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -512,15 +683,17 @@ class Client(object): with open('/tmp/' + package.name, 'wb+') as destination: for chunk in package.chunks(): destination.write(chunk) - headers['Content-File-MD5'] = self.md5(open('/tmp/' + package.name, 'rb')) + headers['Content-File-MD5'] = self.md5( + open('/tmp/' + package.name, 'rb')) _url = "{0}/vnfpkgm/v1/vnf_packages_content".format(self._base_path) try: - r = requests.post(_url, data=open('/tmp/' + package.name, 'rb'), verify=False, headers=headers) + r = requests.post(_url, data=open( + '/tmp/' + package.name, 'rb'), verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -535,12 +708,13 @@ class Client(object): try: self._create_base_pkg('nsd', pkg_name) headers['Content-Filename'] = pkg_name + '.tar.gz' - r = requests.post(_url, data=open('/tmp/' + pkg_name + '.tar.gz', 'rb'), verify=False, headers=headers) + r = requests.post(_url, data=open( + '/tmp/' + pkg_name + '.tar.gz', 'rb'), verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): result['data'] = r.json() result['error'] = False if r.status_code == requests.codes.conflict: @@ -556,12 +730,13 @@ class Client(object): try: self._create_base_pkg('vnfd', pkg_name) - r = requests.post(_url, data=open('/tmp/' + pkg_name + '.tar.gz', 'rb'), verify=False, headers=headers) + r = requests.post(_url, data=open( + '/tmp/' + pkg_name + '.tar.gz', 'rb'), verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): result['data'] = r.json() result['error'] = False if r.status_code == requests.codes.conflict: @@ -577,7 +752,8 @@ class Client(object): tar_pkg = self.get_nsd_pkg(token, id) tarf = tarfile.open(fileobj=tar_pkg) tarf = self._descriptor_clone(tarf, 'nsd') - headers['Content-File-MD5'] = self.md5(open('/tmp/' + tarf.getnames()[0] + "_clone.tar.gz", 'rb')) + headers['Content-File-MD5'] = self.md5( + open('/tmp/' + tarf.getnames()[0] + "_clone.tar.gz", 'rb')) _url = "{0}/nsd/v1/ns_descriptors_content/".format(self._base_path) @@ -588,7 +764,7 @@ class Client(object): log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): result['error'] = False if r.status_code == requests.codes.conflict: result['data'] = "Invalid ID." @@ -605,7 +781,8 @@ class Client(object): tarf = tarfile.open(fileobj=tar_pkg) tarf = self._descriptor_clone(tarf, 'vnfd') - headers['Content-File-MD5'] = self.md5(open('/tmp/' + tarf.getnames()[0] + "_clone.tar.gz", 'rb')) + headers['Content-File-MD5'] = self.md5( + open('/tmp/' + tarf.getnames()[0] + "_clone.tar.gz", 'rb')) _url = "{0}/vnfpkgm/v1/vnf_packages_content".format(self._base_path) @@ -616,7 +793,7 @@ class Client(object): log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): result['error'] = False if r.status_code == requests.codes.conflict: result['data'] = "Invalid ID." @@ -627,14 +804,16 @@ class Client(object): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/yaml", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nst/v1/netslice_templates/{1}/nst_content".format(self._base_path,id) + _url = "{0}/nst/v1/netslice_templates/{1}/nst_content".format( + self._base_path, id) try: - r = requests.put(_url, data=template, verify=False, headers=headers) + r = requests.put(_url, data=template, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.no_content: + if r.status_code in (200, 201, 202, 204): result['error'] = False return result @@ -648,9 +827,11 @@ class Client(object): tarf = tarfile.open(fileobj=tar_pkg) tarf = self._descriptor_update(tarf, data) - headers['Content-File-MD5'] = self.md5(open('/tmp/' + tarf.getnames()[0] + ".tar.gz", 'rb')) + headers['Content-File-MD5'] = self.md5( + open('/tmp/' + tarf.getnames()[0] + ".tar.gz", 'rb')) - _url = "{0}/nsd/v1/ns_descriptors/{1}/nsd_content".format(self._base_path, id) + _url = "{0}/nsd/v1/ns_descriptors/{1}/nsd_content".format( + self._base_path, id) try: r = requests.put(_url, data=open('/tmp/' + tarf.getnames()[0] + ".tar.gz", 'rb'), verify=False, @@ -659,7 +840,7 @@ class Client(object): log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.no_content: + if r.status_code in (200, 201, 202, 204): result['error'] = False else: try: @@ -679,9 +860,11 @@ class Client(object): tarf = tarfile.open(fileobj=tar_pkg) tarf = self._descriptor_update(tarf, data) - headers['Content-File-MD5'] = self.md5(open('/tmp/' + tarf.getnames()[0] + ".tar.gz", 'rb')) + headers['Content-File-MD5'] = self.md5( + open('/tmp/' + tarf.getnames()[0] + ".tar.gz", 'rb')) - _url = "{0}/vnfpkgm/v1/vnf_packages/{1}/package_content".format(self._base_path, id) + _url = "{0}/vnfpkgm/v1/vnf_packages/{1}/package_content".format( + self._base_path, id) try: r = requests.put(_url, data=open('/tmp/' + tarf.getnames()[0] + ".tar.gz", 'rb'), verify=False, @@ -690,7 +873,7 @@ class Client(object): log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.no_content: + if r.status_code in (200, 201, 202, 204): result['error'] = False else: try: @@ -705,14 +888,16 @@ class Client(object): headers = {"accept": "application/zip", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nsd/v1/ns_descriptors/{1}/nsd_content".format(self._base_path, id) + _url = "{0}/nsd/v1/ns_descriptors/{1}/nsd_content".format( + self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False tarf = StringIO.StringIO(r.content) return tarf @@ -722,14 +907,16 @@ class Client(object): result = {'error': True, 'data': ''} headers = {"accept": "application/zip", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/vnfpkgm/v1/vnf_packages/{1}/package_content".format(self._base_path, id) + _url = "{0}/vnfpkgm/v1/vnf_packages/{1}/package_content".format( + self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False tarf = StringIO.StringIO(r.content) return tarf @@ -738,17 +925,19 @@ class Client(object): def _descriptor_update(self, tarf, data): # extract the package on a tmp directory tarf.extractall('/tmp') - + regex = re.compile(r"^[^/]+(/[^/]+\.(yaml|yml))$", re.U) for name in tarf.getnames(): - if name.endswith(".yaml") or name.endswith(".yml"): + if regex.match(name): with open('/tmp/' + name, 'w') as outfile: yaml.safe_dump(data, outfile, default_flow_style=False) break - tarf_temp = tarfile.open('/tmp/' + tarf.getnames()[0] + ".tar.gz", "w:gz") + tarf_temp = tarfile.open( + '/tmp/' + tarf.getnames()[0] + ".tar.gz", "w:gz") for tarinfo in tarf: - tarf_temp.add('/tmp/' + tarinfo.name, tarinfo.name, recursive=False) + tarf_temp.add('/tmp/' + tarinfo.name, + tarinfo.name, recursive=False) tarf_temp.close() return tarf @@ -804,7 +993,8 @@ class Client(object): yaml_file.write(yaml.dump(descriptor, default_flow_style=False)) tarf_temp = tarfile.open('/tmp/' + pkg_name + '.tar.gz', "w:gz") - tarf_temp.add('/tmp/'+pkg_name+'/' + pkg_name + '.yaml', pkg_name + '/' + pkg_name + '.yaml', recursive=False) + tarf_temp.add('/tmp/'+pkg_name+'/' + pkg_name + '.yaml', + pkg_name + '/' + pkg_name + '.yaml', recursive=False) tarf_temp.close() def _descriptor_clone(self, tarf, descriptor_type): @@ -830,13 +1020,16 @@ class Client(object): vnfd['short-name'] = 'clone_' + vnfd['short-name'] with open('/tmp/' + name, 'w') as yaml_file: - yaml_file.write(yaml.dump(yaml_object, default_flow_style=False)) + yaml_file.write( + yaml.dump(yaml_object, default_flow_style=False)) break - tarf_temp = tarfile.open('/tmp/' + tarf.getnames()[0] + "_clone.tar.gz", "w:gz") + tarf_temp = tarfile.open( + '/tmp/' + tarf.getnames()[0] + "_clone.tar.gz", "w:gz") for tarinfo in tarf: - tarf_temp.add('/tmp/' + tarinfo.name, tarinfo.name, recursive=False) + tarf_temp.add('/tmp/' + tarinfo.name, + tarinfo.name, recursive=False) tarf_temp.close() return tarf @@ -846,12 +1039,13 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/nsd/v1/ns_descriptors/{1}/nsd".format(self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False return yaml.load(r.text) else: @@ -865,14 +1059,16 @@ class Client(object): result = {'error': True, 'data': ''} headers = {'Content-Type': 'application/yaml', 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/vnfpkgm/v1/vnf_packages/{1}/vnfd".format(self._base_path, id) + _url = "{0}/vnfpkgm/v1/vnf_packages/{1}/vnfd".format( + self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False return yaml.load(r.text) else: @@ -886,14 +1082,16 @@ class Client(object): result = {'error': True, 'data': ''} headers = {'Content-Type': 'application/yaml', 'accept': 'text/plain', 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nsd/v1/ns_descriptors/{1}/artifacts".format(self._base_path, id) + _url = "{0}/nsd/v1/ns_descriptors/{1}/artifacts".format( + self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = r.text else: @@ -908,14 +1106,16 @@ class Client(object): result = {'error': True, 'data': ''} headers = {'Content-Type': 'application/yaml', 'accept': 'text/plain', 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/vnfpkgm/v1/vnf_packages/{1}/artifacts".format(self._base_path, id) + _url = "{0}/vnfpkgm/v1/vnf_packages/{1}/artifacts".format( + self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = r.text else: @@ -931,15 +1131,17 @@ class Client(object): headers = {"Content-Type": "application/yaml", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nsilcm/v1/netslice_instances_content".format(self._base_path) + _url = "{0}/nsilcm/v1/netslice_instances_content".format( + self._base_path) try: - r = requests.post(_url, json=nsi_data, verify=False, headers=headers) + r = requests.post(_url, json=nsi_data, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -952,12 +1154,13 @@ class Client(object): _url = "{0}/nslcm/v1/ns_instances_content".format(self._base_path) try: - r = requests.post(_url, json=ns_data, verify=False, headers=headers) + r = requests.post(_url, json=ns_data, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -970,12 +1173,13 @@ class Client(object): _url = "{0}/pdu/v1/pdu_descriptors".format(self._base_path) try: - r = requests.post(_url, json=pdu_data, verify=False, headers=headers) + r = requests.post(_url, json=pdu_data, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -984,15 +1188,17 @@ class Client(object): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/json", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nslcm/v1/ns_lcm_op_occs/?nsInstanceId={1}".format(self._base_path, id) + _url = "{0}/nslcm/v1/ns_lcm_op_occs/?nsInstanceId={1}".format( + self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -1002,15 +1208,17 @@ class Client(object): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/json", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nsilcm/v1/nsi_lcm_op_occs/?nsInstanceId={1}".format(self._base_path, id) + _url = "{0}/nsilcm/v1/nsi_lcm_op_occs/?netsliceInstanceId={1}".format( + self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -1023,12 +1231,13 @@ class Client(object): _url = "{0}/nslcm/v1/ns_lcm_op_occs/{1}".format(self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -1039,15 +1248,17 @@ class Client(object): headers = {"Content-Type": "application/json", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nslcm/v1/ns_instances/{1}/action".format(self._base_path, id) + _url = "{0}/nslcm/v1/ns_instances/{1}/action".format( + self._base_path, id) try: - r = requests.post(_url, json=action_payload, verify=False, headers=headers) + r = requests.post(_url, json=action_payload, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -1059,9 +1270,11 @@ class Client(object): query_path = '' if force: query_path = '?FORCE=true' - _url = "{0}/nsilcm/v1/netslice_instances_content/{1}{2}".format(self._base_path, id, query_path) + _url = "{0}/nsilcm/v1/netslice_instances_content/{1}{2}".format( + self._base_path, id, query_path) try: - r = requests.delete(_url, params=None, verify=False, headers=headers) + r = requests.delete(_url, params=None, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) @@ -1079,9 +1292,11 @@ class Client(object): query_path = '' if force: query_path = '?FORCE=true' - _url = "{0}/nslcm/v1/ns_instances_content/{1}{2}".format(self._base_path, id, query_path) + _url = "{0}/nslcm/v1/ns_instances_content/{1}{2}".format( + self._base_path, id, query_path) try: - r = requests.delete(_url, params=None, verify=False, headers=headers) + r = requests.delete(_url, params=None, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) @@ -1098,7 +1313,8 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/pdu/v1/pdu_descriptors/{1}".format(self._base_path, id) try: - r = requests.delete(_url, params=None, verify=False, headers=headers) + r = requests.delete(_url, params=None, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) @@ -1113,15 +1329,17 @@ class Client(object): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/json", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nsilcm/v1/netslice_instances/{1}".format(self._base_path, id) + _url = "{0}/nsilcm/v1/netslice_instances/{1}".format( + self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -1130,15 +1348,17 @@ class Client(object): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/json", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - _url = "{0}/nslcm/v1/ns_instances_content/{1}".format(self._base_path, id) + _url = "{0}/nslcm/v1/ns_instances_content/{1}".format( + self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -1150,12 +1370,13 @@ class Client(object): _url = "{0}/nslcm/v1/vnfrs/{1}".format(self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -1167,12 +1388,13 @@ class Client(object): _url = "{0}/pdu/v1/pdu_descriptors/{1}".format(self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -1183,12 +1405,13 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/test/message/alarm_request".format(self._base_path) try: - r = requests.post(_url, json=alarm_payload, verify=False, headers=headers) + r = requests.post(_url, json=alarm_payload, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False # result['data'] = Util.json_loads_byteified(r.text) result['data'] = r.text @@ -1200,12 +1423,13 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/test/message/metric_request".format(self._base_path) try: - r = requests.post(_url, json=metric_payload, verify=False, headers=headers) + r = requests.post(_url, json=metric_payload, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False # result['data'] = Util.json_loads_byteified(r.text) result['data'] = r.text @@ -1217,12 +1441,13 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/admin/v1/wim_accounts".format(self._base_path) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -1234,12 +1459,13 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/admin/v1/vims".format(self._base_path) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) @@ -1251,12 +1477,13 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/admin/v1/wim_accounts/{1}".format(self._base_path, id) try: - r = requests.delete(_url, params=None, verify=False, headers=headers) + r = requests.delete(_url, params=None, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.accepted: + if r.status_code in (200, 201, 202, 204): result['error'] = False else: result['data'] = r.text @@ -1268,12 +1495,13 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/admin/v1/vims/{1}".format(self._base_path, id) try: - r = requests.delete(_url, params=None, verify=False, headers=headers) + r = requests.delete(_url, params=None, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.accepted: + if r.status_code in (200, 201, 202, 204): result['error'] = False else: result['data'] = r.text @@ -1287,12 +1515,13 @@ class Client(object): _url = "{0}/admin/v1/wim_accounts/{1}".format(self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -1305,12 +1534,13 @@ class Client(object): _url = "{0}/admin/v1/vims/{1}".format(self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -1323,12 +1553,13 @@ class Client(object): _url = "{0}/admin/v1/wim_accounts".format(self._base_path) try: - r = requests.post(_url, json=wim_data, verify=False, headers=headers) + r = requests.post(_url, json=wim_data, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -1342,12 +1573,13 @@ class Client(object): _url = "{0}/admin/v1/vims".format(self._base_path) try: - r = requests.post(_url, json=vim_data, verify=False, headers=headers) + r = requests.post(_url, json=vim_data, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -1358,12 +1590,13 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/admin/v1/sdns".format(self._base_path) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -1374,12 +1607,13 @@ class Client(object): 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/admin/v1/sdns/{1}".format(self._base_path, id) try: - r = requests.delete(_url, params=None, verify=False, headers=headers) + r = requests.delete(_url, params=None, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.accepted: + if r.status_code in (200, 201, 202, 204): result['error'] = False else: result['data'] = r.text @@ -1392,12 +1626,13 @@ class Client(object): _url = "{0}/admin/v1/sdns/{1}".format(self._base_path, id) try: - r = requests.get(_url, params=None, verify=False, stream=True, headers=headers) + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.ok: + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result @@ -1410,16 +1645,290 @@ class Client(object): _url = "{0}/admin/v1/sdns".format(self._base_path) try: - r = requests.post(_url, json=sdn_data, verify=False, headers=headers) + r = requests.post(_url, json=sdn_data, + verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + + def k8sc_get(self, token, id): + result = {'error': True, 'data': ''} + headers = {"accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + _url = "{0}/admin/v1/k8sclusters/{1}".format(self._base_path, id) + try: + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + + def k8sc_list(self, token): + result = {'error': True, 'data': ''} + headers = {"accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + _url = "{0}/admin/v1/k8sclusters".format(self._base_path) + try: + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + + def k8sc_create(self, token, cluster_data): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/k8sclusters".format(self._base_path) + + try: + r = requests.post(_url, json=cluster_data, + verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + + def k8sc_update(self, token, id, cluster_data): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/k8sclusters/{1}".format(self._base_path, id) + try: + r = requests.patch(_url, json=cluster_data, + verify=False, headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) return result - if r.status_code == requests.codes.created: + if r.status_code in (200, 201, 202, 204): + result['error'] = False + else: + result['data'] = Util.json_loads_byteified(r.text) + return result + + def k8sc_delete(self, token, id): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/yaml", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/k8sclusters/{1}".format(self._base_path, id) + try: + r = requests.delete(_url, params=None, + verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + else: + result['data'] = Util.json_loads_byteified(r.text) + return result + + def k8sr_get(self, token, id): + result = {'error': True, 'data': ''} + headers = {"accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + _url = "{0}/admin/v1/k8srepos/{1}".format(self._base_path, id) + try: + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + + def k8sr_list(self, token): + result = {'error': True, 'data': ''} + headers = {"accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + _url = "{0}/admin/v1/k8srepos".format(self._base_path) + try: + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): result['error'] = False result['data'] = Util.json_loads_byteified(r.text) return result + def k8sr_create(self, token, cluster_data): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/k8srepos".format(self._base_path) + + try: + r = requests.post(_url, json=cluster_data, + verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + + def k8sr_update(self, token, id, cluster_data): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/k8srepos/{1}".format(self._base_path, id) + try: + r = requests.patch(_url, json=cluster_data, + verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + else: + result['data'] = Util.json_loads_byteified(r.text) + return result + + def k8sr_delete(self, token, id): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/yaml", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/k8srepos/{1}".format(self._base_path, id) + try: + r = requests.delete(_url, params=None, + verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + else: + result['data'] = Util.json_loads_byteified(r.text) + return result + + def osmr_get(self, token, id): + result = {'error': True, 'data': ''} + headers = {"accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + _url = "{0}/admin/v1/osmrepos/{1}".format(self._base_path, id) + try: + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + + def osmr_list(self, token): + result = {'error': True, 'data': ''} + headers = {"accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + _url = "{0}/admin/v1/osmrepos".format(self._base_path) + try: + r = requests.get(_url, params=None, verify=False, + stream=True, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + + def osmr_create(self, token, cluster_data): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/osmrepos".format(self._base_path) + + try: + r = requests.post(_url, json=cluster_data, + verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + + def osmr_update(self, token, id, cluster_data): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/osmrepos/{1}".format(self._base_path, id) + try: + r = requests.patch(_url, json=cluster_data, + verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + else: + result['data'] = Util.json_loads_byteified(r.text) + return result + + def osmr_delete(self, token, id): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/yaml", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/osmrepos/{1}".format(self._base_path, id) + try: + r = requests.delete(_url, params=None, + verify=False, headers=headers) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code in (200, 201, 202, 204): + result['error'] = False + else: + result['data'] = Util.json_loads_byteified(r.text) + return result + @staticmethod def md5(f): hash_md5 = hashlib.md5()