Browse Source

Fix for cli_selected_nodes_deploy_huge

Change-Id: I729a3de5b8aa2fabe5b0b2a189cf28cb34aee07d
Closes-bug: #1674660
(cherry picked from commit 69b3bd0c03)
ibumarskov 2 years ago
parent
commit
de4f27cf53
1 changed files with 23 additions and 19 deletions
  1. 23
    19
      fuelweb_test/tests/test_cli.py

+ 23
- 19
fuelweb_test/tests/test_cli.py View File

@@ -423,7 +423,7 @@ class CommandLineTest(test_cli_base.CommandLine):
423 423
             7. Provision one compute node using Fuel CLI
424 424
             8. Provision one cinder node using Fuel CLI
425 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 427
             11. Leave 2 nodes in discover state
428 428
             12. Deploy the ceph-osd and controller nodes using Fuel CLI
429 429
             13. Deploy the compute node using Fuel CLI
@@ -539,20 +539,20 @@ class CommandLineTest(test_cli_base.CommandLine):
539 539
             'nodes {}'.format(
540 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 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 545
         cmd = (
546 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 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 550
             self.update_node_interfaces(node_id)
551 551
 
552 552
         cmd = ('fuel '
553 553
                '--env-id={0} node --provision '
554 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 556
         task = self.ssh_manager.check_call(admin_ip, cmd).stdout_json
557 557
         self.assert_cli_task_success(task, timeout=10 * 60)
558 558
 
@@ -565,15 +565,18 @@ class CommandLineTest(test_cli_base.CommandLine):
565 565
             ' current list of provisioned '
566 566
             'nodes {}'.format(
567 567
                 self.fuel_web.get_nailgun_node_by_status('provisioned')))
568
-        # Add and provision 1 base-os node node_ids[6]
569
-        self.show_step(10, details='using node ids {0}'.format(node_ids[6]))
570
-        cmd = ('fuel --env-id={0} node set --node {1} '
571
-               '--role=base-os'.format(cluster_id, 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},{1}'.format(
570
+            node_ids[5], 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 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 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 580
         task = self.ssh_manager.check_call(admin_ip, cmd).stdout_json
578 581
         self.assert_cli_task_success(task, timeout=10 * 60)
579 582
 
@@ -606,12 +609,12 @@ class CommandLineTest(test_cli_base.CommandLine):
606 609
             assert_true(node['pending_addition'])
607 610
 
608 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 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 615
         cmd = (
613 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 618
         task = self.ssh_manager.check_call(admin_ip, cmd).stdout_json
616 619
         self.assert_cli_task_success(task, timeout=80 * 60)
617 620
 
@@ -632,10 +635,11 @@ class CommandLineTest(test_cli_base.CommandLine):
632 635
         self.assert_cli_task_success(task, timeout=60 * 60)
633 636
         self.assert_all_tasks_completed(cluster_id=cluster_id)
634 637
 
635
-        # Deploy the base-os node node_ids[6]
636
-        self.show_step(15, details='for node id {}'.format(node_ids[6]))
637
-        cmd = ('fuel --env-id={0} node --deploy --node {1} --json'.format(
638
-            cluster_id, node_ids[6]))
638
+        # Deploy the base-os node node_ids[5] node_ids[6]
639
+        self.show_step(15, details='for node id {0} {1}'.format(node_ids[5],
640
+                                                                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 643
         task = self.ssh_manager.check_call(admin_ip, cmd).stdout_json
640 644
         self.assert_cli_task_success(task, timeout=60 * 60)
641 645
         self.assert_all_tasks_completed(cluster_id=cluster_id)

Loading…
Cancel
Save