X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fvnf.py;h=edae35835b6efdccc8ab97159d34442bb7acfb55;hb=5d41362313f63d22266adb647a79a43eb993e8eb;hp=d0c87b84b0a7c1c6561f8658f049d61feaf53bbf;hpb=70d6f1843686f323ced68a253127fedde86a1c25;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/vnf.py b/osmclient/sol005/vnf.py
index d0c87b8..edae358 100644
--- a/osmclient/sol005/vnf.py
+++ b/osmclient/sol005/vnf.py
@@ -66,7 +66,7 @@ class Vnf(object):
                     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))
 
@@ -79,9 +79,11 @@ class Vnf(object):
                 if name == vnf['name']:
                     vnf_id = vnf['_id']
                     break
-        _, resp = self._http.get2_cmd('{}/{}'.format(self._apiBase, vnf_id))
-        #print('RESP: {}'.format(resp))
-        if resp:
-            return json.loads(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))