summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormelanie witt <melwittt@gmail.com>2018-02-01 01:12:08 +0000
committerMohammed Naser <mnaser@vexxhost.com>2018-02-21 18:11:41 -0500
commit372ecddc7712debe9232126c198c7a6340c3e099 (patch)
treecc18e3a9e32915b8bcec4619b302f19b3dfaa0e4
parentd536bec9fc098c9db8d46f39aab30feb0783e428 (diff)
Drop extra loop which modifies Cinder volume statusstable/pike
There is an existing loop which sets the proper value for status and attach_status right above, so this is doing nothing other than changing it to the incorrect value. Conflicts: nova/tests/fixtures.py Co-Authored-By: Mohammed Naser <mnaser@vexxhost.com> Change-Id: Iea0c1ea0a699b9519f66977391202956f17aac66 (cherry picked from commit 8cd64670ea23484fd1e1a8883e9841486169363e)
Notes
Notes (review): Code-Review+2: Matt Riedemann <mriedem.os@gmail.com> Code-Review+2: Dan Smith <dms@danplanet.com> Workflow+1: Dan Smith <dms@danplanet.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 23 Feb 2018 02:34:51 +0000 Reviewed-on: https://review.openstack.org/546218 Project: openstack/nova Branch: refs/heads/stable/pike
-rw-r--r--nova/tests/fixtures.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py
index 6f54048..596ffce 100644
--- a/nova/tests/fixtures.py
+++ b/nova/tests/fixtures.py
@@ -1346,12 +1346,6 @@ class CinderFixture(fixtures.Fixture):
1346 'size': 1 1346 'size': 1
1347 } 1347 }
1348 1348
1349 # update the status based on existing attachments
1350 has_attachment = any(
1351 [volume['id'] in attachments
1352 for attachments in self.attachments.values()])
1353 volume['status'] = 'attached' if has_attachment else 'detached'
1354
1355 # Check for our special image-backed volume. 1349 # Check for our special image-backed volume.
1356 if volume_id == self.IMAGE_BACKED_VOL: 1350 if volume_id == self.IMAGE_BACKED_VOL:
1357 # Make it a bootable volume. 1351 # Make it a bootable volume.