Merge "Use the embedded scenario manager instead of tempest one"

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):
 

cinder_tempest_plugin/scenario/test_volume_encrypted.py

@@ -15,7 +15,8 @@ from tempest.common import waiters
 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