Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "NSB Topology fix for Prox 4 port test case"
[yardstick.git]
/
yardstick
/
benchmark
/
contexts
/
heat.py
diff --git
a/yardstick/benchmark/contexts/heat.py
b/yardstick/benchmark/contexts/heat.py
index
0d1dfb8
..
cc87176
100644
(file)
--- a/
yardstick/benchmark/contexts/heat.py
+++ b/
yardstick/benchmark/contexts/heat.py
@@
-7,9
+7,6
@@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-from __future__ import absolute_import
-from __future__ import print_function
-
import collections
import logging
import os
import collections
import logging
import os
@@
-328,8
+325,10
@@
class HeatContext(Context):
if not os.path.exists(self.key_filename):
SSH.gen_keys(self.key_filename)
if not os.path.exists(self.key_filename):
SSH.gen_keys(self.key_filename)
- heat_template = HeatTemplate(self.name, self.template_file,
- self.heat_parameters)
+ heat_template = HeatTemplate(
+ self.name, template_file=self.template_file,
+ heat_parameters=self.heat_parameters,
+ os_cloud_config=self._flags.os_cloud_config)
if self.template_file is None:
self._add_resources_to_template(heat_template)
if self.template_file is None:
self._add_resources_to_template(heat_template)
@@
-466,7
+465,7
@@
class HeatContext(Context):
with attribute name mapping when using external heat templates
"""
if isinstance(attr_name, collections.Mapping):
with attribute name mapping when using external heat templates
"""
if isinstance(attr_name, collections.Mapping):
- node_name, cname = self.split_name(attr_name['name'])
+ node_name, cname = self.split_
host_
name(attr_name['name'])
if cname is None or cname != self.name:
return None
if cname is None or cname != self.name:
return None