summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoribumarskov <ibumarskov@mirantis.com>2017-03-22 11:01:26 +0400
committerIlya Bumarskov <ibumarskov@mirantis.com>2017-03-23 11:41:32 +0000
commitde4f27cf532d6af48efacb34bfb25fc27dc0ddf7 (patch)
tree04e49f434188d248e0ca37c46d2b451b28e7660a
parent4a991f8a5d4345f516d1d78da0825edfb9a9c81e (diff)
Fix for cli_selected_nodes_deploy_huge
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+1: Sergey Novikov <snovikov@mirantis.com> Code-Review+2: Nastya Urlapova <aurlapova@mirantis.com> Workflow+1: Nastya Urlapova <aurlapova@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 23 Mar 2017 12:00:34 +0000 Reviewed-on: https://review.openstack.org/449092 Project: openstack/fuel-qa Branch: refs/heads/master
-rw-r--r--fuelweb_test/tests/test_cli.py42
1 files changed, 23 insertions, 19 deletions
diff --git a/fuelweb_test/tests/test_cli.py b/fuelweb_test/tests/test_cli.py
index c5aebd5..636c20a 100644
--- a/fuelweb_test/tests/test_cli.py
+++ b/fuelweb_test/tests/test_cli.py
@@ -423,7 +423,7 @@ class CommandLineTest(test_cli_base.CommandLine):
423 7. Provision one compute node using Fuel CLI 423 7. Provision one compute node using Fuel CLI
424 8. Provision one cinder node using Fuel CLI 424 8. Provision one cinder node using Fuel CLI
425 9. Provision two ceph-osd nodes using Fuel CLI 425 9. Provision two ceph-osd nodes using Fuel CLI
426 10. Provision one base-os node using Fuel CLI 426 10. Provision two base-os node using Fuel CLI
427 11. Leave 2 nodes in discover state 427 11. Leave 2 nodes in discover state
428 12. Deploy the ceph-osd and controller nodes using Fuel CLI 428 12. Deploy the ceph-osd and controller nodes using Fuel CLI
429 13. Deploy the compute node using Fuel CLI 429 13. Deploy the compute node using Fuel CLI
@@ -539,20 +539,20 @@ class CommandLineTest(test_cli_base.CommandLine):
539 'nodes {}'.format( 539 'nodes {}'.format(
540 self.fuel_web.get_nailgun_node_by_status('provisioned'))) 540 self.fuel_web.get_nailgun_node_by_status('provisioned')))
541 541
542 # Add and provision 2 ceph-osd node_ids[4], node_ids[5] 542 # Add and provision 2 ceph-osd node_ids[3], node_ids[4]
543 self.show_step(9, details='using node ids {0}, {1}'.format( 543 self.show_step(9, details='using node ids {0}, {1}'.format(
544 node_ids[4], node_ids[5])) 544 node_ids[3], node_ids[4]))
545 cmd = ( 545 cmd = (
546 'fuel --env-id={0} node set --node {1},{2} ' 546 'fuel --env-id={0} node set --node {1},{2} '
547 '--role=ceph-osd'.format(cluster_id, node_ids[4], node_ids[5])) 547 '--role=ceph-osd'.format(cluster_id, node_ids[3], node_ids[4]))
548 self.ssh_manager.check_call(admin_ip, cmd) 548 self.ssh_manager.check_call(admin_ip, cmd)
549 for node_id in (node_ids[4], node_ids[5]): 549 for node_id in (node_ids[3], node_ids[4]):
550 self.update_node_interfaces(node_id) 550 self.update_node_interfaces(node_id)
551 551
552 cmd = ('fuel ' 552 cmd = ('fuel '
553 '--env-id={0} node --provision ' 553 '--env-id={0} node --provision '
554 '--node {1},{2} ' 554 '--node {1},{2} '
555 '--json'.format(cluster_id, node_ids[4], node_ids[5])) 555 '--json'.format(cluster_id, node_ids[3], node_ids[4]))
556 task = self.ssh_manager.check_call(admin_ip, cmd).stdout_json 556 task = self.ssh_manager.check_call(admin_ip, cmd).stdout_json
557 self.assert_cli_task_success(task, timeout=10 * 60) 557 self.assert_cli_task_success(task, timeout=10 * 60)
558 558
@@ -565,15 +565,18 @@ class CommandLineTest(test_cli_base.CommandLine):
565 ' current list of provisioned ' 565 ' current list of provisioned '
566 'nodes {}'.format( 566 'nodes {}'.format(
567 self.fuel_web.get_nailgun_node_by_status('provisioned'))) 567 self.fuel_web.get_nailgun_node_by_status('provisioned')))
568 # Add and provision 1 base-os node node_ids[6] 568 # Add and provision 2 base-os node node_ids[5], node_ids[6]
569 self.show_step(10, details='using node ids {0}'.format(node_ids[6])) 569 self.show_step(10, details='using node ids {0},{1}'.format(
570 cmd = ('fuel --env-id={0} node set --node {1} ' 570 node_ids[5], node_ids[6]))
571 '--role=base-os'.format(cluster_id, node_ids[6])) 571 cmd = ('fuel --env-id={0} node set --node {1},{2} '
572 '--role=base-os'.format(cluster_id, node_ids[5], node_ids[6]))
572 self.ssh_manager.check_call(admin_ip, cmd) 573 self.ssh_manager.check_call(admin_ip, cmd)
573 self.update_node_interfaces(node_ids[6]) 574 for node_id in (node_ids[5], node_ids[6]):
575 self.update_node_interfaces(node_id)
574 576
575 cmd = ('fuel --env-id={0} node --provision ' 577 cmd = ('fuel --env-id={0} node --provision '
576 '--node={1} --json'.format(cluster_id, node_ids[6])) 578 '--node={1},{2} --json'.format(cluster_id, node_ids[5],
579 node_ids[6]))
577 task = self.ssh_manager.check_call(admin_ip, cmd).stdout_json 580 task = self.ssh_manager.check_call(admin_ip, cmd).stdout_json
578 self.assert_cli_task_success(task, timeout=10 * 60) 581 self.assert_cli_task_success(task, timeout=10 * 60)
579 582
@@ -606,12 +609,12 @@ class CommandLineTest(test_cli_base.CommandLine):
606 assert_true(node['pending_addition']) 609 assert_true(node['pending_addition'])
607 610
608 # Deploy ceph-osd and controller nodes 611 # Deploy ceph-osd and controller nodes
609 # node_ids[0], node_ids[4] node_ids[5] 612 # node_ids[0], node_ids[3] node_ids[4]
610 self.show_step(12, details='for node ids {0}, {1}, {2}'.format( 613 self.show_step(12, details='for node ids {0}, {1}, {2}'.format(
611 node_ids[0], node_ids[4], node_ids[5])) 614 node_ids[0], node_ids[3], node_ids[4]))
612 cmd = ( 615 cmd = (
613 'fuel --env-id={0} node --deploy --node {1},{2},{3} --json'.format( 616 'fuel --env-id={0} node --deploy --node {1},{2},{3} --json'.format(
614 cluster_id, node_ids[0], node_ids[4], node_ids[5])) 617 cluster_id, node_ids[0], node_ids[3], node_ids[4]))
615 task = self.ssh_manager.check_call(admin_ip, cmd).stdout_json 618 task = self.ssh_manager.check_call(admin_ip, cmd).stdout_json
616 self.assert_cli_task_success(task, timeout=80 * 60) 619 self.assert_cli_task_success(task, timeout=80 * 60)
617 620
@@ -632,10 +635,11 @@ class CommandLineTest(test_cli_base.CommandLine):
632 self.assert_cli_task_success(task, timeout=60 * 60) 635 self.assert_cli_task_success(task, timeout=60 * 60)
633 self.assert_all_tasks_completed(cluster_id=cluster_id) 636 self.assert_all_tasks_completed(cluster_id=cluster_id)
634 637
635 # Deploy the base-os node node_ids[6] 638 # Deploy the base-os node node_ids[5] node_ids[6]
636 self.show_step(15, details='for node id {}'.format(node_ids[6])) 639 self.show_step(15, details='for node id {0} {1}'.format(node_ids[5],
637 cmd = ('fuel --env-id={0} node --deploy --node {1} --json'.format( 640 node_ids[6]))
638 cluster_id, node_ids[6])) 641 cmd = ('fuel --env-id={0} node --deploy --node {1},{2} --json'.format(
642 cluster_id, node_ids[5], node_ids[6]))
639 task = self.ssh_manager.check_call(admin_ip, cmd).stdout_json 643 task = self.ssh_manager.check_call(admin_ip, cmd).stdout_json
640 self.assert_cli_task_success(task, timeout=60 * 60) 644 self.assert_cli_task_success(task, timeout=60 * 60)
641 self.assert_all_tasks_completed(cluster_id=cluster_id) 645 self.assert_all_tasks_completed(cluster_id=cluster_id)