Catch the EndpointNotFound in keystoneauth1 than in keystoneclient

After applying keystoneauth1, we should catch the EndpointNotFound
exception defined in keystoneauth1, not the EndpointNotFound defined in
keystoneclient.

Change-Id: Ib6e76f34875431ce0dd106a1ff3d8ea1e42b6365
Closes-Bug: #1526652

ceilometer/energy/kwapi.py

@@ -14,7 +14,7 @@
 
 import datetime
 
-from keystoneclient import exceptions
+from keystoneauth1 import exceptions
 from oslo_config import cfg
 from oslo_log import log
 import requests

ceilometer/objectstore/rgw.py

@@ -15,7 +15,7 @@
 """Common code for working with ceph object stores
 """
 
-from keystoneclient import exceptions
+from keystoneauth1 import exceptions
 from oslo_config import cfg
 from oslo_log import log
 from oslo_utils import timeutils

ceilometer/objectstore/swift.py

@@ -17,7 +17,7 @@
 
 from __future__ import absolute_import
 
-from keystoneclient import exceptions
+from keystoneauth1 import exceptions
 from oslo_config import cfg
 from oslo_log import log
 from oslo_utils import timeutils

ceilometer/tests/unit/energy/test_kwapi.py

@@ -14,7 +14,7 @@
 
 import datetime
 
-from keystoneclient import exceptions
+from keystoneauth1 import exceptions
 import mock
 from oslo_context import context
 from oslotest import base

ceilometer/tests/unit/objectstore/test_rgw.py

@@ -16,7 +16,7 @@
 
 import collections
 
-from keystoneclient import exceptions
+from keystoneauth1 import exceptions
 import mock
 from oslotest import base
 from oslotest import mockpatch

ceilometer/tests/unit/objectstore/test_swift.py

@@ -16,7 +16,7 @@
 
 import collections
 
-from keystoneclient import exceptions
+from keystoneauth1 import exceptions
 import mock
 from oslotest import base
 from oslotest import mockpatch