Code Review
/
nfvbench.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "NFVBENCH-75 fluent logger configure not override by -c my_config.yaml"
[nfvbench.git]
/
nfvbench
/
service_chain.py
diff --git
a/nfvbench/service_chain.py
b/nfvbench/service_chain.py
index
104cfb4
..
216cc92
100644
(file)
--- a/
nfvbench/service_chain.py
+++ b/
nfvbench/service_chain.py
@@
-14,11
+14,12
@@
# under the License.
#
# under the License.
#
-from chain_managers import StageManager
from collections import OrderedDict
from collections import OrderedDict
+import time
+
+from chain_managers import StageManager
from log import LOG
from specs import ChainType
from log import LOG
from specs import ChainType
-import time
class ServiceChain(object):
class ServiceChain(object):
@@
-113,8
+114,8
@@
class ServiceChain(object):
self.clients['traffic'].ensure_end_to_end()
def run(self):
self.clients['traffic'].ensure_end_to_end()
def run(self):
- LOG.info('Starting
{} chain...'.format(self.chain_name)
)
- LOG.info('Dry run:
{}'.format(self.config.no_traffic)
)
+ LOG.info('Starting
%s chain...', self.chain_name
)
+ LOG.info('Dry run:
%s', self.config.no_traffic
)
results = {}
self.__set_helpers()
results = {}
self.__set_helpers()
@@
-127,12
+128,14
@@
class ServiceChain(object):
results[self.chain_name]['mode'] = 'inter-node' \
if self.config.inter_node else 'intra-node'
results[self.chain_name]['mode'] = 'inter-node' \
if self.config.inter_node else 'intra-node'
- LOG.info("Service chain '
{}' run completed.".format(self.chain_name)
)
+ LOG.info("Service chain '
%s' run completed.", self.chain_name
)
return results
def get_version(self):
return self.stats_manager.get_version()
def close(self):
return results
def get_version(self):
return self.stats_manager.get_version()
def close(self):
- self.stage_manager.close()
- self.stats_manager.close()
+ if self.stage_manager:
+ self.stage_manager.close()
+ if self.stats_manager:
+ self.stats_manager.close()