openstack/fuel-devops
Code Issues Proposed changes

Sort nodes in devops.models.environment.Node()

Browse Source 
Nodes should be sortered by name to avoid inconsistency between
devops and system tests

Change-Id: I155d6669795f6cad12397abc7f1374391faf53ce
Closes-Bug:#1477169
This commit is contained in:
Dennis Dmitriev
2015-07-22 17:10:14 +03:00
parent 8d528b03f8
commit b7696dc042
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
devops/models/environment.py
View File

@@ -372,11 +372,13 @@ class NodeRoles(object):
class Nodes(object):
def __init__(self, environment, node_roles):
self.admins = list(
environment.get_nodes(name__in=node_roles.admin_names)
self.admins = sorted(
list(environment.get_nodes(name__in=node_roles.admin_names)),
key=lambda node: node.name
)
self.others = list(
environment.get_nodes(name__in=node_roles.other_names)
self.others = sorted(
list(environment.get_nodes(name__in=node_roles.other_names)),
key=lambda node: node.name
)
self.slaves = self.others
self.all = self.slaves + self.admins