OSM vnfd API handling
"""
-from osmclient.common.exceptions import NotFound
+from osmclient.common.exceptions import NotFound
from osmclient.common.exceptions import ClientException
class Vnfd(object):
- def __init__(self,http=None):
- self._http=http
+ def __init__(self, http=None, client=None):
+ self._http = http
+ self._client = client
def list(self):
- resp = self._http.get_cmd('api/running/vnfd-catalog/vnfd')
- if resp and 'vnfd:vnfd' in resp:
- return resp['vnfd:vnfd']
+ resp = self._http.get_cmd('api/running/{}vnfd-catalog/vnfd'
+ .format(self._client.so_rbac_project_path))
+
+ if self._client._so_version == 'v3':
+ if resp and 'project-vnfd:vnfd' in resp:
+ return resp['project-vnfd:vnfd']
+ else:
+ # Backwards Compatibility
+ if resp and 'vnfd:vnfd' in resp:
+ return resp['vnfd:vnfd']
+
return list()
- def get(self,name):
+ def get(self, name):
for vnfd in self.list():
- if name == vnfd['name']:
- return vnfd
+ if name == vnfd['name']:
+ return vnfd
raise NotFound("vnfd {} not found".format(name))
- def delete(self,vnfd_name):
- vnfd=self.get(vnfd_name)
- resp=self._http.delete_cmd('api/running/vnfd-catalog/vnfd/{}'.format(vnfd['id']))
+ def delete(self, vnfd_name):
+ vnfd = self.get(vnfd_name)
+ resp = self._http.delete_cmd('api/running/{}vnfd-catalog/vnfd/{}'
+ .format(self._client.so_rbac_project_path, vnfd['id']))
if 'success' not in resp:
raise ClientException("failed to delete vnfd {}".format(vnfd_name))