X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fv1%2Fvnf.py;h=46ff3af2ba20c369e7496039783898f3ee510218;hb=a0bed2931f09825ef42abe81fcc3c03fdf52c5ed;hp=a981bb3a8435f0a555407bbef704531cee92fcfe;hpb=e84eb31aded0cb62a5523422ddc4524f6e615209;p=osm%2Fosmclient.git diff --git a/osmclient/v1/vnf.py b/osmclient/v1/vnf.py index a981bb3..46ff3af 100644 --- a/osmclient/v1/vnf.py +++ b/osmclient/v1/vnf.py @@ -18,21 +18,23 @@ OSM vnf API handling """ -from osmclient.common.exceptions import NotFound +from osmclient.common.exceptions import NotFound class Vnf(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('v1/api/operational/vnfr-catalog/vnfr') + resp = self._http.get_cmd('v1/api/operational/{}vnfr-catalog/vnfr' + .format(self._client.so_rbac_project_path)) if resp and 'vnfr:vnfr' in resp: return resp['vnfr:vnfr'] - return list() + return list() - def get(self,vnf_name): - vnfs=self.list() + def get(self, vnf_name): + vnfs = self.list() for vnf in vnfs: if vnf_name == vnf['name']: return vnf @@ -40,8 +42,8 @@ class Vnf(object): return vnf raise NotFound("vnf {} not found".format(vnf_name)) - def get_monitoring(self,vnf_name): - vnf=self.get(vnf_name) + def get_monitoring(self, vnf_name): + vnf = self.get(vnf_name) if vnf and 'monitoring-param' in vnf: return vnf['monitoring-param'] return None