X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fvnf_collectors%2Fjuju.py;h=ce6f77794f1405d697c1f0f00aac2148b28cba44;hb=de385946786d7c0631f8a9c6cd45e9254645cae8;hp=8be9e286574d75d70a422efa0b204ee4f877f9bf;hpb=a69f2725ddb055a25570deb1f2a14d28ff38314e;p=osm%2FMON.git diff --git a/osm_mon/collector/vnf_collectors/juju.py b/osm_mon/collector/vnf_collectors/juju.py index 8be9e28..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'] @@ -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']: