From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 4 Oct 2017 10:42:01 +0000 (-0400)
Subject: ceph-volume tests refactor lvm api import in conftest
X-Git-Tag: v12.2.2~113^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=47cd005b672828aedf11aeb67a6099477783f7f0;p=ceph.git

ceph-volume tests refactor lvm api import in conftest

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit a00aff7066fe6a679498ac8a02ec22ef29feced3)
---

diff --git a/src/ceph-volume/ceph_volume/tests/conftest.py b/src/ceph-volume/ceph_volume/tests/conftest.py
index 784a7c2f71bd..764b0f4d74b1 100644
--- a/src/ceph-volume/ceph_volume/tests/conftest.py
+++ b/src/ceph-volume/ceph_volume/tests/conftest.py
@@ -1,5 +1,5 @@
 import pytest
-from ceph_volume.devices.lvm import api
+from ceph_volume.api import lvm as lvm_api
 
 
 class Capture(object):
@@ -33,7 +33,7 @@ def capture():
 @pytest.fixture
 def volumes(monkeypatch):
     monkeypatch.setattr('ceph_volume.process.call', lambda x: ('', '', 0))
-    volumes = api.Volumes()
+    volumes = lvm_api.Volumes()
     volumes._purge()
     return volumes
 
@@ -41,7 +41,7 @@ def volumes(monkeypatch):
 @pytest.fixture
 def volume_groups(monkeypatch):
     monkeypatch.setattr('ceph_volume.process.call', lambda x: ('', '', 0))
-    vgs = api.VolumeGroups()
+    vgs = lvm_api.VolumeGroups()
     vgs._purge()
     return vgs