X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fvnf.py;fp=osmclient%2Fsol005%2Fvnf.py;h=d0c87b84b0a7c1c6561f8658f049d61feaf53bbf;hb=70d6f1843686f323ced68a253127fedde86a1c25;hp=6aa44d8a6346c00a18e6f00c62481205a8af6504;hpb=ac0e5fbbf8103186fe5a18f2420ddca87380552b;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/vnf.py b/osmclient/sol005/vnf.py index 6aa44d8..d0c87b8 100644 --- a/osmclient/sol005/vnf.py +++ b/osmclient/sol005/vnf.py @@ -21,7 +21,7 @@ OSM vnf API handling from osmclient.common import utils from osmclient.common.exceptions import NotFound import logging - +import json class Vnf(object): @@ -49,10 +49,10 @@ class Vnf(object): filter_string += ',nsr-id-ref={}'.format(ns_instance['_id']) else: filter_string = '?nsr-id-ref={}'.format(ns_instance['_id']) - resp = self._http.get_cmd('{}{}'.format(self._apiBase,filter_string)) + _, resp = self._http.get2_cmd('{}{}'.format(self._apiBase,filter_string)) #print('RESP: {}'.format(resp)) if resp: - return resp + return json.loads(resp) return list() def get(self, name): @@ -79,9 +79,9 @@ class Vnf(object): if name == vnf['name']: vnf_id = vnf['_id'] break - resp = self._http.get_cmd('{}/{}'.format(self._apiBase, vnf_id)) + _, resp = self._http.get2_cmd('{}/{}'.format(self._apiBase, vnf_id)) #print('RESP: {}'.format(resp)) if resp: - return resp + return json.loads(resp) raise NotFound("vnf {} not found".format(name))