Update tempest commit and switch to tempest.lib

tempest_lib was renamed to tempest.lib which causes problems
when running tests because tempest imports plugins from other
projects and crashes.

Closes bug: 1552520

Change-Id: Id7d43dee256856062bd0dadad9c469c1500ee36e

contrib/ci/common.sh

@@ -1,6 +1,6 @@
 # Environment variables
 
-export MANILA_TEMPEST_COMMIT="047f6b27"  # 28 Jan, 2016
+export MANILA_TEMPEST_COMMIT="4aaa5493"  # 2 Mar, 2016
 
 # ----------------------------------------------
 

manila_tempest_tests/services/share/json/shares_client.py

@@ -20,9 +20,9 @@ import six
 from six.moves.urllib import parse as urlparse
 
 from tempest import config  # noqa
-from tempest_lib.common import rest_client
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions
+from tempest.lib.common import rest_client
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions
 
 from manila_tempest_tests import share_exceptions
 

manila_tempest_tests/services/share/v2/json/shares_client.py

@@ -18,8 +18,8 @@ import time
 
 from six.moves.urllib import parse as urlparse
 from tempest import config
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions
 
 from manila_tempest_tests.services.share.json import shares_client
 from manila_tempest_tests import share_exceptions

manila_tempest_tests/share_exceptions.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from tempest_lib import exceptions
+from tempest.lib import exceptions
 
 
 class ShareBuildErrorException(exceptions.TempestException):

manila_tempest_tests/tests/api/admin/test_admin_actions_negative.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from tempest import config  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 import testtools  # noqa
 
 from manila_tempest_tests import clients_share as clients

manila_tempest_tests/tests/api/admin/test_consistency_group_actions.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from tempest import config
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 import testtools
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/admin/test_consistency_groups.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from tempest import config
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 import testtools
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/admin/test_consistency_groups_negative.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 from tempest import config
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions
 import testtools
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/admin/test_export_locations_negative.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from tempest import config
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib import exceptions as lib_exc
 
 from manila_tempest_tests import clients_share as clients
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/admin/test_multi_backend.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from tempest import config  # noqa
+from tempest.lib.common.utils import data_utils  # noqa
 from tempest import test  # noqa
-from tempest_lib.common.utils import data_utils  # noqa
 
 from manila_tempest_tests.tests.api import base
 

manila_tempest_tests/tests/api/admin/test_quotas_negative.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from tempest import config  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 import testtools  # noqa
 
 from manila_tempest_tests import clients_share as clients

manila_tempest_tests/tests/api/admin/test_scheduler_stats.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 from tempest import config  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 
 from manila_tempest_tests.tests.api import base
 

manila_tempest_tests/tests/api/admin/test_services_negative.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 import ddt
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib import exceptions as lib_exc
 
 from manila_tempest_tests import clients_share as clients
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/admin/test_share_manage.py

@@ -15,9 +15,9 @@
 
 import six
 from tempest import config
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 import testtools
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/admin/test_share_servers.py

@@ -17,8 +17,8 @@ import re
 
 import six  # noqa
 from tempest import config  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 
 from manila_tempest_tests.tests.api import base
 

manila_tempest_tests/tests/api/admin/test_share_servers_negative.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib.common.utils import data_utils  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 
 from manila_tempest_tests import clients_share as clients
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/admin/test_share_types.py

@@ -15,9 +15,9 @@
 
 import ddt
 from tempest import config  # noqa
+from tempest.lib.common.utils import data_utils  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib.common.utils import data_utils  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 
 from manila_tempest_tests.tests.api import base
 from manila_tempest_tests import utils

manila_tempest_tests/tests/api/admin/test_share_types_extra_specs.py

@@ -15,8 +15,8 @@
 
 import copy
 
+from tempest.lib.common.utils import data_utils  # noqa
 from tempest import test  # noqa
-from tempest_lib.common.utils import data_utils  # noqa
 
 from manila_tempest_tests.tests.api import base
 

manila_tempest_tests/tests/api/admin/test_share_types_extra_specs_negative.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib.common.utils import data_utils  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 
 from manila_tempest_tests import clients_share as clients
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/admin/test_share_types_negative.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib.common.utils import data_utils  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 
 from manila_tempest_tests import clients_share as clients
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/admin/test_shares_actions.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from tempest import config  # noqa
+from tempest.lib.common.utils import data_utils  # noqa
 from tempest import test  # noqa
-from tempest_lib.common.utils import data_utils  # noqa
 import testtools  # noqa
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/admin/test_snapshot_manage.py

@@ -15,9 +15,9 @@
 
 import six
 from tempest import config
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 import testtools
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/admin/test_snapshot_manage_negative.py

@@ -15,9 +15,9 @@
 
 import six
 from tempest import config
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 import testtools
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/base.py

@@ -23,9 +23,9 @@ import six
 from tempest.common import credentials_factory as common_creds
 from tempest.common import dynamic_creds
 from tempest import config
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions
 
 from manila_tempest_tests import clients_share as clients
 from manila_tempest_tests import share_exceptions

manila_tempest_tests/tests/api/test_availability_zones_negative.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib import exceptions as lib_exc
 
 from manila_tempest_tests.tests.api import base
 

manila_tempest_tests/tests/api/test_consistency_group_actions.py

@@ -15,8 +15,8 @@
 #    under the License.
 
 from tempest import config
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 import testtools
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/test_consistency_groups.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from tempest import config  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 import testtools  # noqa
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/test_consistency_groups_negative.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 from tempest import config
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 import testtools
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/test_metadata_negative.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 
 from manila_tempest_tests.tests.api import base
 

manila_tempest_tests/tests/api/test_quotas_negative.py

@@ -15,8 +15,8 @@
 
 import ddt
 from tempest import config
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib import exceptions as lib_exc
 
 from manila_tempest_tests.tests.api import base
 

manila_tempest_tests/tests/api/test_rules.py

@@ -15,8 +15,8 @@
 
 import ddt
 from tempest import config
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib import exceptions as lib_exc
 import testtools
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/test_rules_negative.py

@@ -15,8 +15,8 @@
 
 import ddt
 from tempest import config
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib import exceptions as lib_exc
 import testtools
 
 from manila_tempest_tests import share_exceptions

manila_tempest_tests/tests/api/test_scheduler_stats_negative.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 
 from manila_tempest_tests.tests.api import base
 

manila_tempest_tests/tests/api/test_security_services_mapping_negative.py

@@ -16,8 +16,8 @@
 from oslo_log import log  # noqa
 import six  # noqa
 from tempest import config  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 import testtools  # noqa
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/test_security_services_negative.py

@@ -16,8 +16,8 @@
 from oslo_log import log  # noqa
 import six  # noqa
 from tempest import config  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 import testtools  # noqa
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/test_share_networks_negative.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from tempest import config  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 import testtools  # noqa
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/test_share_types_negative.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib.common.utils import data_utils  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 
 from manila_tempest_tests import clients_share as clients
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/test_shares.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from tempest import config
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib import exceptions as lib_exc
 import testtools
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/test_shares_actions.py

@@ -15,8 +15,8 @@
 
 import six
 from tempest import config
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 import testtools
 
 from manila_tempest_tests.tests.api import base

manila_tempest_tests/tests/api/test_shares_actions_negative.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from tempest import config  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 import testtools  # noqa
 
 from manila_tempest_tests import clients_share as clients

manila_tempest_tests/tests/api/test_shares_negative.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from tempest import config  # noqa
+from tempest.lib import exceptions as lib_exc  # noqa
 from tempest import test  # noqa
-from tempest_lib import exceptions as lib_exc  # noqa
 import testtools  # noqa
 
 from manila_tempest_tests import share_exceptions

manila_tempest_tests/tests/scenario/manager_share.py

@@ -18,8 +18,8 @@ import six
 
 from tempest.common.utils.linux import remote_client  # noqa
 from tempest import config  # noqa
+from tempest.lib.common.utils import data_utils
 from tempest.scenario import manager  # noqa
-from tempest_lib.common.utils import data_utils
 
 from manila_tempest_tests import clients_share
 

manila_tempest_tests/tests/scenario/test_share_basic_ops.py

@@ -15,9 +15,9 @@
 
 from oslo_log import log as logging
 from tempest import config  # noqa
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions
 from tempest import test  # noqa
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions
 
 from manila_tempest_tests.tests.scenario import manager_share as manager
 from manila_tempest_tests import utils