commit a27dc53c6acd967ea17f0d720a82b23a8404cbfa
author Luis Vega <lvega@whitestack.com> Fri Nov 11 20:10:49 2022 +0000
committer Gabriel Cuba <gcuba@whitestack.com> Thu Nov 24 23:11:48 2022 -0500
tree ea62a3204a15bdd03d6deb78838ef8ebfe45f843
parent 1dda84cafdeeb4a6affb443e65102a0c8149ec5c

Feature 10929: LCM saga, Milestone 1.
Move configurations to ConfigMan class, using our own class (OsmConfigman).

Change-Id: Ia8f4e435d20ac88540aec071ca5cab9e70f112a6
Signed-off-by: Luis Vega <lvega@whitestack.com>

osm_lcm/tests/test_ns.py

diff --git a/osm_lcm/tests/test_ns.py b/osm_lcm/tests/test_ns.py
index 56d7ffa..1082648 100644
--- a/osm_lcm/tests/test_ns.py
+++ b/osm_lcm/tests/test_ns.py
@@ -24,6 +24,8 @@
 from os import getenv
 from osm_lcm import ns
 from osm_common.msgkafka import MsgKafka
+
+from osm_lcm.data_utils.lcm_config import LcmCfg
 from osm_lcm.lcm_utils import TaskRegistry
 from osm_lcm.ng_ro import NgRoClient
 from osm_lcm.data_utils.database.database import Database
@@ -54,7 +56,7 @@
     OSMLCM_RO_XXX: configuration of RO
 """
 
-lcm_config = {
+lcm_config_dict = {
     "global": {"loglevel": "DEBUG"},
     "timeout": {},
     "VCA": {  # TODO replace with os.get_env to get other configurations
@@ -66,7 +68,7 @@
         "ca_cert": getenv("OSMLCM_VCA_CACERT", None),
         "apiproxy": getenv("OSMLCM_VCA_APIPROXY", "192.168.1.1"),
     },
-    "ro_config": {
+    "RO": {
         "uri": "http://{}:{}/openmano".format(
             getenv("OSMLCM_RO_HOST", "ro"), getenv("OSMLCM_RO_PORT", "9090")
         ),
@@ -76,6 +78,11 @@
         "ng": True,
     },
 }
+
+lcm_config = LcmCfg()
+lcm_config.set_from_dict(lcm_config_dict)
+lcm_config.transform()
+
 nsr_id = descriptors.test_ids["TEST-A"]["ns"]
 nslcmop_id = descriptors.test_ids["TEST-A"]["update"]
 vnfr_id = "6421c7c9-d865-4fb4-9a13-d4275d243e01"
@@ -295,7 +302,7 @@
         # Mock RO
         if not getenv("OSMLCMTEST_RO_NOMOCK"):
             self.my_ns.RO = asynctest.Mock(
-                NgRoClient(self.loop, **lcm_config["ro_config"])
+                NgRoClient(self.loop, **lcm_config.RO.to_dict())
             )
             # TODO first time should be empty list, following should return a dict
             # self.my_ns.RO.get_list = asynctest.CoroutineMock(self.my_ns.RO.get_list, return_value=[])