projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Build on jenkins nodes with label docker"
[osm/osmclient.git]
/
osmclient
/
v1
/
vnf.py
diff --git
a/osmclient/v1/vnf.py
b/osmclient/v1/vnf.py
index
a981bb3
..
856d58b
100644
(file)
--- a/
osmclient/v1/vnf.py
+++ b/
osmclient/v1/vnf.py
@@
-18,21
+18,21
@@
OSM vnf API handling
"""
OSM vnf API handling
"""
-from osmclient.common.exceptions import NotFound
+from osmclient.common.exceptions import NotFound
class Vnf(object):
class Vnf(object):
- def __init__(self,http=None):
- self._http
=
http
+ def __init__(self,
http=None):
+ self._http
=
http
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']
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']
- 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
for vnf in vnfs:
if vnf_name == vnf['name']:
return vnf
@@
-40,8
+40,8
@@
class Vnf(object):
return vnf
raise NotFound("vnf {} not found".format(vnf_name))
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
if vnf and 'monitoring-param' in vnf:
return vnf['monitoring-param']
return None