diff -Nru manila-14.1.0/ChangeLog manila-14.1.1/ChangeLog --- manila-14.1.0/ChangeLog 2023-04-13 10:25:56.000000000 +0000 +++ manila-14.1.1/ChangeLog 2023-07-28 09:19:25.000000000 +0000 @@ -1,6 +1,11 @@ CHANGES ======= +14.1.1 +------ + +* Fix Manila API error message + 14.1.0 ------ diff -Nru manila-14.1.0/debian/changelog manila-14.1.1/debian/changelog --- manila-14.1.0/debian/changelog 2023-05-15 20:09:42.000000000 +0000 +++ manila-14.1.1/debian/changelog 2023-08-07 16:26:55.000000000 +0000 @@ -1,3 +1,9 @@ +manila (1:14.1.1-0ubuntu1) jammy; urgency=medium + + * New stable point release for OpenStack Yoga (LP: #2030526). + + -- Corey Bryant Mon, 07 Aug 2023 12:26:55 -0400 + manila (1:14.1.0-0ubuntu1) jammy; urgency=medium * New stable point release for OpenStack Yoga (LP: #2019759). diff -Nru manila-14.1.0/manila/api/openstack/wsgi.py manila-14.1.1/manila/api/openstack/wsgi.py --- manila-14.1.0/manila/api/openstack/wsgi.py 2023-04-13 10:25:27.000000000 +0000 +++ manila-14.1.1/manila/api/openstack/wsgi.py 2023-07-28 09:19:01.000000000 +0000 @@ -744,10 +744,10 @@ request.set_api_version_request() except exception.InvalidAPIVersionString as e: return Fault(webob.exc.HTTPBadRequest( - explanation=e.message)) + explanation=e.msg)) except exception.InvalidGlobalAPIVersion as e: return Fault(webob.exc.HTTPNotAcceptable( - explanation=e.message)) + explanation=e.msg)) # Identify the action, its arguments, and the requested # content type diff -Nru manila-14.1.0/manila/api/v1/shares.py manila-14.1.1/manila/api/v1/shares.py --- manila-14.1.0/manila/api/v1/shares.py 2023-04-13 10:25:27.000000000 +0000 +++ manila-14.1.1/manila/api/v1/shares.py 2023-07-28 09:19:01.000000000 +0000 @@ -90,9 +90,9 @@ except exception.NotFound: raise exc.HTTPNotFound() except exception.InvalidShare as e: - raise exc.HTTPForbidden(explanation=e.message) + raise exc.HTTPForbidden(explanation=e.msg) except exception.Conflict as e: - raise exc.HTTPConflict(explanation=e.message) + raise exc.HTTPConflict(explanation=e.msg) return webob.Response(status_int=http_client.ACCEPTED) @@ -282,14 +282,14 @@ availability_zone_id = availability_zone_db.id availability_zone = availability_zone_db.name except exception.AvailabilityZoneNotFound as e: - raise exc.HTTPNotFound(explanation=e.message) + raise exc.HTTPNotFound(explanation=e.msg) share_group_id = share.get('share_group_id') if share_group_id: try: share_group = db.share_group_get(context, share_group_id) except exception.ShareGroupNotFound as e: - raise exc.HTTPNotFound(explanation=e.message) + raise exc.HTTPNotFound(explanation=e.msg) sg_az_id = share_group['availability_zone_id'] if availability_zone and availability_zone_id != sg_az_id: msg = _("Share cannot have AZ ('%(s_az)s') different than " diff -Nru manila-14.1.0/manila/api/v1/share_types_extra_specs.py manila-14.1.1/manila/api/v1/share_types_extra_specs.py --- manila-14.1.0/manila/api/v1/share_types_extra_specs.py 2023-04-13 10:25:27.000000000 +0000 +++ manila-14.1.1/manila/api/v1/share_types_extra_specs.py 2023-07-28 09:19:01.000000000 +0000 @@ -50,7 +50,7 @@ try: share_types.get_valid_required_extra_specs(extra_specs) except exception.InvalidExtraSpec as e: - raise webob.exc.HTTPBadRequest(explanation=e.message) + raise webob.exc.HTTPBadRequest(explanation=e.msg) def is_valid_string(v): return isinstance(v, str) and len(v) in range(1, 256) @@ -96,7 +96,7 @@ try: self._verify_extra_specs(specs, False) except exception.InvalidExtraSpec as e: - raise webob.exc.HTTPBadRequest(e.message) + raise webob.exc.HTTPBadRequest(e.msg) self._check_key_names(specs.keys()) specs = share_types.sanitize_extra_specs(specs) diff -Nru manila-14.1.0/manila/api/v2/share_group_snapshots.py manila-14.1.1/manila/api/v2/share_group_snapshots.py --- manila-14.1.0/manila/api/v2/share_group_snapshots.py 2023-04-13 10:25:27.000000000 +0000 +++ manila-14.1.1/manila/api/v2/share_group_snapshots.py 2023-07-28 09:19:01.000000000 +0000 @@ -77,7 +77,7 @@ self.share_group_api.delete_share_group_snapshot( context, sg_snapshot) except exception.InvalidShareGroupSnapshot as e: - raise exc.HTTPConflict(explanation=e.message) + raise exc.HTTPConflict(explanation=e.msg) return webob.Response(status_int=http_client.ACCEPTED) @wsgi.Controller.api_version('2.31', '2.54', experimental=True) @@ -195,9 +195,9 @@ new_snapshot = self.share_group_api.create_share_group_snapshot( context, **kwargs) except exception.ShareGroupNotFound as e: - raise exc.HTTPBadRequest(explanation=e.message) + raise exc.HTTPBadRequest(explanation=e.msg) except exception.InvalidShareGroup as e: - raise exc.HTTPConflict(explanation=e.message) + raise exc.HTTPConflict(explanation=e.msg) return self._view_builder.detail(req, dict(new_snapshot.items())) diff -Nru manila-14.1.0/manila/api/v2/share_groups.py manila-14.1.1/manila/api/v2/share_groups.py --- manila-14.1.0/manila/api/v2/share_groups.py 2023-04-13 10:25:27.000000000 +0000 +++ manila-14.1.1/manila/api/v2/share_groups.py 2023-07-28 09:19:01.000000000 +0000 @@ -78,7 +78,7 @@ try: self.share_group_api.delete(context, share_group) except exception.InvalidShareGroup as e: - raise exc.HTTPConflict(explanation=e.message) + raise exc.HTTPConflict(explanation=e.msg) return webob.Response(status_int=http_client.ACCEPTED) @wsgi.Controller.api_version('2.31', '2.54', experimental=True) @@ -241,7 +241,7 @@ kwargs['availability_zone_id'] = az.id kwargs['availability_zone'] = az.name except exception.AvailabilityZoneNotFound as e: - raise exc.HTTPNotFound(explanation=e.message) + raise exc.HTTPNotFound(explanation=e.msg) if 'source_share_group_snapshot_id' in share_group: source_share_group_snapshot_id = share_group.get( @@ -277,7 +277,7 @@ try: new_share_group = self.share_group_api.create(context, **kwargs) except exception.InvalidShareGroupSnapshot as e: - raise exc.HTTPConflict(explanation=e.message) + raise exc.HTTPConflict(explanation=e.msg) except (exception.ShareGroupSnapshotNotFound, exception.InvalidInput) as e: raise exc.HTTPBadRequest(explanation=e.message) diff -Nru manila-14.1.0/manila/api/v2/share_instance_export_locations.py manila-14.1.1/manila/api/v2/share_instance_export_locations.py --- manila-14.1.0/manila/api/v2/share_instance_export_locations.py 2023-04-13 10:25:27.000000000 +0000 +++ manila-14.1.1/manila/api/v2/share_instance_export_locations.py 2023-07-28 09:19:01.000000000 +0000 @@ -65,7 +65,7 @@ context, export_location_uuid) return self._view_builder.detail(req, export_location) except exception.ExportLocationNotFound as e: - raise exc.HTTPNotFound(explanation=e.message) + raise exc.HTTPNotFound(explanation=e.msg) def create_resource(): diff -Nru manila-14.1.0/manila/api/v2/share_replica_export_locations.py manila-14.1.1/manila/api/v2/share_replica_export_locations.py --- manila-14.1.0/manila/api/v2/share_replica_export_locations.py 2023-04-13 10:25:27.000000000 +0000 +++ manila-14.1.1/manila/api/v2/share_replica_export_locations.py 2023-07-28 09:19:01.000000000 +0000 @@ -85,7 +85,7 @@ return self._view_builder.detail(req, export_location, replica=True) except exception.ExportLocationNotFound as e: - raise exc.HTTPNotFound(explanation=e.message) + raise exc.HTTPNotFound(explanation=e.msg) def create_resource(): diff -Nru manila-14.1.0/manila/api/v2/share_replicas.py manila-14.1.1/manila/api/v2/share_replicas.py --- manila-14.1.0/manila/api/v2/share_replicas.py 2023-04-13 10:25:27.000000000 +0000 +++ manila-14.1.1/manila/api/v2/share_replicas.py 2023-07-28 09:19:01.000000000 +0000 @@ -55,7 +55,7 @@ try: self.share_api.delete_share_replica(context, resource, force=True) except exception.ReplicationException as e: - raise exc.HTTPBadRequest(explanation=e.message) + raise exc.HTTPBadRequest(explanation=e.msg) @wsgi.Controller.api_version( MIN_SUPPORTED_API_VERSION, PRE_GRADUATION_VERSION, experimental=True) @@ -186,11 +186,11 @@ share_network_id=share_network_id, scheduler_hints=scheduler_hints) except exception.AvailabilityZoneNotFound as e: - raise exc.HTTPBadRequest(explanation=e.message) + raise exc.HTTPBadRequest(explanation=e.msg) except exception.ReplicationException as e: - raise exc.HTTPBadRequest(explanation=e.message) + raise exc.HTTPBadRequest(explanation=e.msg) except exception.ShareBusyException as e: - raise exc.HTTPBadRequest(explanation=e.message) + raise exc.HTTPBadRequest(explanation=e.msg) return self._view_builder.detail(req, new_replica) @@ -217,7 +217,7 @@ try: self.share_api.delete_share_replica(context, replica) except exception.ReplicationException as e: - raise exc.HTTPBadRequest(explanation=e.message) + raise exc.HTTPBadRequest(explanation=e.msg) return webob.Response(status_int=http_client.ACCEPTED) @@ -258,7 +258,7 @@ try: replica = self.share_api.promote_share_replica(context, replica) except exception.ReplicationException as e: - raise exc.HTTPBadRequest(explanation=e.message) + raise exc.HTTPBadRequest(explanation=e.msg) except exception.AdminRequired as e: raise exc.HTTPForbidden(explanation=e.message) @@ -342,7 +342,7 @@ try: self.share_api.update_share_replica(context, replica) except exception.InvalidHost as e: - raise exc.HTTPBadRequest(explanation=e.message) + raise exc.HTTPBadRequest(explanation=e.msg) def create_resource(): diff -Nru manila-14.1.0/manila/api/v2/share_types.py manila-14.1.1/manila/api/v2/share_types.py --- manila-14.1.0/manila/api/v2/share_types.py 2023-04-13 10:25:27.000000000 +0000 +++ manila-14.1.1/manila/api/v2/share_types.py 2023-07-28 09:19:01.000000000 +0000 @@ -207,7 +207,7 @@ context, 'share_type.create', share_type) except exception.InvalidExtraSpec as e: - raise webob.exc.HTTPBadRequest(explanation=e.message) + raise webob.exc.HTTPBadRequest(explanation=e.msg) except exception.ShareTypeExists as err: notifier_err = dict(share_types=share_type, error_message=err.message) diff -Nru manila-14.1.0/manila.egg-info/pbr.json manila-14.1.1/manila.egg-info/pbr.json --- manila-14.1.0/manila.egg-info/pbr.json 2023-04-13 10:25:56.000000000 +0000 +++ manila-14.1.1/manila.egg-info/pbr.json 2023-07-28 09:19:25.000000000 +0000 @@ -1 +1 @@ -{"git_version": "2fab8442", "is_release": true} \ No newline at end of file +{"git_version": "3ba4d9928", "is_release": true} \ No newline at end of file diff -Nru manila-14.1.0/manila.egg-info/PKG-INFO manila-14.1.1/manila.egg-info/PKG-INFO --- manila-14.1.0/manila.egg-info/PKG-INFO 2023-04-13 10:25:56.000000000 +0000 +++ manila-14.1.1/manila.egg-info/PKG-INFO 2023-07-28 09:19:25.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: manila -Version: 14.1.0 +Version: 14.1.1 Summary: Shared Storage for OpenStack Home-page: https://docs.openstack.org/manila/latest/ Author: OpenStack diff -Nru manila-14.1.0/manila.egg-info/SOURCES.txt manila-14.1.1/manila.egg-info/SOURCES.txt --- manila-14.1.0/manila.egg-info/SOURCES.txt 2023-04-13 10:25:57.000000000 +0000 +++ manila-14.1.1/manila.egg-info/SOURCES.txt 2023-07-28 09:19:26.000000000 +0000 @@ -1603,6 +1603,7 @@ releasenotes/notes/bug-1991938-add-filesystem-info-cephfs-nfs-fsal-b39ae5ebaeb6fba1.yaml releasenotes/notes/bug-1992443-infinidat-host-assisted-migration-4344c4d076b66796.yaml releasenotes/notes/bug-2002394-fix-bad-mode-enforcement-on-ensure-shares-a2e4d8f6c07c8cf5.yaml +releasenotes/notes/bug-2007060-fix-error-message-7a34357c0212d8f9.yaml releasenotes/notes/bug-667744-fix-c64071e6e5a098f7.yaml releasenotes/notes/bug_1564623_change-e286060a27b02f64.yaml releasenotes/notes/bug_1582931-1437eae20fa544d1.yaml diff -Nru manila-14.1.0/PKG-INFO manila-14.1.1/PKG-INFO --- manila-14.1.0/PKG-INFO 2023-04-13 10:25:57.470456000 +0000 +++ manila-14.1.1/PKG-INFO 2023-07-28 09:19:26.859408000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: manila -Version: 14.1.0 +Version: 14.1.1 Summary: Shared Storage for OpenStack Home-page: https://docs.openstack.org/manila/latest/ Author: OpenStack diff -Nru manila-14.1.0/releasenotes/notes/bug-2007060-fix-error-message-7a34357c0212d8f9.yaml manila-14.1.1/releasenotes/notes/bug-2007060-fix-error-message-7a34357c0212d8f9.yaml --- manila-14.1.0/releasenotes/notes/bug-2007060-fix-error-message-7a34357c0212d8f9.yaml 1970-01-01 00:00:00.000000000 +0000 +++ manila-14.1.1/releasenotes/notes/bug-2007060-fix-error-message-7a34357c0212d8f9.yaml 2023-07-28 09:19:01.000000000 +0000 @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixed several Manila API error messages with their contents. For more + details, please refer to + `launchpad bug #2007060 `_