X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fv1%2Fvnf.py;h=5db02407dd15722030d82ac5a3128caf8935dc0f;hb=refs%2Fchanges%2F78%2F12878%2F2;hp=856d58bb25d8ea55c16c40c31b21dd8a997dded5;hpb=4c7e237e45bc6fe209006b4837a8e6b031e78e1c;p=osm%2Fosmclient.git diff --git a/osmclient/v1/vnf.py b/osmclient/v1/vnf.py index 856d58b..5db0240 100644 --- a/osmclient/v1/vnf.py +++ b/osmclient/v1/vnf.py @@ -22,26 +22,31 @@ from osmclient.common.exceptions import NotFound class Vnf(object): - def __init__(self, http=None): + 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') - if resp and 'vnfr:vnfr' in resp: - return resp['vnfr: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() def get(self, vnf_name): vnfs = self.list() for vnf in vnfs: - if vnf_name == vnf['name']: + if vnf_name == vnf["name"]: return vnf - if vnf_name == vnf['id']: + if vnf_name == vnf["id"]: return vnf raise NotFound("vnf {} not found".format(vnf_name)) def get_monitoring(self, vnf_name): vnf = self.get(vnf_name) - if vnf and 'monitoring-param' in vnf: - return vnf['monitoring-param'] + if vnf and "monitoring-param" in vnf: + return vnf["monitoring-param"] return None