From 113f63efae7d326a2896806caaecee1d1e69768d Mon Sep 17 00:00:00 2001 From: Michal Jagiello Date: Fri, 27 Oct 2023 11:38:02 +0200 Subject: Fix regression on patching any objects other than AAI resources Due to fact that for patching some specific headers was set (due to fact A&AI requires that) all other resources couldn't be patched. That's a quick fix for that issue Issue-ID: TEST-404 Signed-off-by: Michal Jagiello Change-Id: I79d70d5bb6541db1c8b1b10db2d9091e16211846 --- src/onapsdk/aai/aai_element.py | 5 ++++- src/onapsdk/onap_service.py | 5 +---- src/onapsdk/version.py | 2 +- tests/test_version.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/onapsdk/aai/aai_element.py b/src/onapsdk/aai/aai_element.py index 69b2c71..2bfb565 100644 --- a/src/onapsdk/aai/aai_element.py +++ b/src/onapsdk/aai/aai_element.py @@ -99,7 +99,10 @@ class AaiElement(OnapService): base_url = settings.AAI_URL api_version = "/aai/" + settings.AAI_API_VERSION headers = headers_aai_creator(OnapService.headers) - patch_headers = headers_aai_creator(OnapService.patch_headers) + patch_headers = headers_aai_creator({ + "Content-Type": "application/merge-patch+json", + "Accept": "application/json", + }) @classmethod def get_guis(cls) -> GuiItem: diff --git a/src/onapsdk/onap_service.py b/src/onapsdk/onap_service.py index a054529..7b1dc17 100644 --- a/src/onapsdk/onap_service.py +++ b/src/onapsdk/onap_service.py @@ -79,10 +79,7 @@ class OnapService(ABC): "Content-Type": "application/json", "Accept": "application/json", } - patch_headers: Dict[str, str] = { - "Content-Type": "application/merge-patch+json", - "Accept": "application/json", - } + patch_headers: Dict[str, str] = headers.copy() proxy: Dict[str, str] = None permanent_headers: PermanentHeadersCollection = PermanentHeadersCollection() diff --git a/src/onapsdk/version.py b/src/onapsdk/version.py index 5ec9ea1..3035ac5 100644 --- a/src/onapsdk/version.py +++ b/src/onapsdk/version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "12.6.0" +__version__ = "12.6.1" diff --git a/tests/test_version.py b/tests/test_version.py index 6e26328..264f488 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -17,4 +17,4 @@ import onapsdk.version as version def test_version(): """Check version is the right one.""" - assert version.__version__ == '12.6.0' + assert version.__version__ == '12.6.1' -- cgit 1.2.3-korg