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 "[dovetail] split the sla check results into process recovery and service recov...
[yardstick.git]
/
yardstick
/
benchmark
/
contexts
/
heat.py
diff --git
a/yardstick/benchmark/contexts/heat.py
b/yardstick/benchmark/contexts/heat.py
index
ac85b6f
..
f4c48f4
100644
(file)
--- a/
yardstick/benchmark/contexts/heat.py
+++ b/
yardstick/benchmark/contexts/heat.py
@@
-16,6
+16,7
@@
from collections import OrderedDict
import ipaddress
import pkg_resources
import ipaddress
import pkg_resources
+from yardstick.benchmark import contexts
from yardstick.benchmark.contexts.base import Context
from yardstick.benchmark.contexts.model import Network
from yardstick.benchmark.contexts.model import PlacementGroup, ServerGroup
from yardstick.benchmark.contexts.base import Context
from yardstick.benchmark.contexts.model import Network
from yardstick.benchmark.contexts.model import PlacementGroup, ServerGroup
@@
-47,7
+48,7
@@
def h_join(*args):
class HeatContext(Context):
"""Class that represents a context in the logical model"""
class HeatContext(Context):
"""Class that represents a context in the logical model"""
- __context_type__ =
"Heat"
+ __context_type__ =
contexts.CONTEXT_HEAT
def __init__(self):
self.stack = None
def __init__(self):
self.stack = None
@@
-58,6
+59,7
@@
class HeatContext(Context):
self.server_groups = []
self.keypair_name = None
self.secgroup_name = None
self.server_groups = []
self.keypair_name = None
self.secgroup_name = None
+ self.security_group = None
self._server_map = {}
self.attrs = {}
self._image = None
self._server_map = {}
self.attrs = {}
self._image = None
@@
-117,8
+119,11
@@
class HeatContext(Context):
return
self.keypair_name = h_join(self.name, "key")
return
self.keypair_name = h_join(self.name, "key")
+
self.secgroup_name = h_join(self.name, "secgroup")
self.secgroup_name = h_join(self.name, "secgroup")
+ self.security_group = attrs.get("security_group")
+
self._image = attrs.get("image")
self._flavor = attrs.get("flavor")
self._image = attrs.get("image")
self._flavor = attrs.get("flavor")
@@
-184,7
+189,7
@@
class HeatContext(Context):
self.flavors.add(flavor)
template.add_keypair(self.keypair_name, self.name)
self.flavors.add(flavor)
template.add_keypair(self.keypair_name, self.name)
- template.add_security_group(self.secgroup_name)
+ template.add_security_group(self.secgroup_name
, self.security_group
)
for network in self.networks.values():
# Using existing network
for network in self.networks.values():
# Using existing network
@@
-503,10
+508,12
@@
class HeatContext(Context):
pkey = pkg_resources.resource_string(
'yardstick.resources',
h_join('files/yardstick_key', self.name)).decode('utf-8')
pkey = pkg_resources.resource_string(
'yardstick.resources',
h_join('files/yardstick_key', self.name)).decode('utf-8')
-
+ key_filename = pkg_resources.resource_filename('yardstick.resources',
+ h_join('files/yardstick_key', self.name))
result = {
"user": server.context.user,
"pkey": pkey,
result = {
"user": server.context.user,
"pkey": pkey,
+ "key_filename": key_filename,
"private_ip": server.private_ip,
"interfaces": server.interfaces,
"routing_table": self.generate_routing_table(server),
"private_ip": server.private_ip,
"interfaces": server.interfaces,
"routing_table": self.generate_routing_table(server),