Browse Source

Merge "Use status_timeout when starting a partition"

Zuul 1 year ago
parent
commit
6087e2ae82
1 changed files with 2 additions and 9 deletions
  1. 2
    9
      nova_dpm/virt/dpm/vm.py

+ 2
- 9
nova_dpm/virt/dpm/vm.py View File

@@ -407,9 +407,7 @@ class PartitionInstance(object):
407 407
                 status=utils.PartitionState.STOPPED, status_timeout=60)
408 408
 
409 409
         if self.partition.get_property('status') not in STARTED_STATUSES:
410
-            self.partition.start(True)
411
-            self.partition.wait_for_status(
412
-                status=STARTED_STATUSES, status_timeout=60)
410
+            self.partition.start(True, status_timeout=STATUS_TIMEOUT)
413 411
 
414 412
     def _ensure_status_transitioned(self):
415 413
         partition_state = self.partition.get_property('status')
@@ -439,12 +437,7 @@ class PartitionInstance(object):
439 437
             status=utils.PartitionState.STOPPED,
440 438
             status_timeout=STATUS_TIMEOUT)
441 439
 
442
-        self.partition.start(True)
443
-        # TODO(preethipy): The below method to be removed once the bug
444
-        # on DPM(701894) is fixed to return correct status on API return
445
-        self.partition.wait_for_status(
446
-            status=utils.PartitionState.RUNNING,
447
-            status_timeout=STATUS_TIMEOUT)
440
+        self.partition.start(True, status_timeout=STATUS_TIMEOUT)
448 441
 
449 442
     def get_partition(self):
450 443
         """Get the zhmcclient partition object for this PartitionInstance

Loading…
Cancel
Save