Adding DB Init and setup

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Ie32efcf007c9b6fa25b0072019f4a91a841d9d0c
Issue-ID: DCAEGEN2-1828

7 files changed, 179 insertions, 38 deletions

diff --git a/components/pm-subscription-handler/tests/data/cbs_data.json b/components/pm-subscription-handler/tests/data/cbs_data_1.json
index ccc0626d..ccc0626d 100644
--- a/components/pm-subscription-handler/tests/data/cbs_data.json
+++ b/components/pm-subscription-handler/tests/data/cbs_data_1.json
diff --git a/components/pm-subscription-handler/tests/expected_config.json b/components/pm-subscription-handler/tests/data/cbs_data_2.json
index 43f67e88..43f67e88 100755
--- a/components/pm-subscription-handler/tests/expected_config.json
+++ b/components/pm-subscription-handler/tests/data/cbs_data_2.json
diff --git a/components/pm-subscription-handler/tests/test_aai_service.py b/components/pm-subscription-handler/tests/test_aai_service.py
index 7b71d3e8..7f4735a9 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 Nordix Foundation.
+#  Copyright (C) 2019-2020 Nordix Foundation.
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ class AaiClientTestCase(unittest.TestCase):
         self.env = EnvironmentVarGuard()
         self.env.set('AAI_SERVICE_HOST', '1.2.3.4')
         self.env.set('AAI_SERVICE_PORT_AAI_SSL', '8443')
-        with open(os.path.join(os.path.dirname(__file__), 'data/cbs_data.json'), 'r') as data:
+        with open(os.path.join(os.path.dirname(__file__), 'data/cbs_data_1.json'), 'r') as data:
             self.cbs_data = json.load(data)
         with open(os.path.join(os.path.dirname(__file__), 'data/aai_xnfs.json'), 'r') as data:
             self.aai_response_data = data.read()
@@ -50,7 +50,7 @@ class AaiClientTestCase(unittest.TestCase):
     @mock.patch.object(Session, 'put')
     def test_aai_client_get_pm_sub_data_fail(self, mock_session):
         mock_session.return_value.status_code = 404
-        with mock.patch('aai_client._get_all_aai_xnf_data', return_value=None):
+        with mock.patch('mod.aai_client._get_all_aai_nf_data', return_value=None):
             with self.assertRaises(RuntimeError):
                 aai_client.get_pmsh_subscription_data(self.cbs_data)
 
@@ -59,14 +59,14 @@ class AaiClientTestCase(unittest.TestCase):
         responses.add(responses.PUT,
                       'https://1.2.3.4:8443/aai/v16/query?format=simple&nodesOnly=true',
                       json={'error': 'not found'}, status=404)
-        self.assertIsNone(aai_client._get_all_aai_xnf_data())
+        self.assertIsNone(aai_client._get_all_aai_nf_data())
 
     @responses.activate
     def test_aai_client_get_all_aai_xnf_data_success(self):
         responses.add(responses.PUT,
                       'https://1.2.3.4:8443/aai/v16/query?format=simple&nodesOnly=true',
                       json={'dummy_data': 'blah_blah'}, status=200)
-        self.assertIsNotNone(aai_client._get_all_aai_xnf_data())
+        self.assertIsNotNone(aai_client._get_all_aai_nf_data())
 
     def test_aai_client_get_aai_service_url_fail(self):
         self.env.clear()
diff --git a/components/pm-subscription-handler/tests/config_handler_test.py b/components/pm-subscription-handler/tests/test_config_handler.py
index fcc25d60..5e80db5d 100755
--- a/components/pm-subscription-handler/tests/config_handler_test.py
+++ b/components/pm-subscription-handler/tests/test_config_handler.py
@@ -20,16 +20,14 @@ import json
 import unittest
 from os import environ
 from os import path
-from unittest.mock import patch
 
-import requests
 import responses
 from tenacity import wait_none
 
 from pmsh_service.mod.config_handler import ConfigHandler
 
 
-class ConfigHandlerTest(unittest.TestCase):
+class ConfigHandlerTestCase(unittest.TestCase):
 
     def setUp(self):
         self.env_vars = {'CONFIG_BINDING_SERVICE_SERVICE_HOST': 'cbs_hostname',
@@ -38,7 +36,8 @@ class ConfigHandlerTest(unittest.TestCase):
         for key, value in self.env_vars.items():
             environ[key] = value
         self.cbs_url = 'http://cbs_hostname:10000/service_component_all/hostname'
-        self.expected_config = self._get_expected_config()
+        with open(path.join(path.dirname(__file__), 'data/cbs_data_2.json'))as json_file:
+            self.expected_config = json.load(json_file)
 
     def test_missing_environment_variable(self):
         for key, value in self.env_vars.items():
@@ -58,17 +57,6 @@ class ConfigHandlerTest(unittest.TestCase):
 
         self.assertEqual(self.expected_config, config_handler.get_config())
 
-    def test_get_config_already_exists(self):
-        config_handler = ConfigHandler()
-        expected_config = self._get_expected_config()
-        config_handler._config = expected_config
-
-        with patch.object(requests, 'get') as mock_get_request:
-            actual_config = config_handler.get_config()
-
-        self.assertEqual(0, mock_get_request.call_count)
-        self.assertEqual(expected_config, actual_config)
-
     @responses.activate
     def test_get_config_error(self):
         responses.add(responses.GET, self.cbs_url, status=404)
@@ -105,8 +93,3 @@ class ConfigHandlerTest(unittest.TestCase):
         config_handler.get_config()
 
         self.assertEqual(retry_attempts, len(responses.calls))
-
-    @staticmethod
-    def _get_expected_config():
-        with open(path.join(path.dirname(__file__), 'expected_config.json'))as json_file:
-            return json.load(json_file)
diff --git a/components/pm-subscription-handler/tests/test_network_function.py b/components/pm-subscription-handler/tests/test_network_function.py
new file mode 100755
index 00000000..2af1489b
--- /dev/null
+++ b/components/pm-subscription-handler/tests/test_network_function.py
@@ -0,0 +1,61 @@
+# ============LICENSE_START===================================================
+#  Copyright (C) 2019-2020 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 unittest
+
+from mod import db, create_test_app
+from mod.network_function import NetworkFunction
+
+
+class NetworkFunctionTests(unittest.TestCase):
+
+    def setUp(self):
+        self.nf_1 = NetworkFunction(nf_name='pnf_1', orchestration_status='Inventoried')
+        self.nf_2 = NetworkFunction(nf_name='pnf_2', orchestration_status='Active')
+        self.app = create_test_app()
+        self.app_context = self.app.app_context()
+        self.app_context.push()
+        db.create_all()
+
+    def tearDown(self):
+        db.session.remove()
+        db.drop_all()
+        self.app_context.pop()
+
+    def test_get_network_function(self):
+        self.nf_1.create()
+        nf = NetworkFunction.get('pnf_1')
+        self.assertEqual(self.nf_1.nf_name, nf.nf_name)
+
+    def test_get_network_function_no_match(self):
+        self.nf_1.create()
+        nf_name = 'nf2_does_not_exist'
+        nf = NetworkFunction.get(nf_name)
+        self.assertEqual(nf, None)
+
+    def test_get_network_functions(self):
+        self.nf_1.create()
+        self.nf_2.create()
+        nfs = NetworkFunction.get_all()
+
+        self.assertEqual(2, len(nfs))
+
+    def test_create_existing_network_function(self):
+        nf = self.nf_1.create()
+        same_nf = self.nf_1.create()
+
+        self.assertEqual(nf, same_nf)
diff --git a/components/pm-subscription-handler/tests/test_pmsh_utils.py b/components/pm-subscription-handler/tests/test_pmsh_utils.py
index ee79d523..8df2c62a 100644
--- a/components/pm-subscription-handler/tests/test_pmsh_utils.py
+++ b/components/pm-subscription-handler/tests/test_pmsh_utils.py
@@ -18,12 +18,14 @@
 import json
 import os
 import unittest
+from test.support import EnvironmentVarGuard
 from unittest import mock
 from unittest.mock import patch
 
 import responses
 from requests import Session
 
+from mod import get_db_connection_url
 from mod.pmsh_utils import AppConfig
 from mod.subscription import Subscription
 
@@ -31,7 +33,7 @@ from mod.subscription import Subscription
 class PmshUtilsTestCase(unittest.TestCase):
 
     def setUp(self):
-        with open(os.path.join(os.path.dirname(__file__), 'data/cbs_data.json'), 'r') as data:
+        with open(os.path.join(os.path.dirname(__file__), 'data/cbs_data_1.json'), 'r') as data:
             self.cbs_data = json.load(data)
         self.app_conf = AppConfig(**self.cbs_data['config'])
         self.sub = Subscription(**self.cbs_data['policy']['subscription'])
@@ -98,3 +100,18 @@ class PmshUtilsTestCase(unittest.TestCase):
         mr_policy_sub = self.app_conf.get_mr_sub('policy_pm_subscriber')
         mr_topic_data = mr_policy_sub.get_from_topic(1)
         self.assertIsNone(mr_topic_data)
+
+    def test_get_db_connection_url_success(self):
+        self.env = EnvironmentVarGuard()
+        self.env.set('PMSH_PG_URL', '1.2.3.4')
+        self.env.set('PMSH_PG_USERNAME', 'pmsh')
+        self.env.set('PMSH_PG_PASSWORD', 'pass')
+        db_url = get_db_connection_url()
+        self.assertEqual(db_url, 'postgres+psycopg2://pmsh:pass@1.2.3.4:5432/pmsh')
+
+    def test_get_db_connection_url_fail(self):
+        self.env = EnvironmentVarGuard()
+        self.env.set('PMSH_PG_USERNAME', 'pmsh')
+        self.env.set('PMSH_PG_PASSWORD', 'pass')
+        with self.assertRaises(Exception):
+            get_db_connection_url()
diff --git a/components/pm-subscription-handler/tests/test_subscription.py b/components/pm-subscription-handler/tests/test_subscription.py
index cbf930fd..3c7651d4 100644..100755
--- a/components/pm-subscription-handler/tests/test_subscription.py
+++ b/components/pm-subscription-handler/tests/test_subscription.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START===================================================
-#  Copyright (C) 2019 Nordix Foundation.
+#  Copyright (C) 2019-2020 Nordix Foundation.
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,26 +18,106 @@
 import json
 import os
 import unittest
+from test.support import EnvironmentVarGuard
+from unittest import mock
 
-from mod.subscription import Subscription, XnfFilter
+from requests import Session
 
+import mod.aai_client as aai_client
+from mod import db, create_test_app
+from mod.network_function import NetworkFunction
+from mod.subscription import Subscription, NetworkFunctionFilter
 
-class SubscriptionTestCase(unittest.TestCase):
 
-    def setUp(self):
-        with open(os.path.join(os.path.dirname(__file__), 'data/cbs_data.json'), 'r') as data:
-            self.cbs_data = json.load(data)
-        self.sub = Subscription(**self.cbs_data['policy']['subscription'])
-        self.xnf_filter = XnfFilter(**self.sub.nfFilter)
+class SubscriptionTest(unittest.TestCase):
+
+    @mock.patch.object(Session, 'put')
+    def setUp(self, mock_session):
+        with open(os.path.join(os.path.dirname(__file__), 'data/aai_xnfs.json'), 'r') as data:
+            self.aai_response_data = data.read()
+        mock_session.return_value.status_code = 200
+        mock_session.return_value.text = self.aai_response_data
+        self.env = EnvironmentVarGuard()
+        self.env.set('AAI_SERVICE_HOST', '1.2.3.4')
+        self.env.set('AAI_SERVICE_PORT_AAI_SSL', '8443')
+        with open(os.path.join(os.path.dirname(__file__), 'data/cbs_data_1.json'), 'r') as data:
+            self.cbs_data_1 = json.load(data)
+        with open(os.path.join(os.path.dirname(__file__),
+                               'data/cbs_data_2.json'), 'r') as data:
+            self.cbs_data_2 = json.load(data)
+        self.sub_1, self.xnfs = aai_client.get_pmsh_subscription_data(self.cbs_data_1)
+        self.sub_2, self.xnfs = aai_client.get_pmsh_subscription_data(self.cbs_data_2)
+        self.nf_1 = NetworkFunction(nf_name='pnf_1', orchestration_status='Inventoried')
+        self.nf_2 = NetworkFunction(nf_name='pnf_2', orchestration_status='Active')
+        self.xnf_filter = NetworkFunctionFilter(**self.sub_1.nfFilter)
+        self.app = create_test_app()
+        self.app_context = self.app.app_context()
+        self.app_context.push()
+        db.create_all()
+
+    def tearDown(self):
+        db.session.remove()
+        db.drop_all()
+        self.app_context.pop()
 
     def test_xnf_filter_true(self):
-        self.assertTrue(self.xnf_filter.is_xnf_in_filter('pnf1'))
+        self.assertTrue(self.xnf_filter.is_nf_in_filter('pnf1'))
 
     def test_xnf_filter_false(self):
-        self.assertFalse(self.xnf_filter.is_xnf_in_filter('PNF-33'))
+        self.assertFalse(self.xnf_filter.is_nf_in_filter('PNF-33'))
 
     def test_sub_measurement_group(self):
-        self.assertEqual(len(self.sub.measurementGroups), 2)
+        self.assertEqual(len(self.sub_1.measurementGroups), 2)
 
     def test_sub_file_location(self):
-        self.assertEqual(self.sub.fileLocation, '/pm/pm.xml')
+        self.assertEqual(self.sub_1.fileLocation, '/pm/pm.xml')
+
+    def test_get_subscription(self):
+        sub_name = 'ExtraPM-All-gNB-R2B'
+        self.sub_1.create()
+        new_sub = Subscription.get(sub_name)
+        self.assertEqual(sub_name, new_sub.subscription_name)
+
+    def test_get_subscription_no_match(self):
+        sub_name = 'sub2_does_not_exist'
+        sub = Subscription.get(sub_name)
+        self.assertEqual(sub, None)
+
+    def test_get_subscriptions(self):
+        self.sub_1.create()
+        self.sub_2.create()
+        subs = self.sub_1.get_all()
+
+        self.assertEqual(2, len(subs))
+
+    def test_create_existing_subscription(self):
+        sub1 = self.sub_1.create()
+        same_sub1 = self.sub_1.create()
+        self.assertEqual(sub1, same_sub1)
+        self.assertEqual(1, len(self.sub_1.get_all()))
+
+    def test_get_nfs_per_subscription(self):
+        nf_array = [self.nf_1, self.nf_2]
+        self.sub_1.add_network_functions_to_subscription(nf_array)
+        nfs_for_sub_1 = Subscription.get_all_nfs_subscription_relations()
+        self.assertEqual(2, len(nfs_for_sub_1))
+
+    def test_add_network_functions_per_subscription(self):
+        nf_array = [self.nf_1, self.nf_2]
+        self.sub_1.add_network_functions_to_subscription(nf_array)
+        nfs_for_sub_1 = Subscription.get_all_nfs_subscription_relations()
+        self.assertEqual(2, len(nfs_for_sub_1))
+        new_nf_array = [NetworkFunction(nf_name='vnf_3', orchestration_status='Inventoried')]
+        self.sub_1.add_network_functions_to_subscription(new_nf_array)
+        nf_subs = Subscription.get_all_nfs_subscription_relations()
+        print(nf_subs)
+        self.assertEqual(3, len(nf_subs))
+
+    def test_add_duplicate_network_functions_per_subscription(self):
+        nf_array = [self.nf_1]
+        self.sub_1.add_network_functions_to_subscription(nf_array)
+        nf_subs = Subscription.get_all_nfs_subscription_relations()
+        self.assertEqual(1, len(nf_subs))
+        self.sub_1.add_network_functions_to_subscription(nf_array)
+        nf_subs = Subscription.get_all_nfs_subscription_relations()
+        self.assertEqual(1, len(nf_subs))