From 1685982a97f1bc82698724eb9a47e92416dc0aac Mon Sep 17 00:00:00 2001 From: Pawel Suder Date: Thu, 17 Jan 2019 07:30:45 +0100 Subject: [PATCH] Use status_code instead of status in requests It fixes raising exception for response with not recognized status code. Co-Authored-By: Brian Haley Change-Id: I174ff62cb6599e4c7bdc86cb2d0786f9f2499b00 Related-Bug: 1790598 --- neutron/agent/metadata/agent.py | 3 ++- neutron/tests/unit/agent/metadata/test_agent.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/neutron/agent/metadata/agent.py b/neutron/agent/metadata/agent.py index d0b5a83e465..79df50ca27b 100644 --- a/neutron/agent/metadata/agent.py +++ b/neutron/agent/metadata/agent.py @@ -231,7 +231,8 @@ class MetadataProxyHandler(object): explanation = six.text_type(msg) return webob.exc.HTTPInternalServerError(explanation=explanation) else: - raise Exception(_('Unexpected response code: %s') % resp.status) + raise Exception(_('Unexpected response code: %s') % + resp.status_code) def _sign_instance_id(self, instance_id): secret = self.conf.metadata_proxy_shared_secret diff --git a/neutron/tests/unit/agent/metadata/test_agent.py b/neutron/tests/unit/agent/metadata/test_agent.py index 09c6c7fa2c1..f783dbd61e9 100644 --- a/neutron/tests/unit/agent/metadata/test_agent.py +++ b/neutron/tests/unit/agent/metadata/test_agent.py @@ -340,6 +340,7 @@ class _TestMetadataProxyHandlerCacheMixin(object): req = mock.Mock(path_info='/the_path', query_string='', headers=hdrs, method=method, body=body) resp = mock.MagicMock(status_code=response_code) + resp.status.__str__.side_effect = AttributeError resp.content = 'content' req.response = resp with mock.patch.object(self.handler, '_sign_instance_id') as sign: