From 10535cf7197d6df7db61e4bb5cac8916de5f7dc2 Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Fri, 6 May 2016 12:37:27 +0300 Subject: [PATCH] Sort node ids in cli acceptance tests For improving predicability we should sort nodes ids Closes-bug:1578664 Change-Id: Ibf3a197c307fd849dac477f6983d3cbfe4c5ceb4 --- fuelweb_test/tests/test_cli.py | 8 ++++---- .../tests/tests_cli/test_cli_deploy.py | 10 ++++------ .../tests/tests_cli/test_cli_deploy_ceph.py | 10 ++++------ fuelweb_test/tests/tests_cli/test_cli_role.py | 20 ++++++++----------- 4 files changed, 20 insertions(+), 28 deletions(-) diff --git a/fuelweb_test/tests/test_cli.py b/fuelweb_test/tests/test_cli.py index c31cb28b1..99979231a 100644 --- a/fuelweb_test/tests/test_cli.py +++ b/fuelweb_test/tests/test_cli.py @@ -125,9 +125,8 @@ class CommandLineTest(test_cli_base.CommandLine): Duration 50m """ self.env.revert_snapshot("ready_with_3_slaves") - node_ids = [self.fuel_web.get_nailgun_node_by_devops_node( - self.env.d_env.nodes().slaves[ - slave_id])['id']for slave_id in range(3)] + node_ids = sorted([node['id'] for node in + self.fuel_web.client.list_nodes()]) release_id = self.fuel_web.get_releases_list_for_os( release_name=OPENSTACK_RELEASE)[0] admin_ip = self.ssh_manager.admin_ip @@ -421,7 +420,8 @@ class CommandLineTest(test_cli_base.CommandLine): ) # Get nodes ids - node_ids = [node['id'] for node in self.fuel_web.client.list_nodes()] + node_ids = sorted([node['id'] for node in + self.fuel_web.client.list_nodes()]) admin_ip = self.ssh_manager.admin_ip # Add and provision a controller node node_ids[0] diff --git a/fuelweb_test/tests/tests_cli/test_cli_deploy.py b/fuelweb_test/tests/tests_cli/test_cli_deploy.py index fd6fd4b66..7e18c8885 100644 --- a/fuelweb_test/tests/tests_cli/test_cli_deploy.py +++ b/fuelweb_test/tests/tests_cli/test_cli_deploy.py @@ -46,9 +46,8 @@ class CommandLineAcceptanceDeploymentTests(test_cli_base.CommandLine): """ self.env.revert_snapshot("ready_with_3_slaves") - node_ids = [self.fuel_web.get_nailgun_node_by_devops_node( - self.env.d_env.nodes().slaves[slave_id])['id'] - for slave_id in range(3)] + node_ids = sorted([node['id'] for node in + self.fuel_web.client.list_nodes()]) release_id = self.fuel_web.get_releases_list_for_os( release_name=OPENSTACK_RELEASE)[0] @@ -120,9 +119,8 @@ class CommandLineAcceptanceDeploymentTests(test_cli_base.CommandLine): Duration 50m """ self.env.revert_snapshot("ready_with_3_slaves") - node_ids = [self.fuel_web.get_nailgun_node_by_devops_node( - self.env.d_env.nodes().slaves[slave_id])['id'] - for slave_id in range(3)] + node_ids = sorted([node['id'] for node in + self.fuel_web.client.list_nodes()]) release_id = self.fuel_web.get_releases_list_for_os( release_name=OPENSTACK_RELEASE)[0] diff --git a/fuelweb_test/tests/tests_cli/test_cli_deploy_ceph.py b/fuelweb_test/tests/tests_cli/test_cli_deploy_ceph.py index 56eec76ac..e9911e5a6 100644 --- a/fuelweb_test/tests/tests_cli/test_cli_deploy_ceph.py +++ b/fuelweb_test/tests/tests_cli/test_cli_deploy_ceph.py @@ -51,9 +51,8 @@ class CommandLineAcceptanceCephDeploymentTests(test_cli_base.CommandLine): self.env.bootstrap_nodes( self.env.d_env.nodes().slaves[:7]) - node_ids = [self.fuel_web.get_nailgun_node_by_devops_node( - self.env.d_env.nodes().slaves[slave_id])['id'] - for slave_id in range(7)] + node_ids = sorted([node['id'] for node in + self.fuel_web.client.list_nodes()]) release_id = self.fuel_web.get_releases_list_for_os( release_name=OPENSTACK_RELEASE)[0] @@ -133,9 +132,8 @@ class CommandLineAcceptanceCephDeploymentTests(test_cli_base.CommandLine): self.env.revert_snapshot("ready_with_9_slaves") - node_ids = [self.fuel_web.get_nailgun_node_by_devops_node( - self.env.d_env.nodes().slaves[slave_id])['id'] - for slave_id in range(8)] + node_ids = sorted([node['id'] for node in + self.fuel_web.client.list_nodes()]) release_id = self.fuel_web.get_releases_list_for_os( release_name=OPENSTACK_RELEASE)[0] diff --git a/fuelweb_test/tests/tests_cli/test_cli_role.py b/fuelweb_test/tests/tests_cli/test_cli_role.py index 595f93178..80ba1f0ad 100644 --- a/fuelweb_test/tests/tests_cli/test_cli_role.py +++ b/fuelweb_test/tests/tests_cli/test_cli_role.py @@ -50,9 +50,8 @@ class CommandLineRoleTests(test_cli_base.CommandLine): """ self.show_step(1, initialize=True) self.env.revert_snapshot("ready_with_3_slaves") - node_ids = [self.fuel_web.get_nailgun_node_by_devops_node( - self.env.d_env.nodes().slaves[slave_id])['id'] - for slave_id in range(3)] + node_ids = sorted([node['id'] for node in + self.fuel_web.client.list_nodes()]) release_id = self.fuel_web.get_releases_list_for_os( release_name=OPENSTACK_RELEASE)[0] @@ -139,9 +138,8 @@ class CommandLineRoleTests(test_cli_base.CommandLine): """ self.show_step(1, initialize=True) self.env.revert_snapshot("ready_with_3_slaves") - node_ids = [self.fuel_web.get_nailgun_node_by_devops_node( - self.env.d_env.nodes().slaves[slave_id])['id'] - for slave_id in range(3)] + node_ids = sorted([node['id'] for node in + self.fuel_web.client.list_nodes()]) release_id = self.fuel_web.get_releases_list_for_os( release_name=OPENSTACK_RELEASE)[0] templates_path = os.path.join( @@ -230,9 +228,8 @@ class CommandLineRoleTests(test_cli_base.CommandLine): """ self.show_step(1, initialize=True) self.env.revert_snapshot("ready_with_3_slaves") - node_ids = [self.fuel_web.get_nailgun_node_by_devops_node( - self.env.d_env.nodes().slaves[slave_id])['id'] - for slave_id in range(3)] + node_ids = sorted([node['id'] for node in + self.fuel_web.client.list_nodes()]) release_id = self.fuel_web.get_releases_list_for_os( release_name=OPENSTACK_RELEASE)[0] templates_path = os.path.join( @@ -315,9 +312,8 @@ class CommandLineRoleTests(test_cli_base.CommandLine): """ self.show_step(1, initialize=True) self.env.revert_snapshot("ready_with_3_slaves") - node_ids = [self.fuel_web.get_nailgun_node_by_devops_node( - self.env.d_env.nodes().slaves[slave_id])['id'] - for slave_id in range(3)] + node_ids = sorted([node['id'] for node in + self.fuel_web.client.list_nodes()]) release_id = self.fuel_web.get_releases_list_for_os( release_name=OPENSTACK_RELEASE)[0] templates_path = os.path.join(