diff --git a/openstack/accelerator/v2/deployable.py b/openstack/accelerator/v2/deployable.py index ebfee3197..a499011fc 100644 --- a/openstack/accelerator/v2/deployable.py +++ b/openstack/accelerator/v2/deployable.py @@ -52,11 +52,13 @@ class Deployable(resource.Resource): # The baremetal proxy defaults to retrying on conflict, allow # overriding it via an explicit retry_on_conflict=False. kwargs['retriable_status_codes'] = retriable_status_codes - {409} + try: call = getattr(session, method.lower()) except AttributeError: raise exceptions.ResourceFailure( - msg="Invalid commit method: %s" % method) + "Invalid commit method: %s" % method) + request.url = request.url + "/program" response = call(request.url, json=request.body, headers=request.headers, microversion=microversion, diff --git a/openstack/block_storage/v2/backup.py b/openstack/block_storage/v2/backup.py index 0dd7df65e..381d77b65 100644 --- a/openstack/block_storage/v2/backup.py +++ b/openstack/block_storage/v2/backup.py @@ -122,7 +122,7 @@ class Backup(resource.Resource): else: # Just for safety of the implementation (since PUT removed) raise exceptions.ResourceFailure( - msg="Invalid create method: %s" % self.create_method) + "Invalid create method: %s" % self.create_method) has_body = (self.has_body if self.create_returns_body is None else self.create_returns_body) diff --git a/openstack/block_storage/v3/backup.py b/openstack/block_storage/v3/backup.py index d5546b7ce..af6560848 100644 --- a/openstack/block_storage/v3/backup.py +++ b/openstack/block_storage/v3/backup.py @@ -132,7 +132,7 @@ class Backup(resource.Resource): else: # Just for safety of the implementation (since PUT removed) raise exceptions.ResourceFailure( - msg="Invalid create method: %s" % self.create_method) + "Invalid create method: %s" % self.create_method) has_body = (self.has_body if self.create_returns_body is None else self.create_returns_body) diff --git a/openstack/resource.py b/openstack/resource.py index f73f5aaac..91a68c25b 100644 --- a/openstack/resource.py +++ b/openstack/resource.py @@ -1380,7 +1380,7 @@ class Resource(dict): microversion=microversion, params=params) else: raise exceptions.ResourceFailure( - msg="Invalid create method: %s" % self.create_method) + "Invalid create method: %s" % self.create_method) has_body = (self.has_body if self.create_returns_body is None else self.create_returns_body) @@ -1435,7 +1435,7 @@ class Resource(dict): method = session.post else: raise exceptions.ResourceFailure( - msg="Invalid create method: %s" % cls.create_method) + "Invalid create method: %s" % cls.create_method) body = [] resources = [] @@ -1625,7 +1625,7 @@ class Resource(dict): call = getattr(session, method.lower()) except AttributeError: raise exceptions.ResourceFailure( - msg="Invalid commit method: %s" % method) + "Invalid commit method: %s" % method) response = call(request.url, json=request.body, headers=request.headers, microversion=microversion,