Use the embedded scenario manager instead of tempest one
While waiting for tempest scenario manager to stabilize its API,
a copy of it has been imported, so make sure to use it and to not
rely on tempest's one (whose API is changing during the stabilization
process, so it may break anytime).
Just one file needs to change its imports.
At the same time, fix the import order for another file.
Change-Id: I29c4784d59151948778cad57b7db56a368ed821d
diff --git a/cinder_tempest_plugin/scenario/test_snapshots.py b/cinder_tempest_plugin/scenario/test_snapshots.py
index 2cb172f..3153281 100644
--- a/cinder_tempest_plugin/scenario/test_snapshots.py
+++ b/cinder_tempest_plugin/scenario/test_snapshots.py
@@ -13,10 +13,11 @@
# License for the specific language governing permissions and limitations
# under the License.
-from cinder_tempest_plugin.scenario import manager
from tempest.common import utils
from tempest.lib import decorators
+from cinder_tempest_plugin.scenario import manager
+
class SnapshotDataIntegrityTests(manager.ScenarioTest):
diff --git a/cinder_tempest_plugin/scenario/test_volume_encrypted.py b/cinder_tempest_plugin/scenario/test_volume_encrypted.py
index 6d5ade1..baf55e7 100644
--- a/cinder_tempest_plugin/scenario/test_volume_encrypted.py
+++ b/cinder_tempest_plugin/scenario/test_volume_encrypted.py
@@ -15,7 +15,8 @@
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
-from tempest.scenario import manager
+
+from cinder_tempest_plugin.scenario import manager
CONF = config.CONF