X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fv1%2Fnsd.py;h=527a45f009ab343ed22f89098eabe1d089c18c09;hb=95686bbc69ded243c346f94dceb0bee567572fb7;hp=52c5772d8a69ee92198825f8c313e5de5cc14312;hpb=52424a2ae26db69c5a97d01e84454ffdd4d31228;p=osm%2Fosmclient.git diff --git a/osmclient/v1/nsd.py b/osmclient/v1/nsd.py index 52c5772..527a45f 100644 --- a/osmclient/v1/nsd.py +++ b/osmclient/v1/nsd.py @@ -23,28 +23,28 @@ from osmclient.common.exceptions import ClientException class Nsd(object): - def __init__(self, http=None, client=None): self._http = http self._client = client def list(self): - resp = self._http.get_cmd('api/running/{}nsd-catalog/nsd' - .format(self._client.so_rbac_project_path)) - - if self._client._so_version == 'v3': - if resp and 'project-nsd:nsd' in resp: - return resp['project-nsd:nsd'] + resp = self._http.get_cmd( + "api/running/{}nsd-catalog/nsd".format(self._client.so_rbac_project_path) + ) + + if self._client._so_version == "v3": + if resp and "project-nsd:nsd" in resp: + return resp["project-nsd:nsd"] else: # Backwards Compatibility - if resp and 'nsd:nsd' in resp: - return resp['nsd:nsd'] + if resp and "nsd:nsd" in resp: + return resp["nsd:nsd"] return list() def get(self, name): for nsd in self.list(): - if name == nsd['name']: + if name == nsd["name"]: return nsd raise NotFound("cannot find nsd {}".format(name)) @@ -54,7 +54,9 @@ class Nsd(object): raise NotFound("cannot find nsd {}".format(nsd_name)) resp = self._http.delete_cmd( - 'api/running/{}nsd-catalog/nsd/{}' - .format(self._client.so_rbac_project_path, nsd['id'])) - if 'success' not in resp: + "api/running/{}nsd-catalog/nsd/{}".format( + self._client.so_rbac_project_path, nsd["id"] + ) + ) + if "success" not in resp: raise ClientException("failed to delete nsd {}".format(nsd_name))