In debug mode, when a response's header Content-Type is set to "application/json" with a parameter, i.e., "application/json; charset=UTF-8". This patch set ignores the additional parameter and only match the mimetype. Change-Id: Ie8fcb1061e0e49b039436947524cfdc704c83846 Closes-Bug: #1656981 (cherry picked from commit dcb719d0e51afa0253c144136b41f0e390c48c4c)
This is a combination of 2 commits. The first commit's message is: Prevent MemoryError when logging response bodies Response bodies are loaded into memory prior to being logged. Loading huge response bodies may result in a MemoryError. This patch proposes that only JSON and TEXT responses be logged, i.e when the Content-Type header is application/json or application/text. Responses that do not include or have a different Content-Type header will have their body omitted. This is a sort of backport of the fix for keystoneauth sessions, see I93b6fff73368c4f58bdebf8566c4948b50980cee Co-Authored-By: Samuel de Medeiros Queiroz <samueldmq@gmail.com> Closes-bug: 1616105 Change-Id: I8f43eee3a0b35041c6cf672e476f8151cf2f8d14 (cherry-picked from: 3e56e0d7e5e1a76d806a3bc1f6d5ef9070f95771) Only log application/json in session to start When whitelisting content types to debug print from session we chose application/json and application/text. application/text is not a real mime type, text is typically text/plain. Rather than guess at mime types only print application/json to start with, but make it easy for additional types to be added later. Adapted from keystoneauth: Ica5fee076cdab8b1d5167161d28af7313fad9477 Related-Bug: 1616105 Change-Id: Ieaa8fb3ea8d25e09b89498f23b70b18c0f6153f1 (cherry-picked from: 51d16fa344829aadf454faf5e0c4535a8f96a7c8)
Do not log binary data during debug logging of a session. Replace the binary data with the string <binary_data> instead. sort of a backport of: I5184002f3a21c5e0ee510b21b9a7884c8dccd1e3 Change-Id: I07ddbc3967f297597542f1975004d94c490f6e6b Related-Bug: 1616105 (cherry picked from commit af770f17b705a66bd4292b2a54df46ec5fdaa12b)
Currently, logs display the hash values of X-Auth-Token, Authorization, and X-Subject-Token, but not the value of the X-Service-Token. This patch set adds the X-Service-Token to the list of header fields to be hashed for logging purposes. Change-Id: Iaa3a27f4b6c3baf964fa0c71328ffe9df43b2c0a Closes-Bug: #1654847 (cherry picked from commit 56af8c90ecbb3cb5d29036151108b1e4e7a69bcc)
In Python 3 __ne__ by default delegates to __eq__ and inverts the result, but in Python 2 they urge you to define __ne__ when you define __eq__ for it to work properly [1].There are no implied relationships among the comparison operators. The truth of x==y does not imply that x!=y is false. Accordingly, when defining __eq__(), one should also define __ne__() so that the operators will behave as expected. [1]https://docs.python.org/2/reference/datamodel.html#object.__ne__ Also fixes spelling errors:resoruces. Change-Id: Iae4ce0fe84fae810711cc8c3fdb94eb9ca1d772e Closes-Bug: #1586268
User ids are already in the URL. Keystone doesn't consume ids in the body. Change-Id: Ie90ebd32fe584dd1b360dc75a828316b1a9aedde Closes-Bug: 1607751
OpenStack now has dropped support for python 2.6 and lower. So we don't need to define an assertDictEqual() for python lower than 2.7. Further, assertEqual() in testtools is able to handle dicts comparation, just the same as assertDictEqual() in unittest2. So we do't need to call assertDictEqual() for dicts any more. Please also refer to: https://review.openstack.org/#/c/347097/ Change-Id: Ieaf211617c38aa0f9a38625b1009c36bd6a16fba
Both the V2.0 and V3 clients create managers by passing in an instance of the _KeystoneAdapter class. Is seems reasonable for the tests to do the same things to keep everything consistent. Change-Id: I06d256e71105fdad3f4d182a53a6887617b4cffe