Adding changes to comply with the compat client.

partially implements blueprint cli-compliance-upgrade

Change-Id: Ib2af25313ee79cb60eb1b59d3928f1bc45ba1858

tests/examples/examples/client.py

@@ -8,8 +8,8 @@ from urlparse import urlparse
 import xml.dom.minidom
 
 from proboscis.asserts import *
-from troveclient.client import TroveHTTPClient
-from troveclient.xml import TroveXmlClient
+from troveclient.compat.client import TroveHTTPClient
+from troveclient.compat.xml import TroveXmlClient
 
 
 print_req = True

tests/examples/examples/example_generation.py

@@ -13,8 +13,8 @@ from proboscis import TestProgram
 from proboscis.asserts import *
 from proboscis.asserts import Check
 
-from troveclient import Dbaas
-from troveclient import TroveHTTPClient
+from troveclient.compat import Dbaas
+from troveclient.compat import TroveHTTPClient
 
 
 from client import ConfigFile

tests/integration/tests/api/instances_pagination.py

@@ -13,7 +13,7 @@ from proboscis.asserts import assert_true
 from proboscis.asserts import Check
 from proboscis.asserts import fail
 
-from troveclient import exceptions
+from troveclient.compat import exceptions
 from tests import util
 from tests.util import create_dbaas_client
 from tests.util import test_config

tests/integration/tests/api/instances_quotas.py

@@ -2,7 +2,7 @@ from proboscis import before_class
 from proboscis import test
 from proboscis.asserts import assert_raises
 
-from troveclient import exceptions
+from troveclient.compat import exceptions
 from tests.util import test_config
 from tests.util import create_client
 from tests.util import poll_until

tests/integration/tests/api/mgmt/hosts.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from troveclient import exceptions
+from troveclient.compat import exceptions
 
 from proboscis import before_class
 from proboscis import test

tests/integration/tests/api/mgmt/update_hosts.py

@@ -6,7 +6,7 @@ from proboscis import test
 from proboscis.asserts import assert_not_equal
 from proboscis.decorators import time_out
 
-from troveclient import exceptions
+from troveclient.compat import exceptions
 from tests import util
 from tests.util import create_dbaas_client
 from tests.util import test_config

tests/integration/tests/dns/dns.py

@@ -4,7 +4,7 @@ import unittest
 from proboscis import test
 from proboscis.decorators import time_out
 
-from troveclient import Dbaas
+from troveclient.compat import Dbaas
 
 from trove.tests.api.instances import instance_info
 from trove.tests.api.instances import GROUP_START as INSTANCE_START

tests/integration/tests/reaper/volume_reaping.py

@@ -17,7 +17,7 @@ from datetime import timedelta
 
 from nose.tools import assert_raises
 
-from troveclient.exceptions import NotFound
+from troveclient.compat.exceptions import NotFound
 
 from proboscis import after_class
 from proboscis import before_class

tests/integration/tests/recreates/create_11.py

@@ -13,7 +13,7 @@ from proboscis.asserts import assert_true
 from proboscis.asserts import Check
 from proboscis.asserts import fail
 
-from troveclient import exceptions
+from troveclient.compat import exceptions
 from tests import util
 from tests.util import create_dbaas_client
 from tests.util import test_config

tests/integration/tests/scheduler/driver.py

@@ -21,7 +21,7 @@ from nose.tools import assert_almost_equal
 from nose.tools import assert_equal
 from nose.tools import assert_not_almost_equal
 from nose.tools import assert_true
-from troveclient import exceptions
+from troveclient.compat import exceptions
 from proboscis import test
 from proboscis.decorators import expect_exception
 from proboscis.decorators import time_out

tests/integration/tests/smoke/instance.py

@@ -1,4 +1,4 @@
-from troveclient.instances import InstanceStatus
+from troveclient.v1.instances import InstanceStatus
 from proboscis.asserts import assert_equal
 from proboscis import test
 from tests.util.generation import InstanceGenerator

tests/integration/tests/util/__init__.py

@@ -45,7 +45,7 @@ except ImportError:
 
 from sqlalchemy import create_engine
 
-from troveclient import exceptions
+from troveclient.compat import exceptions
 
 from proboscis import test
 from proboscis.asserts import assert_false
@@ -55,8 +55,8 @@ from proboscis.asserts import Check
 from proboscis.asserts import fail
 from proboscis.asserts import ASSERTION_ERROR
 from proboscis import SkipTest
-from troveclient import Dbaas
-from troveclient.client import TroveHTTPClient
+from troveclient.compat import Dbaas
+from troveclient.compat.client import TroveHTTPClient
 from tests.util import test_config
 from trove.tests.util.client import TestClient as TestClient
 from tests.util.topics import hosts_up

tests/integration/tests/util/instance.py

@@ -21,7 +21,7 @@ from proboscis.asserts import assert_true
 from proboscis.asserts import assert_is_not_none
 from proboscis.asserts import fail
 
-from troveclient.exceptions import NotFound as NotFound404
+from troveclient.compat.exceptions import NotFound as NotFound404
 from tests.util import report
 from tests.util import test_config
 from trove.tests.util.users import Requirements