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 "pylint fixes: remove redundant parens, fix comparison order"
[yardstick.git]
/
yardstick
/
benchmark
/
contexts
/
heat.py
diff --git
a/yardstick/benchmark/contexts/heat.py
b/yardstick/benchmark/contexts/heat.py
index
0b2fbdc
..
4c7f052
100644
(file)
--- a/
yardstick/benchmark/contexts/heat.py
+++ b/
yardstick/benchmark/contexts/heat.py
@@
-31,7
+31,7
@@
LOG = logging.getLogger(__name__)
class HeatContext(Context):
class HeatContext(Context):
- '''Class that represents a context in the logical model'''
+ """Class that represents a context in the logical model"""
__context_type__ = "Heat"
__context_type__ = "Heat"
@@
-55,10
+55,10
@@
class HeatContext(Context):
self.key_filename = ''.join(
[YARDSTICK_ROOT_PATH, 'yardstick/resources/files/yardstick_key-',
get_short_key_uuid(self.key_uuid)])
self.key_filename = ''.join(
[YARDSTICK_ROOT_PATH, 'yardstick/resources/files/yardstick_key-',
get_short_key_uuid(self.key_uuid)])
- super(
self.__class__
, self).__init__()
+ super(
HeatContext
, self).__init__()
def init(self, attrs):
def init(self, attrs):
- '''initializes itself from the supplied arguments'''
+ """initializes itself from the supplied arguments"""
self.name = attrs["name"]
if "user" in attrs:
self.name = attrs["name"]
if "user" in attrs:
@@
-94,28
+94,29
@@
class HeatContext(Context):
rsa_key = paramiko.RSAKey.generate(bits=2048, progress_func=None)
rsa_key.write_private_key_file(self.key_filename)
rsa_key = paramiko.RSAKey.generate(bits=2048, progress_func=None)
rsa_key.write_private_key_file(self.key_filename)
- open(self.key_filename + ".pub", "w").write("%s %s\n" %
- (rsa_key.get_name(),
- rsa_key.get_base64()))
+ print("Writing %s ..." % self.key_filename)
+ with open(self.key_filename + ".pub", "w") as pubkey_file:
+ pubkey_file.write(
+ "%s %s\n" % (rsa_key.get_name(), rsa_key.get_base64()))
del rsa_key
@property
def image(self):
del rsa_key
@property
def image(self):
- '''returns application's default image name'''
+ """returns application's default image name"""
return self._image
@property
def flavor(self):
return self._image
@property
def flavor(self):
- '''returns application's default flavor name'''
+ """returns application's default flavor name"""
return self._flavor
@property
def user(self):
return self._flavor
@property
def user(self):
- '''return login user name corresponding to image'''
+ """return login user name corresponding to image"""
return self._user
def _add_resources_to_template(self, template):
return self._user
def _add_resources_to_template(self, template):
- '''add to the template the resources represented by this context'''
+ """add to the template the resources represented by this context"""
template.add_keypair(self.keypair_name, self.key_uuid)
template.add_security_group(self.secgroup_name)
template.add_keypair(self.keypair_name, self.key_uuid)
template.add_security_group(self.secgroup_name)
@@
-200,7
+201,7
@@
class HeatContext(Context):
server.add_to_template(template, self.networks, {})
def deploy(self):
server.add_to_template(template, self.networks, {})
def deploy(self):
- '''deploys template into a stack using cloud'''
+ """deploys template into a stack using cloud"""
print("Deploying context '%s'" % self.name)
heat_template = HeatTemplate(self.name, self.template_file,
print("Deploying context '%s'" % self.name)
heat_template = HeatTemplate(self.name, self.template_file,
@@
-220,9
+221,9
@@
class HeatContext(Context):
# copy some vital stack output into server objects
for server in self.servers:
# copy some vital stack output into server objects
for server in self.servers:
- if
len(server.ports) > 0
:
+ if
server.ports
:
# TODO(hafe) can only handle one internal network for now
# TODO(hafe) can only handle one internal network for now
- port =
list(server.ports.values())[0]
+ port =
next(iter(server.ports.values()))
server.private_ip = self.stack.outputs[port["stack_name"]]
if server.floating_ip:
server.private_ip = self.stack.outputs[port["stack_name"]]
if server.floating_ip:
@@
-232,7
+233,7
@@
class HeatContext(Context):
print("Context '%s' deployed" % self.name)
def undeploy(self):
print("Context '%s' deployed" % self.name)
def undeploy(self):
- '''undeploys stack from cloud'''
+ """undeploys stack from cloud"""
if self.stack:
print("Undeploying context '%s'" % self.name)
self.stack.delete()
if self.stack:
print("Undeploying context '%s'" % self.name)
self.stack.delete()
@@
-247,10
+248,10
@@
class HeatContext(Context):
LOG.exception("Key filename %s", self.key_filename)
def _get_server(self, attr_name):
LOG.exception("Key filename %s", self.key_filename)
def _get_server(self, attr_name):
-
'''
lookup server info by name from context
+
"""
lookup server info by name from context
attr_name: either a name for a server created by yardstick or a dict
with attribute name mapping when using external heat templates
attr_name: either a name for a server created by yardstick or a dict
with attribute name mapping when using external heat templates
- '''
+ """
key_filename = pkg_resources.resource_filename(
'yardstick.resources',
'files/yardstick_key-' + get_short_key_uuid(self.key_uuid))
key_filename = pkg_resources.resource_filename(
'yardstick.resources',
'files/yardstick_key-' + get_short_key_uuid(self.key_uuid))