Partial fix for bug 936 (MON Part)

[osm/MON.git] / osm_mon / collector / vnf_collectors / juju.py

diff --git a/osm_mon/collector/vnf_collectors/juju.py b/osm_mon/collector/vnf_collectors/juju.py
index 8be9e28..ce6f777 100644 (file)
--- 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']
@@ -51,7 +53,10 @@ class VCACollector(BaseCollector):
         # Populate extra tags for metrics
         tags = {}
         tags['ns_name'] = self.common_db.get_nsr(nsr_id)['name']
-        tags['project_id'] = vnfr['_admin']['projects_read'][0]
+        if vnfr['_admin']['projects_read']:
+            tags['project_id'] = vnfr['_admin']['projects_read'][0]
+        else:
+            tags['project_id'] = None
 
         metrics = []
         for vdur in vnfr['vdur']: