from osmclient.common import utils
from osmclient.common.exceptions import NotFound
import logging
-
+import json
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):
return vnf
else:
for vnf in self.list():
- if name == vnf['name']:
+ if name == vnf.get('name'):
return vnf
raise NotFound("vnf {} not found".format(name))
if name == vnf['name']:
vnf_id = vnf['_id']
break
- resp = self._http.get_cmd('{}/{}'.format(self._apiBase, vnf_id))
- #print('RESP: {}'.format(resp))
- if resp:
- return resp
- raise NotFound("vnf {} not found".format(name))
-
+ try:
+ _, resp = self._http.get2_cmd('{}/{}'.format(self._apiBase, vnf_id))
+ #print('RESP: {}'.format(resp))
+ if resp:
+ return json.loads(resp)
+ except NotFound:
+ raise NotFound("vnf '{}' not found".format(name))
+ raise NotFound("vnf '{}' not found".format(name))