Merge "Import exceptions module from openstack-common"
This commit is contained in:
@@ -18,7 +18,7 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
|
|
||||||
from openstack.common.apiclient import exceptions
|
from troveclient.openstack.common.apiclient import exceptions
|
||||||
|
|
||||||
|
|
||||||
class ServiceCatalog(object):
|
class ServiceCatalog(object):
|
||||||
|
@@ -19,12 +19,12 @@
|
|||||||
|
|
||||||
from troveclient import base
|
from troveclient import base
|
||||||
|
|
||||||
import exceptions
|
|
||||||
import urlparse
|
import urlparse
|
||||||
|
|
||||||
from troveclient.common import check_for_exceptions
|
from troveclient.common import check_for_exceptions
|
||||||
from troveclient.common import limit_url
|
from troveclient.common import limit_url
|
||||||
from troveclient.common import Paginated
|
from troveclient.common import Paginated
|
||||||
|
from troveclient.openstack.common.apiclient import exceptions
|
||||||
|
|
||||||
|
|
||||||
REBOOT_SOFT, REBOOT_HARD = 'SOFT', 'HARD'
|
REBOOT_SOFT, REBOOT_HARD = 'SOFT', 'HARD'
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from troveclient import base
|
from troveclient import base
|
||||||
import exceptions
|
from troveclient.openstack.common.apiclient import exceptions
|
||||||
|
|
||||||
|
|
||||||
class Limit(base.Resource):
|
class Limit(base.Resource):
|
||||||
|
@@ -19,11 +19,11 @@
|
|||||||
|
|
||||||
from troveclient import base
|
from troveclient import base
|
||||||
|
|
||||||
import exceptions
|
|
||||||
import urlparse
|
import urlparse
|
||||||
|
|
||||||
from troveclient.common import limit_url
|
from troveclient.common import limit_url
|
||||||
from troveclient.common import Paginated
|
from troveclient.common import Paginated
|
||||||
|
from troveclient.openstack.common.apiclient import exceptions
|
||||||
|
|
||||||
|
|
||||||
class SecurityGroup(base.Resource):
|
class SecurityGroup(base.Resource):
|
||||||
|
Reference in New Issue
Block a user