diff options
author | Tony Hansen <tony@att.com> | 2022-03-07 20:34:07 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2022-03-07 20:34:07 +0000 |
commit | 6c9c8cc2a1a289ef0b4172d387376d0367549fe3 (patch) | |
tree | 86d10ee475a012545bcfc8b256f928f1996dc6de /components/pm-subscription-handler/tests/test_aai_service.py | |
parent | f67adad42f2c857ff76b52df39f0beb5c2cabee4 (diff) | |
parent | 5a2c43f2add2c6d4af8331a40b174684eac11b34 (diff) |
Merge "[PMSH] Cleaning up old App Config, subscription handler and it's subsequent calls"
Diffstat (limited to 'components/pm-subscription-handler/tests/test_aai_service.py')
-rw-r--r-- | components/pm-subscription-handler/tests/test_aai_service.py | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/components/pm-subscription-handler/tests/test_aai_service.py b/components/pm-subscription-handler/tests/test_aai_service.py index 97f400c1..0d0bd962 100644 --- a/components/pm-subscription-handler/tests/test_aai_service.py +++ b/components/pm-subscription-handler/tests/test_aai_service.py @@ -1,5 +1,5 @@ # ============LICENSE_START=================================================== -# Copyright (C) 2019-2021 Nordix Foundation. +# Copyright (C) 2019-2022 Nordix Foundation. # ============================================================================ # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. @@ -23,30 +23,21 @@ from unittest.mock import patch import responses from requests import Session, HTTPError -import mod.aai_client as aai_client -from tests.base_setup import BaseClassSetup +from mod import aai_client +from mod.network_function import NetworkFunctionFilter +from tests.base_setup import BaseClassSetup, create_subscription_data class AaiClientTestCase(BaseClassSetup): - @classmethod - def setUpClass(cls): - super().setUpClass() - def setUp(self): super().setUp() + self.subscription = create_subscription_data('ExtraPM-All-gNB-R2B') with open(os.path.join(os.path.dirname(__file__), 'data/aai_xnfs.json'), 'r') as data: self.aai_response_data = data.read() with open(os.path.join(os.path.dirname(__file__), 'data/aai_model_info.json'), 'r') as data: self.good_model_info = data.read() - def tearDown(self): - super().tearDown() - - @classmethod - def tearDownClass(cls): - super().tearDownClass() - @patch('mod.network_function.NetworkFunction.set_nf_model_params') @patch.object(Session, 'get') @patch.object(Session, 'put') @@ -57,9 +48,10 @@ class AaiClientTestCase(BaseClassSetup): mock_get_session.return_value.status_code = 200 mock_get_session.return_value.text = self.good_model_info mock_get_sdnc_params.return_value = True - xnfs = aai_client.get_pmsh_nfs_from_aai(self.app_conf, self.app_conf.nf_filter) - self.assertEqual(self.app_conf.subscription.subscriptionName, 'ExtraPM-All-gNB-R2B') - self.assertEqual(self.app_conf.subscription.administrativeState, 'UNLOCKED') + nf_filter = NetworkFunctionFilter(**self.subscription.network_filter.serialize()) + xnfs = aai_client.get_pmsh_nfs_from_aai(self.app_conf, nf_filter) + self.assertEqual(self.subscription.subscription_name, 'ExtraPM-All-gNB-R2B') + self.assertEqual(self.subscription.measurement_groups[0].administrative_state, 'UNLOCKED') self.assertEqual(len(xnfs), 3) @patch.object(Session, 'put') @@ -67,7 +59,7 @@ class AaiClientTestCase(BaseClassSetup): mock_session.return_value.status_code = 404 with mock.patch('mod.aai_client._get_all_aai_nf_data', return_value=None): with self.assertRaises(RuntimeError): - aai_client.get_pmsh_nfs_from_aai(self.app_conf, self.app_conf.nf_filter) + aai_client.get_pmsh_nfs_from_aai(self.app_conf, self.subscription.network_filter) @responses.activate def test_aai_client_get_all_aai_xnf_data_not_found(self): |