[DCAEGEN2] PMSH Create Subscription public API

Issue-ID: DCAEGEN2-2819
Change-Id: I80636be25dc4f7b1c5ce7470c7a38c010cb339a1
Signed-off-by: SagarS <sagar.shetty@est.tech>

7 files changed, 701 insertions, 10 deletions

diff --git a/components/pm-subscription-handler/tests/data/create_subscription_request.json b/components/pm-subscription-handler/tests/data/create_subscription_request.json
new file mode 100644
index 00000000..0b2f86f7
--- /dev/null
+++ b/components/pm-subscription-handler/tests/data/create_subscription_request.json
@@ -0,0 +1,60 @@
+{
+  "subscription": {
+    "subscriptionName": "ExtraPM-All-gNB-R2B",
+    "nfFilter": {
+      "nfNames": [
+        "^pnf.*",
+        "^vnf.*"
+      ],
+      "modelInvariantIDs": [
+        "8lk4578-d396-4efb-af02-6b83499b12f8",
+        "687kj45-d396-4efb-af02-6b83499b12f8"
+
+      ],
+      "modelVersionIDs": [
+        "e80a6ae3-cafd-4d24-850d-e14c084a5ca9"
+      ],
+      "modelNames": [
+        "PNF102"
+      ]
+    },
+    "measurementGroups": [
+      {
+        "measurementGroup": {
+            "measurementGroupName": "msrmt_grp_name",
+            "fileBasedGP":15,
+            "fileLocation":"pm.xml",
+            "administrativeState": "UNLOCKED",
+          "measurementTypes": [
+            {
+              "measurementType": "counter_a"
+            }
+          ],
+          "managedObjectDNsBasic": [
+            {
+              "DN": "string"
+            }
+          ]
+        }
+      },
+      {
+        "measurementGroup": {
+            "measurementGroupName": "msrmt_grp_name1",
+            "fileBasedGP":15,
+            "fileLocation":"pm.xml",
+            "administrativeState": "UNLOCKED",
+          "measurementTypes": [
+            {
+              "measurementType": "counter_a"
+            }
+          ],
+          "managedObjectDNsBasic": [
+            {
+              "DN": "string"
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/components/pm-subscription-handler/tests/services/test_measurement_group_service.py b/components/pm-subscription-handler/tests/services/test_measurement_group_service.py
new file mode 100644
index 00000000..e22b2303
--- /dev/null
+++ b/components/pm-subscription-handler/tests/services/test_measurement_group_service.py
@@ -0,0 +1,113 @@
+# ============LICENSE_START===================================================
+#  Copyright (C) 2021 Nordix Foundation.
+# ============================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=====================================================
+
+import json
+import os
+from unittest.mock import patch
+from mod.network_function import NetworkFunction
+from mod.pmsh_config import AppConfig
+from mod import db
+from tests.base_setup import BaseClassSetup
+from mod.api.services import measurement_group_service
+from mod.api.db_models import MeasurementGroupModel, NfMeasureGroupRelationalModel
+from mod.subscription import SubNfState
+
+
+class MeasurementGroupServiceTestCase(BaseClassSetup):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+    def setUp(self):
+        super().setUp()
+        with open(os.path.join(os.path.dirname(__file__),
+                               '../data/create_subscription_request.json'), 'r') as data:
+            self.subscription_request = data.read()
+        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.object(AppConfig, 'publish_to_topic')
+    def test_publish_measurement_group(self, mock_mr):
+        super().setUpAppConf()
+        nf_1 = NetworkFunction(**{'nf_name': 'pnf_1',
+                                  'ipv4_address': '204.120.0.15',
+                                  'ipv6_address': '2001:db8:3333:4444:5555:6666:7777:8888',
+                                  'model_invariant_id': 'some_id',
+                                  'model_version_id': 'some_other_id'},
+                               sdnc_model_name='blah',
+                               sdnc_model_version=1.0, )
+        measurement_grp = MeasurementGroupModel('sub_publish',
+                                                'msg_publish', 'UNLOCKED',
+                                                15, 'pm.xml', [{"measurementType": "counter_a"}],
+                                                [{"DN": "string"}])
+        measurement_group_service.publish_measurement_group(
+            'sub_publish', measurement_grp, nf_1)
+        mock_mr.assert_called_once_with('policy_pm_publisher',
+                                        {'nfName': 'pnf_1',
+                                         'ipAddress': '2001:db8:3333:4444:5555:6666:7777:8888',
+                                         'blueprintName': 'blah',
+                                         'blueprintVersion': 1.0,
+                                         'policyName': 'pmsh-operational-policy',
+                                         'changeType': 'CREATE',
+                                         'closedLoopControlName': 'pmsh-control-loop',
+                                         'subscription':
+                                             {'administrativeState': 'UNLOCKED',
+                                              'subscriptionName': 'sub_publish',
+                                              'fileBasedGP': 15,
+                                              'fileLocation': 'pm.xml',
+                                              'measurementGroup':
+                                                  {'measurementGroupName': 'msg_publish',
+                                                   'measurementTypes':
+                                                       [{"measurementType": "counter_a"}],
+                                                   'managedObjectDNsBasic': [{"DN": "string"}]}}})
+
+    def test_save_measurement_group(self):
+        subscription = json.loads(self.subscription_request)['subscription']
+        mes_grp = subscription['measurementGroups'][0]['measurementGroup']
+        measurement_group_service.save_measurement_group(mes_grp, "ExtraPM-All-gNB-R2B")
+        db.session.commit()
+        measurement_grp = (MeasurementGroupModel.query.filter(
+            MeasurementGroupModel.measurement_group_name == mes_grp['measurementGroupName'],
+            MeasurementGroupModel.subscription_name == 'ExtraPM-All-gNB-R2B').one_or_none())
+        self.assertIsNotNone(measurement_grp)
+
+    def test_apply_nf_to_measgroup(self):
+        measurement_group_service.apply_nf_to_measgroup("pnf_test", "measure_grp_name")
+        db.session.commit()
+        measurement_grp_rel = (NfMeasureGroupRelationalModel.query.filter(
+            NfMeasureGroupRelationalModel.measurement_grp_name == 'measure_grp_name',
+            NfMeasureGroupRelationalModel.nf_name == 'pnf_test').one_or_none())
+        db.session.commit()
+        self.assertIsNotNone(measurement_grp_rel)
+        self.assertEqual(measurement_grp_rel.nf_measure_grp_status,
+                         SubNfState.PENDING_CREATE.value)
+
+    def create_test_subs(self, new_sub_name, new_msrmt_grp_name):
+        subscription = self.subscription_request.replace('ExtraPM-All-gNB-R2B', new_sub_name)
+        subscription = subscription.replace('msrmt_grp_name', new_msrmt_grp_name)
+        return subscription
diff --git a/components/pm-subscription-handler/tests/services/test_nf_service.py b/components/pm-subscription-handler/tests/services/test_nf_service.py
new file mode 100644
index 00000000..6063a8bd
--- /dev/null
+++ b/components/pm-subscription-handler/tests/services/test_nf_service.py
@@ -0,0 +1,105 @@
+# ============LICENSE_START===================================================
+#  Copyright (C) 2021 Nordix Foundation.
+# ============================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=====================================================
+
+import json
+import os
+from unittest.mock import patch
+from flask import current_app
+from mod.api.db_models import NetworkFunctionModel
+from mod import aai_client
+from tests.base_setup import BaseClassSetup
+from mod.api.services import nf_service
+from mod.network_function import NetworkFunctionFilter
+
+
+class NetworkFunctionServiceTestCase(BaseClassSetup):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+    def setUp(self):
+        super().setUp()
+        current_app.config['app_config'] = self.app_conf
+        with open(os.path.join(os.path.dirname(__file__),
+                               '../data/create_subscription_request.json'), 'r') as data:
+            self.subscription_request = data.read()
+        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()
+
+    def create_test_subs(self, new_sub_name, new_msrmt_grp_name):
+        subscription = self.subscription_request.replace('ExtraPM-All-gNB-R2B', new_sub_name)
+        subscription = subscription.replace('msrmt_grp_name', new_msrmt_grp_name)
+        return subscription
+
+    @patch.object(aai_client, '_get_all_aai_nf_data')
+    @patch.object(aai_client, 'get_aai_model_data')
+    @patch.object(NetworkFunctionFilter, 'get_network_function_filter')
+    def test_capture_filtered_nfs(self, mock_filter_call, mock_model_aai, mock_aai):
+        mock_aai.return_value = json.loads(self.aai_response_data)
+        mock_model_aai.return_value = json.loads(self.good_model_info)
+        subscription = json.loads(self.subscription_request)['subscription']
+        mock_filter_call.return_value = NetworkFunctionFilter(**subscription["nfFilter"])
+        filtered_nfs = nf_service.capture_filtered_nfs(subscription["subscriptionName"])
+        self.assertEqual(len(filtered_nfs), 2)
+        self.assertEqual(filtered_nfs[0].nf_name, 'pnf201')
+        self.assertEqual(filtered_nfs[1].nf_name, 'pnf_33_ericsson')
+
+    @patch.object(aai_client, '_get_all_aai_nf_data')
+    @patch.object(aai_client, 'get_aai_model_data')
+    @patch.object(NetworkFunctionFilter, 'get_network_function_filter')
+    def test_create_nf_event_body(self, mock_filter_call, mock_model_aai, mock_aai):
+        mock_aai.return_value = json.loads(self.aai_response_data)
+        mock_model_aai.return_value = json.loads(self.good_model_info)
+        subscription = json.loads(self.subscription_request)['subscription']
+        mock_filter_call.return_value = NetworkFunctionFilter(**subscription["nfFilter"])
+        nf = nf_service.capture_filtered_nfs(subscription["subscriptionName"])[0]
+        event_body = nf_service.create_nf_event_body(nf, 'CREATE')
+        self.assertEqual(event_body['nfName'], nf.nf_name)
+        self.assertEqual(event_body['ipAddress'], nf.ipv6_address)
+        self.assertEqual(event_body['blueprintName'], nf.sdnc_model_name)
+        self.assertEqual(event_body['blueprintVersion'], nf.sdnc_model_version)
+        self.assertEqual(event_body['policyName'],
+                         self.app_conf.operational_policy_name)
+        self.assertEqual(event_body['changeType'], 'CREATE')
+        self.assertEqual(event_body['closedLoopControlName'],
+                         self.app_conf.control_loop_name)
+
+    @patch.object(aai_client, '_get_all_aai_nf_data')
+    @patch.object(aai_client, 'get_aai_model_data')
+    @patch.object(NetworkFunctionFilter, 'get_network_function_filter')
+    def test_save_nf_new_nf(self, mock_filter_call, mock_model_aai, mock_aai):
+        mock_aai.return_value = json.loads(self.aai_response_data)
+        mock_model_aai.return_value = json.loads(self.good_model_info)
+        subscription = json.loads(self.subscription_request)['subscription']
+        mock_filter_call.return_value = NetworkFunctionFilter(**subscription["nfFilter"])
+        nf = nf_service.capture_filtered_nfs(subscription["subscriptionName"])[0]
+        nf.nf_name = 'newnf1'
+        nf_service.save_nf(nf)
+        network_function = NetworkFunctionModel.query.filter(
+            NetworkFunctionModel.nf_name == nf.nf_name).one_or_none()
+        self.assertIsNotNone(network_function)
diff --git a/components/pm-subscription-handler/tests/services/test_subscription_service.py b/components/pm-subscription-handler/tests/services/test_subscription_service.py
new file mode 100644
index 00000000..dca6d871
--- /dev/null
+++ b/components/pm-subscription-handler/tests/services/test_subscription_service.py
@@ -0,0 +1,353 @@
+# ============LICENSE_START===================================================
+#  Copyright (C) 2021 Nordix Foundation.
+# ============================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=====================================================
+import copy
+import json
+import os
+from unittest.mock import patch, MagicMock
+from mod.api.db_models import SubscriptionModel, MeasurementGroupModel, \
+    NfMeasureGroupRelationalModel, NetworkFunctionModel, NfSubRelationalModel, \
+    convert_db_string_to_list
+from mod.network_function import NetworkFunctionFilter
+from mod.subscription import SubNfState
+from mod import aai_client
+from mod.api.custom_exception import DuplicateDataException, InvalidDataException
+from mod.pmsh_config import AppConfig
+from tests.base_setup import BaseClassSetup
+from mod.api.services import subscription_service, nf_service, measurement_group_service
+
+
+class SubscriptionServiceTestCase(BaseClassSetup):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+    def setUp(self):
+        super().setUp()
+        with open(os.path.join(os.path.dirname(__file__),
+                               '../data/create_subscription_request.json'), 'r') as data:
+            self.subscription_request = data.read()
+        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()
+
+    def create_test_subs(self, new_sub_name, new_msrmt_grp_name):
+        subscription = self.subscription_request.replace('ExtraPM-All-gNB-R2B', new_sub_name)
+        subscription = subscription.replace('msrmt_grp_name', new_msrmt_grp_name)
+        return subscription
+
+    @patch('mod.api.services.subscription_service.save_nf_filter', MagicMock(return_value=None))
+    @patch('mod.pmsh_config.AppConfig.publish_to_topic', MagicMock(return_value=None))
+    @patch.object(aai_client, '_get_all_aai_nf_data')
+    @patch.object(aai_client, 'get_aai_model_data')
+    @patch.object(NetworkFunctionFilter, 'get_network_function_filter')
+    def test_create_subscription(self, mock_filter_call, mock_model_aai, mock_aai):
+        mock_aai.return_value = json.loads(self.aai_response_data)
+        mock_model_aai.return_value = json.loads(self.good_model_info)
+        subscription = self.create_test_subs('xtraPM-All-gNB-R2B-new', 'msrmt_grp_name-new')
+        subscription = json.loads(subscription)['subscription']
+        mock_filter_call.return_value = NetworkFunctionFilter(**subscription["nfFilter"])
+        subscription_service.create_subscription(subscription)
+        existing_subscription = (SubscriptionModel.query.filter(
+            SubscriptionModel.subscription_name == 'xtraPM-All-gNB-R2B-new').one_or_none())
+        self.assertIsNotNone(existing_subscription)
+        existing_measurement_grp = (MeasurementGroupModel.query.filter(
+            MeasurementGroupModel.measurement_group_name == 'msrmt_grp_name-new',
+            MeasurementGroupModel.subscription_name == 'xtraPM-All-gNB-R2B-new').one_or_none())
+        self.assertIsNotNone(existing_measurement_grp)
+        msr_grp_nf_rel = (NfMeasureGroupRelationalModel.query.filter(
+            NfMeasureGroupRelationalModel.measurement_grp_name == 'msrmt_grp_name-new')).all()
+        for pubslished_event in msr_grp_nf_rel:
+            self.assertEqual(pubslished_event.nf_measure_grp_status,
+                             SubNfState.PENDING_CREATE.value)
+
+    @patch('mod.api.services.subscription_service.save_nf_filter', MagicMock(return_value=None))
+    @patch.object(AppConfig, 'publish_to_topic')
+    @patch.object(aai_client, '_get_all_aai_nf_data')
+    @patch.object(aai_client, 'get_aai_model_data')
+    @patch.object(NetworkFunctionFilter, 'get_network_function_filter')
+    def test_create_subscription_service_failed_rollback(self, mock_filter_call, mock_model_aai,
+                                                         mock_aai, mock_publish):
+        mock_aai.return_value = json.loads(self.aai_response_data)
+        mock_model_aai.return_value = json.loads(self.good_model_info)
+        mock_publish.side_effect = InvalidDataException(["publish failed"])
+        subscription = self.create_test_subs('xtraPM-All-gNB-R2B-fail1', 'msrmt_grp_name-fail1')
+        subscription = json.loads(subscription)['subscription']
+        mock_filter_call.return_value = NetworkFunctionFilter(**subscription["nfFilter"])
+        try:
+            subscription_service.create_subscription(subscription)
+        except InvalidDataException as exception:
+            self.assertEqual(exception.invalid_message, ["AAI call failed"])
+
+        # Checking Rollback on publish failure with subscription and nfs captured
+        existing_subscription = (SubscriptionModel.query.filter(
+            SubscriptionModel.subscription_name == 'xtraPM-All-gNB-R2B-fail1').one_or_none())
+        self.assertIsNotNone(existing_subscription)
+        saved_nf_sub_rel = (NfSubRelationalModel.query.filter(
+            NfSubRelationalModel.subscription_name == 'xtraPM-All-gNB-R2B-fail1'))
+        self.assertIsNotNone(saved_nf_sub_rel)
+
+    @patch('mod.api.services.subscription_service.save_nf_filter', MagicMock(return_value=None))
+    @patch.object(aai_client, '_get_all_aai_nf_data')
+    @patch.object(NetworkFunctionFilter, 'get_network_function_filter')
+    def test_create_subscription_service_on_aai_failed(self, mock_filter_call, mock_aai):
+        mock_aai.side_effect = InvalidDataException(["AAI call failed"])
+        subscription = self.create_test_subs('xtraPM-All-gNB-R2B-fail', 'msrmt_grp_name-fail')
+        subscription = json.loads(subscription)['subscription']
+        mock_filter_call.return_value = NetworkFunctionFilter(**subscription["nfFilter"])
+        try:
+            subscription_service.create_subscription(subscription)
+        except InvalidDataException as exception:
+            self.assertEqual(exception.invalid_message, ["AAI call failed"])
+
+        # Checking Rollback on AAI failure with subscription request saved
+        existing_subscription = (SubscriptionModel.query.filter(
+            SubscriptionModel.subscription_name == 'xtraPM-All-gNB-R2B-fail').one_or_none())
+        self.assertIsNotNone(existing_subscription)
+
+    def test_perform_validation_existing_sub(self):
+        try:
+            subscription_service.create_subscription(json.loads(self.subscription_request)
+                                                     ['subscription'])
+        except DuplicateDataException as exception:
+            self.assertEqual(exception.duplicate_field_info,
+                             "subscription Name: ExtraPM-All-gNB-R2B already exists.")
+
+    def test_missing_measurement_grp_name(self):
+        subscription = self.create_test_subs('xtraPM-All-gNB-R2B-fail', '')
+        try:
+            subscription_service.create_subscription(json.loads(subscription)['subscription'])
+        except InvalidDataException as exception:
+            self.assertEqual(exception.invalid_message,
+                             "No value provided for measurement group name")
+
+    def test_missing_administrative_state(self):
+        subscription = json.loads(self.create_test_subs('sub-fail', 'measurement_grp_name-fail'))
+        mes_grp = subscription['subscription']['measurementGroups'][0]['measurementGroup']
+        mes_grp['administrativeState'] = ''
+        try:
+            subscription_service.create_subscription(subscription['subscription'])
+        except InvalidDataException as exception:
+            self.assertEqual(exception.invalid_message,
+                             "No value provided for administrative state")
+
+    @patch.object(subscription_service, 'save_nf_filter')
+    def test_save_subscription_request(self, mock_save_filter):
+        mock_save_filter.return_value = None
+        subscription = self.create_test_subs('xtraPM-All-gNB-R2B-new1', 'msrmt_grp_name-new1')
+        subscription_service.save_subscription_request(json.loads(subscription)['subscription'])
+        existing_subscription = (SubscriptionModel.query.filter(
+            SubscriptionModel.subscription_name == 'xtraPM-All-gNB-R2B-new1').one_or_none())
+        self.assertIsNotNone(existing_subscription)
+        self.assertTrue(mock_save_filter.called)
+        existing_measurement_grp = (MeasurementGroupModel.query.filter(
+            MeasurementGroupModel.measurement_group_name == 'msrmt_grp_name-new1',
+            MeasurementGroupModel.subscription_name == 'xtraPM-All-gNB-R2B-new1').one_or_none())
+        self.assertIsNotNone(existing_measurement_grp)
+
+    @patch.object(aai_client, '_get_all_aai_nf_data')
+    @patch.object(aai_client, 'get_aai_model_data')
+    @patch.object(measurement_group_service, 'apply_nf_to_measgroup')
+    @patch.object(NetworkFunctionFilter, 'get_network_function_filter')
+    def test_apply_measurement_grp_to_nfs(self, mock_filter_call, mock_apply_nf,
+                                          mock_model_aai, mock_aai):
+        mock_aai.return_value = json.loads(self.aai_response_data)
+        mock_model_aai.return_value = json.loads(self.good_model_info)
+        mock_apply_nf.return_value = None
+        subscription = self.create_test_subs('xtraPM-All-gNB-R2B-new2', 'msrmt_grp_name-new2')
+        subscription = json.loads(subscription)['subscription']
+        measurement_grp = MeasurementGroupModel('subscription_name_1',
+                                                'msrmt_grp_name', 'UNLOCKED',
+                                                15, 'pm.xml', [], [])
+        measurement2 = self.create_measurement_grp(measurement_grp, 'meas2', 'UNLOCKED')
+        measurement3 = self.create_measurement_grp(measurement_grp, 'meas3', 'LOCKED')
+        measurement_grps = [measurement_grp, measurement2, measurement3]
+        mock_filter_call.return_value = NetworkFunctionFilter(**subscription["nfFilter"])
+        filtered_nfs = nf_service.capture_filtered_nfs(subscription["subscriptionName"])
+        subscription_service.apply_measurement_grp_to_nfs(filtered_nfs, measurement_grps)
+        # 2 measurement group with 2 nfs each contribute 4 calls
+        self.assertEqual(mock_apply_nf.call_count, 4)
+
+    @patch.object(aai_client, '_get_all_aai_nf_data')
+    @patch.object(aai_client, 'get_aai_model_data')
+    @patch.object(AppConfig, 'publish_to_topic')
+    @patch.object(NetworkFunctionFilter, 'get_network_function_filter')
+    def test_publish_measurement_grp_to_nfs(self, mock_filter_call, mock_publish,
+                                            mock_model_aai, mock_aai):
+        mock_aai.return_value = json.loads(self.aai_response_data)
+        mock_model_aai.return_value = json.loads(self.good_model_info)
+        mock_publish.return_value = None
+        subscription = self.create_test_subs('xtraPM-All-gNB-R2B-new2', 'msrmt_grp_name-new2')
+        subscription = json.loads(subscription)['subscription']
+        measurement_grp = MeasurementGroupModel('subscription_name_1',
+                                                'msrmt_grp_name', 'UNLOCKED',
+                                                15, 'pm.xml', [], [])
+        measurement2 = self.create_measurement_grp(measurement_grp, 'meas2', 'UNLOCKED')
+        measurement3 = self.create_measurement_grp(measurement_grp, 'meas3', 'UNLOCKED')
+        measurement_grps = [measurement_grp, measurement2, measurement3]
+        mock_filter_call.return_value = NetworkFunctionFilter(**subscription["nfFilter"])
+        filtered_nfs = nf_service.capture_filtered_nfs(subscription["subscriptionName"])
+        subscription_service.publish_measurement_grp_to_nfs(
+            subscription["subscriptionName"], filtered_nfs, measurement_grps)
+        # Two unlocked measurement Group published
+        self.assertEqual(mock_publish.call_count, 6)
+
+    patch.object(aai_client, 'get_aai_model_data')
+
+    @patch.object(aai_client, '_get_all_aai_nf_data')
+    @patch.object(aai_client, 'get_aai_model_data')
+    @patch.object(AppConfig, 'publish_to_topic')
+    @patch('mod.logger.error')
+    @patch.object(NetworkFunctionFilter, 'get_network_function_filter')
+    def test_publish_measurement_grp_to_nfs_failed(self, mock_filter_call, mock_logger,
+                                                   mock_publish, mock_model_aai, mock_aai):
+        mock_aai.return_value = json.loads(self.aai_response_data)
+        mock_model_aai.return_value = json.loads(self.good_model_info)
+        mock_publish.side_effect = Exception('Publish failed')
+        subscription = self.create_test_subs('xtraPM-All-gNB-R2B-new2', 'msrmt_grp_name-new2')
+        subscription = json.loads(subscription)['subscription']
+        measurement_grp = MeasurementGroupModel('subscription_name_1',
+                                                'msrmt_grp_name', 'UNLOCKED',
+                                                15, 'pm.xml', [], [])
+        measurement2 = self.create_measurement_grp(measurement_grp, 'meas2', 'UNLOCKED')
+        measurement3 = self.create_measurement_grp(measurement_grp, 'meas3', 'LOCKED')
+        measurement_grps = [measurement_grp, measurement2, measurement3]
+        mock_filter_call.return_value = NetworkFunctionFilter(**subscription["nfFilter"])
+        filtered_nfs = nf_service.capture_filtered_nfs(subscription["subscriptionName"])
+        subscription_service.publish_measurement_grp_to_nfs(
+            subscription["subscriptionName"], filtered_nfs, measurement_grps)
+        mock_logger.assert_called_with('Publish event failed for nf name, measure_grp_name, '
+                                       'sub_name: pnf_33_ericsson,meas2, xtraPM-All-gNB-R2B-new2 '
+                                       'with error: Publish failed')
+
+    @patch('mod.api.services.subscription_service.save_nf_filter', MagicMock(return_value=None))
+    @patch('mod.pmsh_config.AppConfig.publish_to_topic', MagicMock(return_value=None))
+    @patch.object(aai_client, '_get_all_aai_nf_data')
+    @patch.object(aai_client, 'get_aai_model_data')
+    @patch.object(NetworkFunctionFilter, 'get_network_function_filter')
+    @patch('mod.logger.error')
+    def test_create_subscription_all_locked_msg_grp(self, mock_logger, mock_filter_call,
+                                                    mock_model_aai, mock_aai):
+        mock_aai.return_value = json.loads(self.aai_response_data)
+        mock_model_aai.return_value = json.loads(self.good_model_info)
+        subscription = self.create_test_subs('xtraPM-All-gNB-R2B-new2', 'msrmt_grp_name-new2')
+        subscription = subscription.replace('UNLOCKED', 'LOCKED')
+        subscription = json.loads(subscription)['subscription']
+        mock_filter_call.return_value = NetworkFunctionFilter(**subscription["nfFilter"])
+        subscription_service.create_subscription(subscription)
+        mock_logger.assert_called_with('All measurement groups are locked for subscription: '
+                                       'xtraPM-All-gNB-R2B-new2, please verify/check'
+                                       ' measurement groups.')
+
+    def create_measurement_grp(self, measurement, measurement_name, admin_status):
+        new_measurement = copy.deepcopy(measurement)
+        measurement.measurement_group_name = measurement_name
+        new_measurement.administrative_state = admin_status
+        return new_measurement
+
+    @patch('mod.api.services.subscription_service.save_nf_filter', MagicMock(return_value=None))
+    @patch('mod.pmsh_config.AppConfig.publish_to_topic', MagicMock(return_value=None))
+    @patch.object(aai_client, '_get_all_aai_nf_data')
+    @patch.object(aai_client, 'get_aai_model_data')
+    @patch.object(NetworkFunctionFilter, 'get_network_function_filter')
+    def test_save_filtered_nfs(self, mock_filter_call, mock_model_aai, mock_aai):
+        mock_aai.return_value = json.loads(self.aai_response_data)
+        mock_model_aai.return_value = json.loads(self.good_model_info)
+        subscription = self.create_test_subs('xtraPM-All-gNB-R2B-new', 'msrmt_grp_name-new')
+        subscription = json.loads(subscription)['subscription']
+        mock_filter_call.return_value = NetworkFunctionFilter(**subscription["nfFilter"])
+        filtered_nfs = nf_service.capture_filtered_nfs(subscription["subscriptionName"])
+        subscription_service.save_filtered_nfs(filtered_nfs)
+
+        for nf in filtered_nfs:
+            saved_nf = (NetworkFunctionModel.query.filter(
+                NetworkFunctionModel.nf_name == nf.nf_name).one_or_none())
+            self.assertIsNotNone(saved_nf)
+
+    @patch('mod.api.services.subscription_service.save_nf_filter', MagicMock(return_value=None))
+    @patch('mod.pmsh_config.AppConfig.publish_to_topic', MagicMock(return_value=None))
+    @patch.object(aai_client, '_get_all_aai_nf_data')
+    @patch.object(aai_client, 'get_aai_model_data')
+    @patch.object(NetworkFunctionFilter, 'get_network_function_filter')
+    def test_apply_subscription_to_nfs(self, mock_filter_call, mock_model_aai, mock_aai):
+        mock_aai.return_value = json.loads(self.aai_response_data)
+        mock_model_aai.return_value = json.loads(self.good_model_info)
+        subscription = json.loads(self.subscription_request)['subscription']
+        mock_filter_call.return_value = NetworkFunctionFilter(**subscription["nfFilter"])
+        filtered_nfs = nf_service.capture_filtered_nfs(subscription["subscriptionName"])
+        subscription_service.apply_subscription_to_nfs(filtered_nfs, 'xtraPM-All-gNB-R2B')
+
+        for nf in filtered_nfs:
+            saved_nf_sub_rel = (NfSubRelationalModel.query.filter(
+                NfSubRelationalModel.subscription_name == 'xtraPM-All-gNB-R2B',
+                NfSubRelationalModel.nf_name == nf.nf_name).one_or_none())
+            self.assertIsNotNone(saved_nf_sub_rel)
+
+    def test_check_missing_data_sub_name_missing(self):
+        subscription = self.create_test_subs('', 'msrmt_grp_name-new')
+        subscription = json.loads(subscription)['subscription']
+        try:
+            subscription_service.check_missing_data(subscription)
+        except InvalidDataException as invalidEx:
+            self.assertEqual(invalidEx.invalid_message, "No value provided in subscription name")
+
+    def test_check_missing_data_admin_status_missing(self):
+        subscription = self.subscription_request.replace(
+            'UNLOCKED', '')
+        subscription = json.loads(subscription)['subscription']
+        try:
+            subscription_service.check_missing_data(subscription)
+        except InvalidDataException as invalidEx:
+            self.assertEqual(invalidEx.invalid_message,
+                             "No value provided for administrative state")
+
+    def test_check_missing_data_msr_grp_name(self):
+        subscription = self.create_test_subs('xtraPM-All-gNB-R2B-new', '')
+        subscription = json.loads(subscription)['subscription']
+        try:
+            subscription_service.check_missing_data(subscription)
+        except InvalidDataException as invalidEx:
+            self.assertEqual(invalidEx.invalid_message,
+                             "No value provided for measurement group name")
+
+    def test_validate_nf_filter_with_no_filter_values(self):
+        nfFilter = '{"nfNames": [],"modelInvariantIDs": [], ' \
+                   '"modelVersionIDs": [],"modelNames": []}'
+        try:
+            subscription_service.validate_nf_filter(json.loads(nfFilter))
+        except InvalidDataException as invalidEx:
+            self.assertEqual(invalidEx.invalid_message,
+                             "At least one filter within nfFilter must not be empty")
+
+    def test_db_string_to_list(self):
+        db_string = '{"*pnf","*vnf"}'
+        db_array = convert_db_string_to_list(db_string)
+        self.assertEqual(len(db_array), 2)
+
+    def test_db_string_to_list_empty(self):
+        db_string = '{}'
+        db_array = convert_db_string_to_list(db_string)
+        self.assertEqual(len(db_array), 0)
diff --git a/components/pm-subscription-handler/tests/test_aai_service.py b/components/pm-subscription-handler/tests/test_aai_service.py
index 27c0f402..97f400c1 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-2020 Nordix Foundation.
+#  Copyright (C) 2019-2021 Nordix Foundation.
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ 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)
+        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')
         self.assertEqual(len(xnfs), 3)
@@ -67,7 +67,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)
+                aai_client.get_pmsh_nfs_from_aai(self.app_conf, self.app_conf.nf_filter)
 
     @responses.activate
     def test_aai_client_get_all_aai_xnf_data_not_found(self):
diff --git a/components/pm-subscription-handler/tests/test_controller.py b/components/pm-subscription-handler/tests/test_controller.py
index c38cd976..a3a28163 100755
--- a/components/pm-subscription-handler/tests/test_controller.py
+++ b/components/pm-subscription-handler/tests/test_controller.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START===================================================
-#  Copyright (C) 2019-2020 Nordix Foundation.
+#  Copyright (C) 2019-2021 Nordix Foundation.
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,14 +17,15 @@
 # ============LICENSE_END=====================================================
 import json
 import os
-from unittest.mock import patch
-
+from unittest.mock import patch, MagicMock
 import responses
 from requests import Session
-
 from mod import aai_client
-from mod.api.controller import status, get_all_sub_to_nf_relations
+from mod.api.controller import status, get_all_sub_to_nf_relations, post_subscription
 from tests.base_setup import BaseClassSetup
+from mod.api.db_models import SubscriptionModel, NfMeasureGroupRelationalModel
+from mod.subscription import SubNfState
+from mod.network_function import NetworkFunctionFilter
 
 
 class ControllerTestCase(BaseClassSetup):
@@ -35,10 +36,14 @@ class ControllerTestCase(BaseClassSetup):
 
     def setUp(self):
         super().setUp()
+        super().setUpAppConf()
         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()
+        with open(os.path.join(os.path.dirname(__file__),
+                               'data/create_subscription_request.json'), 'r') as data:
+            self.subscription_request = data.read()
 
     def tearDown(self):
         super().tearDown()
@@ -62,10 +67,65 @@ class ControllerTestCase(BaseClassSetup):
                       '7129e420-d396-4efb-af02-6b83499b12f8/model-vers/model-ver/'
                       'e80a6ae3-cafd-4d24-850d-e14c084a5ca9',
                       json=json.loads(self.good_model_info), status=200)
-        self.xnfs = aai_client.get_pmsh_nfs_from_aai(self.app_conf)
+        self.xnfs = aai_client.get_pmsh_nfs_from_aai(self.app_conf, self.app_conf.nf_filter)
         sub_model = self.app_conf.subscription.get()
         for nf in self.xnfs:
             self.app_conf.subscription.add_network_function_to_subscription(nf, sub_model)
         all_subs = get_all_sub_to_nf_relations()
         self.assertEqual(len(all_subs[0]['network_functions']), 3)
         self.assertEqual(all_subs[0]['subscription_name'], 'ExtraPM-All-gNB-R2B')
+
+    def create_test_subs(self, new_sub_name, new_msrmt_grp_name):
+        subscription = self.subscription_request.replace('ExtraPM-All-gNB-R2B', new_sub_name)
+        subscription = subscription.replace('msrmt_grp_name', new_msrmt_grp_name)
+        return subscription
+
+    @patch('mod.api.services.subscription_service.save_nf_filter', MagicMock(return_value=None))
+    @patch('mod.pmsh_config.AppConfig.publish_to_topic', MagicMock(return_value=None))
+    @patch.object(aai_client, '_get_all_aai_nf_data')
+    @patch.object(aai_client, 'get_aai_model_data')
+    @patch.object(NetworkFunctionFilter, 'get_network_function_filter')
+    def test_post_subscription(self, mock_filter_call, mock_model_aai, mock_aai):
+        mock_aai.return_value = json.loads(self.aai_response_data)
+        mock_model_aai.return_value = json.loads(self.good_model_info)
+        subscription = self.create_test_subs('xtraPM-All-gNB-R2B-post', 'msrmt_grp_name-post')
+        subscription = json.loads(subscription)
+        mock_filter_call.return_value = NetworkFunctionFilter(
+            **subscription['subscription']["nfFilter"])
+        sub_name = subscription['subscription']['subscriptionName']
+        mes_grp = subscription['subscription']['measurementGroups'][0]['measurementGroup']
+        mes_grp_name = mes_grp['measurementGroupName']
+        response = post_subscription(subscription)
+        subscription = (SubscriptionModel.query.filter(
+            SubscriptionModel.subscription_name == sub_name).one_or_none())
+        self.assertIsNotNone(subscription)
+        msr_grp_nf_rel = (NfMeasureGroupRelationalModel.query.filter(
+            NfMeasureGroupRelationalModel.measurement_grp_name == mes_grp_name)).all()
+        for published_event in msr_grp_nf_rel:
+            self.assertEqual(published_event.nf_measure_grp_status,
+                             SubNfState.PENDING_CREATE.value)
+        self.assertEqual(response[1], 201)
+
+    def test_post_subscription_duplicate_sub(self):
+        # Posting the same subscription request stored in previous test to get duplicate response
+        response = post_subscription(json.loads(self.subscription_request))
+        self.assertEqual(response[1], 409)
+        self.assertEqual(response[0], 'subscription Name: ExtraPM-All-gNB-R2B already exists.')
+
+    def test_post_subscription_invalid_filter(self):
+        subscription = self.create_test_subs('xtraPM-All-gNB-R2B-invalid', 'msrmt_grp_name-invalid')
+        subscription = json.loads(subscription)
+        subscription['subscription']['nfFilter']['nfNames'] = []
+        subscription['subscription']['nfFilter']['modelInvariantIDs'] = []
+        subscription['subscription']['nfFilter']['modelVersionIDs'] = []
+        subscription['subscription']['nfFilter']['modelNames'] = []
+        response = post_subscription(subscription)
+        self.assertEqual(response[1], 400)
+        self.assertEqual(response[0], 'At least one filter within nfFilter must not be empty')
+
+    def test_post_subscription_missing(self):
+        subscription = json.loads(self.subscription_request)
+        subscription['subscription']['subscriptionName'] = ''
+        response = post_subscription(subscription)
+        self.assertEqual(response[1], 400)
+        self.assertEqual(response[0], 'No value provided in subscription name')
diff --git a/components/pm-subscription-handler/tests/test_subscription.py b/components/pm-subscription-handler/tests/test_subscription.py
index 01c573e3..3921aa9b 100755
--- a/components/pm-subscription-handler/tests/test_subscription.py
+++ b/components/pm-subscription-handler/tests/test_subscription.py
@@ -48,7 +48,7 @@ class SubscriptionTest(BaseClassSetup):
         self.mock_mr_sub = Mock()
         self.mock_mr_pub = Mock()
         self.app_conf.subscription.create()
-        self.xnfs = aai_client.get_pmsh_nfs_from_aai(self.app_conf)
+        self.xnfs = aai_client.get_pmsh_nfs_from_aai(self.app_conf, self.app_conf.nf_filter)
         self.sub_model = self.app_conf.subscription.get()
 
     def tearDown(self):