X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=lib%2Fosm%2Fosmclient%2Fclientv2.py;h=d900af68d70876d0a1975a6faefcfd90a2dd1f14;hb=b58d5d8e177049ab63587f4329f282bc206352ec;hp=482ff07e4d334a3beb3c35cd49e15e49ac450cf5;hpb=78e7188849e9acdb565a4598dba733b69faa764f;p=osm%2FLW-UI.git diff --git a/lib/osm/osmclient/clientv2.py b/lib/osm/osmclient/clientv2.py index 482ff07..d900af6 100644 --- a/lib/osm/osmclient/clientv2.py +++ b/lib/osm/osmclient/clientv2.py @@ -13,20 +13,22 @@ # See the License for the specific language governing permissions and # limitations under the License. # - +import errno import requests import logging -import json import tarfile import yaml -import pyaml import StringIO from lib.util import Util import hashlib import os +from requests.packages.urllib3.exceptions import InsecureRequestWarning + +requests.packages.urllib3.disable_warnings(InsecureRequestWarning) -logging.basicConfig(level=logging.DEBUG) +logging.basicConfig(level=logging.INFO) log = logging.getLogger('helper.py') +logging.getLogger("urllib3").setLevel(logging.INFO) class Client(object): @@ -35,7 +37,7 @@ 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': ''} @@ -107,6 +109,24 @@ class Client(object): result['data'] = Util.json_loads_byteified(r.text) return result + def user_update(self, token, id, user_data): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/admin/v1/users/{1}".format(self._base_path, id) + try: + 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: + result['error'] = False + else: + result['data'] = Util.json_loads_byteified(r.text) + return result + def user_delete(self, token, id): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/yaml", "accept": "application/json", @@ -231,12 +251,14 @@ class Client(object): result['data'] = Util.json_loads_byteified(r.text) return result - def nsd_list(self, token): + def nsd_list(self, token, filter=None): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/yaml", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - - _url = "{0}/nsd/v1/ns_descriptors_content".format(self._base_path) + query_path = '' + if filter: + query_path = '?_admin.type='+filter + _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) except Exception as e: @@ -249,12 +271,14 @@ class Client(object): return result - def vnfd_list(self, token): + def vnfd_list(self, token, filter=None): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/yaml", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - - _url = "{0}/vnfpkgm/v1/vnf_packages_content".format(self._base_path) + query_path = '' + if filter: + query_path = '?_admin.type='+filter + _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) except Exception as e: @@ -301,6 +325,23 @@ class Client(object): return result + def pdu_list(self, token): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/yaml", "accept": "application/json", + '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) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code == requests.codes.ok: + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + + return result + def nsd_delete(self, token, id): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/yaml", "accept": "application/json", @@ -308,7 +349,7 @@ class Client(object): _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) @@ -340,13 +381,13 @@ class Client(object): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/gzip", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - with open('/tmp/'+package.name, 'wb+') as destination: + 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) @@ -360,13 +401,13 @@ class Client(object): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/gzip", "accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} - with open('/tmp/'+package.name, 'wb+') as destination: + 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) @@ -376,6 +417,49 @@ class Client(object): result['data'] = Util.json_loads_byteified(r.text) return result + def nsd_create_pkg_base(self, token, pkg_name): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/gzip", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/nsd/v1/ns_descriptors_content/".format(self._base_path) + + 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) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code == requests.codes.created: + result['data'] = r.json() + result['error'] = False + if r.status_code == requests.codes.conflict: + result['data'] = "Invalid ID." + return result + + def vnfd_create_pkg_base(self, token, pkg_name): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/gzip", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/vnfpkgm/v1/vnf_packages_content".format(self._base_path) + + try: + self._create_base_pkg('vnfd', pkg_name) + 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: + result['data'] = r.json() + result['error'] = False + if r.status_code == requests.codes.conflict: + result['data'] = "Invalid ID." + return result + def nsd_clone(self, token, id): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/gzip", "accept": "application/json", @@ -391,7 +475,7 @@ class Client(object): try: r = requests.post(_url, data=open('/tmp/' + tarf.getnames()[0] + "_clone.tar.gz", 'rb'), verify=False, - headers=headers) + headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) @@ -419,7 +503,7 @@ class Client(object): try: r = requests.post(_url, data=open('/tmp/' + tarf.getnames()[0] + "_clone.tar.gz", 'rb'), verify=False, - headers=headers) + headers=headers) except Exception as e: log.exception(e) result['data'] = str(e) @@ -454,6 +538,11 @@ class Client(object): return result if r.status_code == requests.codes.no_content: result['error'] = False + else: + try: + result['data'] = r.json() + except Exception as e: + result['data'] = {} return result @@ -480,12 +569,17 @@ class Client(object): return result if r.status_code == requests.codes.no_content: result['error'] = False + else: + try: + result['data'] = r.json() + except Exception as e: + result['data'] = {} return result def get_nsd_pkg(self, token, id): result = {'error': True, 'data': ''} - headers = { "accept": "application/zip", + headers = {"accept": "application/zip", 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/nsd/v1/ns_descriptors/{1}/nsd_content".format(self._base_path, id) @@ -535,6 +629,61 @@ class Client(object): tarf_temp.close() return tarf + def _create_base_pkg(self, descriptor_type, pkg_name): + filename = '/tmp/'+pkg_name+'/' + pkg_name + '.yaml' + if descriptor_type == 'nsd': + descriptor = { + "nsd:nsd-catalog": { + "nsd": [ + { + "short-name": str(pkg_name), + "vendor": "OSM Composer", + "description": str(pkg_name) + " descriptor", + "vld": [], + "constituent-vnfd": [], + "version": "1.0", + "id": str(pkg_name), + "name": str(pkg_name) + } + ] + } + } + + elif descriptor_type == 'vnfd': + descriptor = { + "vnfd:vnfd-catalog": { + "vnfd": [ + { + "short-name": str(pkg_name), + "vdu": [], + "description": "", + "mgmt-interface": { + "cp": "" + }, + "id": str(pkg_name), + "version": "1.0", + "internal-vld": [], + "connection-point": [], + "name": str(pkg_name) + } + ] + } + } + + if not os.path.exists(os.path.dirname(filename)): + try: + os.makedirs(os.path.dirname(filename)) + except OSError as exc: # Guard against race condition + if exc.errno != errno.EEXIST: + raise + + with open('/tmp/' + pkg_name + '/' + pkg_name + '.yaml', 'w') as yaml_file: + 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.close() + def _descriptor_clone(self, tarf, descriptor_type): # extract the package on a tmp directory tarf.extractall('/tmp') @@ -548,8 +697,8 @@ class Client(object): nsd_list = yaml_object['nsd:nsd-catalog']['nsd'] for nsd in nsd_list: nsd['id'] = 'clone_' + nsd['id'] - nsd['name'] = 'clone_' +nsd['name'] - nsd['short-name'] = 'clone_' +nsd['short-name'] + nsd['name'] = 'clone_' + nsd['name'] + nsd['short-name'] = 'clone_' + nsd['short-name'] elif descriptor_type == 'vnfd': vnfd_list = yaml_object['vnfd:vnfd-catalog']['vnfd'] for vnfd in vnfd_list: @@ -557,7 +706,6 @@ class Client(object): vnfd['name'] = 'clone_' + vnfd['name'] 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)) break @@ -673,6 +821,24 @@ class Client(object): result['data'] = Util.json_loads_byteified(r.text) return result + def pdu_create(self, token, pdu_data): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/yaml", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + + _url = "{0}/pdu/v1/pdu_descriptors".format(self._base_path) + + try: + 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: + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + def ns_op_list(self, token, id): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/json", "accept": "application/json", @@ -747,6 +913,23 @@ class Client(object): result['data'] = Util.json_loads_byteified(r.text) return result + def pdu_delete(self, token, id): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/yaml", "accept": "application/json", + '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) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r: + result['error'] = False + if r.status_code != requests.codes.no_content: + result['data'] = Util.json_loads_byteified(r.text) + return result + def ns_get(self, token, id): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/json", "accept": "application/json", @@ -781,6 +964,23 @@ class Client(object): result['data'] = Util.json_loads_byteified(r.text) return result + def pdu_get(self, token, id): + result = {'error': True, 'data': ''} + headers = {"Content-Type": "application/json", "accept": "application/json", + 'Authorization': 'Bearer {}'.format(token['id'])} + _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) + except Exception as e: + log.exception(e) + result['data'] = str(e) + return result + if r.status_code == requests.codes.ok: + result['error'] = False + result['data'] = Util.json_loads_byteified(r.text) + return result + def ns_alarm_create(self, token, id, alarm_payload): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/json", @@ -794,7 +994,7 @@ class Client(object): return result if r.status_code == requests.codes.ok: result['error'] = False - #result['data'] = Util.json_loads_byteified(r.text) + # result['data'] = Util.json_loads_byteified(r.text) result['data'] = r.text return result @@ -811,7 +1011,7 @@ class Client(object): return result if r.status_code == requests.codes.ok: result['error'] = False - #result['data'] = Util.json_loads_byteified(r.text) + # result['data'] = Util.json_loads_byteified(r.text) result['data'] = r.text return result @@ -834,7 +1034,7 @@ class Client(object): def vim_delete(self, token, id): result = {'error': True, 'data': ''} - headers = { "accept": "application/json", + headers = {"accept": "application/json", 'Authorization': 'Bearer {}'.format(token['id'])} _url = "{0}/admin/v1/vims/{1}".format(self._base_path, id) try: @@ -936,7 +1136,6 @@ class Client(object): result['data'] = Util.json_loads_byteified(r.text) return result - def sdn_create(self, token, sdn_data): result = {'error': True, 'data': ''} headers = {"Content-Type": "application/json", "accept": "application/json", @@ -955,7 +1154,6 @@ class Client(object): result['data'] = Util.json_loads_byteified(r.text) return result - @staticmethod def md5(f): hash_md5 = hashlib.md5()