X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fvnf_collectors%2Fjuju.py;h=7e639b5f1429ceb8e2e745304613c775ffb24add;hb=a2eeb474200b8f9ebcaee6fa68fe52b6e1a5e337;hp=ba17d6594bd17b90b76dc9b33a15d758b74315af;hpb=6a39cb03b404dfcd24cd26e45d741266db1df9bf;p=osm%2FMON.git

diff --git a/osm_mon/collector/vnf_collectors/juju.py b/osm_mon/collector/vnf_collectors/juju.py
index ba17d65..7e639b5 100644
--- a/osm_mon/collector/vnf_collectors/juju.py
+++ b/osm_mon/collector/vnf_collectors/juju.py
@@ -40,8 +40,8 @@ class VCACollector(BaseCollector):
         super().__init__(config)
         self.common_db = CommonDbClient(config)
         self.loop = asyncio.get_event_loop()
-        host = config.get("vca", "host")
-        port = config.get("vca", "port") if "port" in config.conf["vca"] else 17070
+        # host = config.get("vca", "host")
+        # port = config.get("vca", "port") if "port" in config.conf["vca"] else 17070
 
         # Backwards compatibility
         if "cacert" in config.conf["vca"]:
@@ -61,9 +61,6 @@ class VCACollector(BaseCollector):
             fs=object(),
             log=log,
             loop=self.loop,
-            url="{}:{}".format(host, port),
-            username=config.get("vca", "user"),
-            vca_config=config.conf["vca"],
             on_update_db=None,
         )
 
@@ -99,7 +96,9 @@ class VCACollector(BaseCollector):
                     continue
                 measures = self.loop.run_until_complete(
                     self.n2vc.get_metrics(
-                        vca_deployment_info["model"], vca_deployment_info["application"]
+                        vca_deployment_info["model"],
+                        vca_deployment_info["application"],
+                        vca_id=vnfr.get("vca-id"),
                     )
                 )
                 log.debug("Measures: %s", measures)
@@ -125,7 +124,9 @@ class VCACollector(BaseCollector):
                 return metrics
             measures = self.loop.run_until_complete(
                 self.n2vc.get_metrics(
-                    vca_deployment_info["model"], vca_deployment_info["application"]
+                    vca_deployment_info["model"],
+                    vca_deployment_info["application"],
+                    vca_id=vnfr.get("vca-id"),
                 )
             )
             # Search for Mgmt VDU name, needed to query Prometheus based on alarm tags