projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into v7.0
[osm/osmclient.git]
/
osmclient
/
sol005
/
vnf.py
diff --git
a/osmclient/sol005/vnf.py
b/osmclient/sol005/vnf.py
index
6da13f5
..
6aa44d8
100644
(file)
--- a/
osmclient/sol005/vnf.py
+++ b/
osmclient/sol005/vnf.py
@@
-20,6
+20,7
@@
OSM vnf API handling
from osmclient.common import utils
from osmclient.common.exceptions import NotFound
from osmclient.common import utils
from osmclient.common.exceptions import NotFound
+import logging
class Vnf(object):
class Vnf(object):
@@
-27,6
+28,7
@@
class Vnf(object):
def __init__(self, http=None, client=None):
self._http = http
self._client = client
def __init__(self, http=None, client=None):
self._http = http
self._client = client
+ self._logger = logging.getLogger('osmclient')
self._apiName = '/nslcm'
self._apiVersion = '/v1'
self._apiResource = '/vnfrs'
self._apiName = '/nslcm'
self._apiVersion = '/v1'
self._apiResource = '/vnfrs'
@@
-36,6
+38,8
@@
class Vnf(object):
def list(self, ns=None, filter=None):
"""Returns a list of VNF instances
"""
def list(self, ns=None, filter=None):
"""Returns a list of VNF instances
"""
+ self._logger.debug("")
+ self._client.get_token()
filter_string = ''
if filter:
filter_string = '?{}'.format(filter)
filter_string = ''
if filter:
filter_string = '?{}'.format(filter)
@@
-54,6
+58,8
@@
class Vnf(object):
def get(self, name):
"""Returns a VNF instance based on name or id
"""
def get(self, name):
"""Returns a VNF instance based on name or id
"""
+ self._logger.debug("")
+ self._client.get_token()
if utils.validate_uuid4(name):
for vnf in self.list():
if name == vnf['_id']:
if utils.validate_uuid4(name):
for vnf in self.list():
if name == vnf['_id']:
@@
-65,6
+71,8
@@
class Vnf(object):
raise NotFound("vnf {} not found".format(name))
def get_individual(self, name):
raise NotFound("vnf {} not found".format(name))
def get_individual(self, name):
+ self._logger.debug("")
+ self._client.get_token()
vnf_id = name
if not utils.validate_uuid4(name):
for vnf in self.list():
vnf_id = name
if not utils.validate_uuid4(name):
for vnf in self.list():