Get rid of normalization in further CL services

Stop using normalization in next bunch of services.

Change-Id: Ida8b39cdaf984cffbe96ae8105ed3b4d333968e5

openstack/cloud/_accelerator.py

@@ -14,10 +14,8 @@
 # We can't just use list, because sphinx gets confused by
 # openstack.resource.Resource.list and openstack.resource2.Resource.list
 
-from openstack.cloud import _normalize
 
-
-class AcceleratorCloudMixin(_normalize.Normalizer):
+class AcceleratorCloudMixin:
 
     def list_deployables(self, filters=None):
         """List all available deployables.

openstack/cloud/_baremetal.py

@@ -18,13 +18,12 @@ import warnings
 
 import jsonpatch
 
-from openstack.cloud import _normalize
 from openstack.cloud import _utils
 from openstack.cloud import exc
 from openstack import utils
 
 
-class BaremetalCloudMixin(_normalize.Normalizer):
+class BaremetalCloudMixin:
 
     @property
     def _baremetal_client(self):

openstack/cloud/_block_storage.py

@@ -16,7 +16,6 @@
 import types  # noqa
 
 from openstack.block_storage.v3 import quota_set as _qs
-from openstack.cloud import _normalize
 from openstack.cloud import _utils
 from openstack.cloud import exc
 from openstack import exceptions
@@ -31,7 +30,7 @@ def _no_pending_volumes(volumes):
     return True
 
 
-class BlockStorageCloudMixin(_normalize.Normalizer):
+class BlockStorageCloudMixin:
 
     @_utils.cache_on_arguments(should_cache_fn=_no_pending_volumes)
     def list_volumes(self, cache=True):
@@ -606,8 +605,7 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
             raise exc.OpenStackCloudException(
                 "VolumeType not found: %s" % name_or_id)
 
-        return self._normalize_volume_type_accesses(
-            self.block_storage.get_type_access(volume_type))
+        return self.block_storage.get_type_access(volume_type)
 
     def add_volume_type_access(self, name_or_id, project_id):
         """Grant access on a volume_type to a project.

openstack/cloud/_clustering.py

@@ -15,10 +15,8 @@
 # openstack.resource.Resource.list and openstack.resource2.Resource.list
 import types  # noqa
 
-from openstack.cloud import _normalize
 
-
-class ClusteringCloudMixin(_normalize.Normalizer):
+class ClusteringCloudMixin:
     pass
 
     @property

openstack/cloud/_dns.py

@@ -15,14 +15,13 @@
 # openstack.resource.Resource.list and openstack.resource2.Resource.list
 import types  # noqa
 
-from openstack.cloud import _normalize
 from openstack.cloud import _utils
 from openstack.cloud import exc
 from openstack import exceptions
 from openstack import resource
 
 
-class DnsCloudMixin(_normalize.Normalizer):
+class DnsCloudMixin:
 
     def list_zones(self, filters=None):
         """List all available zones.

openstack/cloud/_object_store.py

@@ -19,7 +19,6 @@ import urllib.parse
 
 import keystoneauth1.exceptions
 
-from openstack.cloud import _normalize
 from openstack.cloud import _utils
 from openstack.cloud import exc
 from openstack import exceptions
@@ -36,7 +35,7 @@ OBJECT_CONTAINER_ACLS = {
 }
 
 
-class ObjectStoreCloudMixin(_normalize.Normalizer):
+class ObjectStoreCloudMixin:
 
     @property
     def _object_store_client(self):

openstack/cloud/_shared_file_system.py

@@ -10,10 +10,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from openstack.cloud import _normalize
 
-
-class SharedFileSystemCloudMixin(_normalize.Normalizer):
+class SharedFileSystemCloudMixin:
 
     def list_share_availability_zones(self):
         """List all availability zones for the Shared File Systems service.