From: lavado <glavado@whitestack.com>
Date: Fri, 6 Dec 2019 03:22:26 +0000 (-0500)
Subject: Partial fix for bug 936 (MON Part)
X-Git-Tag: v7.0.0rc1~4
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=de385946786d7c0631f8a9c6cd45e9254645cae8;p=osm%2FMON.git

Partial fix for bug 936 (MON Part)

Change-Id: Ia574c865aa4d68d1e5bf4778762d96590e9bc907
Signed-off-by: lavado <glavado@whitestack.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 27cb519..2b450f2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -49,6 +49,7 @@ ENV OSMMON_GLOBAL_LOGLEVEL INFO
 ENV OSMMON_VCA_HOST localhost
 ENV OSMMON_VCA_SECRET secret
 ENV OSMMON_VCA_USER admin
+ENV OSMMON_VCA_CACERT cacert
 ENV OSMMON_DATABASE_COMMONKEY changeme
 ENV OSMMON_COLLECTOR_INTERVAL 30
 ENV OSMMON_EVALUATOR_INTERVAL 30
diff --git a/osm_mon/collector/vnf_collectors/juju.py b/osm_mon/collector/vnf_collectors/juju.py
index a73f1bb..ce6f777 100644
--- a/osm_mon/collector/vnf_collectors/juju.py
+++ b/osm_mon/collector/vnf_collectors/juju.py
@@ -40,8 +40,10 @@ class VCACollector(BaseCollector):
         super().__init__(config)
         self.common_db = CommonDbClient(config)
         self.loop = asyncio.get_event_loop()
-        self.n2vc = N2VC(server=config.get('vca', 'host'), user=config.get('vca', 'user'),
-                         secret=config.get('vca', 'secret'))
+        self.n2vc = N2VC(server=config.get('vca', 'host'),
+                         user=config.get('vca', 'user'),
+                         secret=config.get('vca', 'secret'),
+                         ca_cert=config.get('vca', 'cacert'))
 
     def collect(self, vnfr: dict) -> List[Metric]:
         nsr_id = vnfr['nsr-id-ref']
diff --git a/osm_mon/core/mon.yaml b/osm_mon/core/mon.yaml
index ef31ebc..c7b08f5 100644
--- a/osm_mon/core/mon.yaml
+++ b/osm_mon/core/mon.yaml
@@ -60,3 +60,4 @@ vca:
   host: localhost
   secret: secret
   user: admin
+  cacert: cacert