[PMSH] Fixes for Flask, MarkupSafe versions + tox

Fixes due to version issues and minor fixes for tox and unit test
Patch 3+4: Version bump

Issue-ID: DCAEGEN2-3086

Signed-off-by: egernug <gerard.nugent@est.tech>
Change-Id: Ibbb83bb50f96737ad127c4c2463957500f7581db

8 files changed, 22 insertions, 13 deletions

diff --git a/components/pm-subscription-handler/Changelog.md b/components/pm-subscription-handler/Changelog.md
index 28efae05..d002f229 100755
--- a/components/pm-subscription-handler/Changelog.md
+++ b/components/pm-subscription-handler/Changelog.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.1]
+### Changed
+* Fixes for Flask, MarkupSafe versions + tox (DCAEGEN2-3086)
+
 ## [2.1.0]
 ### Changed
 * Exit Handler Update (DCAEGEN2-3084)
diff --git a/components/pm-subscription-handler/pmsh_service/mod/api/controller.py b/components/pm-subscription-handler/pmsh_service/mod/api/controller.py
index 7f4f28f5..de3aa5f3 100755
--- a/components/pm-subscription-handler/pmsh_service/mod/api/controller.py
+++ b/components/pm-subscription-handler/pmsh_service/mod/api/controller.py
@@ -167,14 +167,16 @@ def delete_meas_group_by_name(subscription_name, measurement_group_name):
     logger.info(f'API call received to delete measurement group: {measurement_group_name}')
     try:
         measurement_group_administrative_status = \
-            measurement_group_service.query_get_meas_group_admin_status(subscription_name, measurement_group_name)
+            measurement_group_service.query_get_meas_group_admin_status(subscription_name,
+                                                                        measurement_group_name)
         if measurement_group_administrative_status == AdministrativeState.LOCKED.value:
-            if measurement_group_service.query_to_delete_meas_group(subscription_name, measurement_group_name) == 1:
+            if measurement_group_service.query_to_delete_meas_group(subscription_name,
+                                                                    measurement_group_name) == 1:
                 return None, HTTPStatus.NO_CONTENT
             else:
                 logger.error(f'Measurement Group not found with name {measurement_group_name}')
-                return {'error': f'Measurement Group not found with name {measurement_group_name}'}, \
-                    HTTPStatus.NOT_FOUND.value
+                return {'error': f'Measurement Group not found with name '
+                                 f'{measurement_group_name}'}, HTTPStatus.NOT_FOUND.value
         else:
             logger.error('Measurement Group was not deleted because the Administrative State '
                          f'was {measurement_group_administrative_status}')
diff --git a/components/pm-subscription-handler/pmsh_service/mod/api/services/measurement_group_service.py b/components/pm-subscription-handler/pmsh_service/mod/api/services/measurement_group_service.py
index 998c0b19..b272e5b8 100644
--- a/components/pm-subscription-handler/pmsh_service/mod/api/services/measurement_group_service.py
+++ b/components/pm-subscription-handler/pmsh_service/mod/api/services/measurement_group_service.py
@@ -170,7 +170,8 @@ def query_to_delete_meas_group(subscription_name, measurement_group_name):
         int: Returns '1' if subscription exists and deleted successfully else '0'
     """
     affected_rows = db.session.query(MeasurementGroupModel) \
-        .filter_by(subscription_name=subscription_name, measurement_group_name=measurement_group_name).delete()
+        .filter_by(subscription_name=subscription_name,
+                   measurement_group_name=measurement_group_name).delete()
     db.session.commit()
     return affected_rows
 
diff --git a/components/pm-subscription-handler/pom.xml b/components/pm-subscription-handler/pom.xml
index b75fbf51..815b2f16 100644
--- a/components/pm-subscription-handler/pom.xml
+++ b/components/pm-subscription-handler/pom.xml
@@ -32,7 +32,7 @@
   <groupId>org.onap.dcaegen2.services</groupId>
   <artifactId>pmsh</artifactId>
   <name>dcaegen2-services-pm-subscription-handler</name>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.1-SNAPSHOT</version>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <sonar.sources>.</sonar.sources>
diff --git a/components/pm-subscription-handler/setup.py b/components/pm-subscription-handler/setup.py
index 37af3307..ba1b74b9 100644
--- a/components/pm-subscription-handler/setup.py
+++ b/components/pm-subscription-handler/setup.py
@@ -22,7 +22,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pm_subscription_handler",
-    version="2.1.0",
+    version="2.1.1",
     packages=find_packages(),
     author="lego@est.tech",
     author_email="lego@est.tech",
@@ -34,8 +34,9 @@ setup(
         "requests==2.22.0",
         "tenacity==6.0.0",
         "connexion==2.5.0",
+        "MarkupSafe==2.0.1",
         "flask_sqlalchemy==2.4.1",
-        "Flask==1.1.1",
+        "Flask==1.1.4",
         "tornado==6.1",
         "swagger-ui-bundle==0.0.6",
         "psycopg2-binary==2.8.6",
diff --git a/components/pm-subscription-handler/tests/test_aai_event_handler.py b/components/pm-subscription-handler/tests/test_aai_event_handler.py
index d06b7728..5fc38c52 100755
--- a/components/pm-subscription-handler/tests/test_aai_event_handler.py
+++ b/components/pm-subscription-handler/tests/test_aai_event_handler.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START===================================================
-#  Copyright (C) 2020-2021 Nordix Foundation.
+#  Copyright (C) 2020-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.
@@ -46,8 +46,10 @@ class AAIEventHandlerTest(BaseClassSetup):
         super().tearDownClass()
 
     @patch('mod.pmsh_config.AppConfig.get_from_topic')
-    @patch('mod.aai_event_handler.NetworkFunction.delete')
-    def test_process_aai_delete_events(self, mock_nf_delete, mr_aai_mock):
+    @patch('mod.network_function.NetworkFunction.set_nf_model_params')
+    @patch('mod.network_function.NetworkFunction.delete')
+    def test_process_aai_delete_events(self, mock_nf_delete, mock_set_sdnc_params, mr_aai_mock):
+        mock_set_sdnc_params.return_value = True
         mr_aai_mock.return_value = self.mr_aai_events
         aai_handler = AAIEventHandler(self.app)
         network_function = NetworkFunctionModel(
diff --git a/components/pm-subscription-handler/tests/test_controller.py b/components/pm-subscription-handler/tests/test_controller.py
index 9c69d6d6..42c52c09 100755
--- a/components/pm-subscription-handler/tests/test_controller.py
+++ b/components/pm-subscription-handler/tests/test_controller.py
@@ -229,7 +229,6 @@ class ControllerTestCase(BaseClassSetup):
         self.assertEqual(query_meas_group_by_name('MG_unlocked', 'MG1').measurement_group_name,
                          'MG1')
 
-
     def test_delete_sub_when_state_locked(self):
         subscription_unlocked_data = create_subscription_data('MG_locked')
         subscription_unlocked_data.measurement_groups[0].measurement_group_name = 'lock'
diff --git a/components/pm-subscription-handler/version.properties b/components/pm-subscription-handler/version.properties
index 7a7808c0..3c5fba7f 100644
--- a/components/pm-subscription-handler/version.properties
+++ b/components/pm-subscription-handler/version.properties
@@ -1,6 +1,6 @@
 major=2
 minor=1
-patch=0
+patch=1
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT