X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Finfra_collectors%2Fbase_osinfra.py;h=1c1999c8aef1de2269658c0ee87cd1c1259e52f0;hb=4b9f79e2820a011f6ebbba7fb92cdc120b364650;hp=b603d0338722a7141900b8078d69728f7afe15a3;hpb=8283936d7cecd8941116409edbfaceeba6570acb;p=osm%2FMON.git

diff --git a/osm_mon/collector/infra_collectors/base_osinfra.py b/osm_mon/collector/infra_collectors/base_osinfra.py
index b603d03..1c1999c 100644
--- a/osm_mon/collector/infra_collectors/base_osinfra.py
+++ b/osm_mon/collector/infra_collectors/base_osinfra.py
@@ -24,7 +24,6 @@ from typing import List
 
 from keystoneclient.v3 import client as keystone_client
 from novaclient import client as nova_client
-from novaclient import v2 as nova_client_v2
 
 from osm_mon.collector.infra_collectors.base_vim import BaseVimInfraCollector
 from osm_mon.collector.metric import Metric
@@ -38,31 +37,47 @@ log = logging.getLogger(__name__)
 class BaseOpenStackInfraCollector(BaseVimInfraCollector):
     def __init__(self, config: Config, vim_account_id: str):
         super().__init__(config, vim_account_id)
-        self.keystone = self._build_keystone_client(vim_account_id)
-        self.nova = self._build_nova_client(vim_account_id)
-        self.vim_account_id = vim_account_id
+        self.conf = config
         self.common_db = CommonDbClient(config)
+        self.vim_account = self.common_db.get_vim_account(vim_account_id)
+        self.keystone = self._build_keystone_client(self.vim_account)
+        self.nova = self._build_nova_client(self.vim_account)
 
     def collect(self) -> List[Metric]:
         metrics = []
         vim_status = self.is_vim_ok()
-        vim_status_metric = Metric({'vim_account_id': self.vim_account_id}, 'vim_status', vim_status)
+        if self.vim_account['_admin']['projects_read']:
+            vim_project_id = self.vim_account['_admin']['projects_read'][0]
+        else:
+            vim_project_id = ''
+        vim_tags = {
+            'vim_account_id': self.vim_account['_id'],
+            'project_id': vim_project_id
+        }
+        vim_status_metric = Metric(vim_tags, 'vim_status', vim_status)
         metrics.append(vim_status_metric)
-        vnfrs = self.common_db.get_vnfrs(vim_account_id=self.vim_account_id)
+        vnfrs = self.common_db.get_vnfrs(vim_account_id=self.vim_account['_id'])
         for vnfr in vnfrs:
             nsr_id = vnfr['nsr-id-ref']
+            ns_name = self.common_db.get_nsr(nsr_id)['name']
             vnf_member_index = vnfr['member-vnf-index-ref']
+            if vnfr['_admin']['projects_read']:
+                vnfr_project_id = vnfr['_admin']['projects_read'][0]
+            else:
+                vnfr_project_id = ''
             for vdur in vnfr['vdur']:
                 if 'vim-id' not in vdur:
                     log.debug("Field vim-id is not present in vdur")
                     continue
                 resource_uuid = vdur['vim-id']
                 tags = {
-                    'vim_account_id': self.vim_account_id,
+                    'vim_account_id': self.vim_account['_id'],
                     'resource_uuid': resource_uuid,
                     'nsr_id': nsr_id,
+                    'ns_name': ns_name,
                     'vnf_member_index': vnf_member_index,
-                    'vdur_name': vdur['name']
+                    'vdur_name': vdur.get("name", ""),
+                    'project_id': vnfr_project_id
                 }
                 try:
                     vm = self.nova.servers.get(resource_uuid)
@@ -83,10 +98,10 @@ class BaseOpenStackInfraCollector(BaseVimInfraCollector):
             log.warning("VIM status is not OK: %s" % e)
             return False
 
-    def _build_keystone_client(self, vim_account_id) -> keystone_client.Client:
-        sess = OpenstackUtils.get_session(vim_account_id)
-        return keystone_client.Client(session=sess)
+    def _build_keystone_client(self, vim_account: dict) -> keystone_client.Client:
+        sess = OpenstackUtils.get_session(vim_account)
+        return keystone_client.Client(session=sess, timeout=10)
 
-    def _build_nova_client(self, vim_account_id) -> nova_client_v2.Client:
-        sess = OpenstackUtils.get_session(vim_account_id)
-        return nova_client.Client("2", session=sess)
+    def _build_nova_client(self, vim_account: dict) -> nova_client.Client:
+        sess = OpenstackUtils.get_session(vim_account)
+        return nova_client.Client("2", session=sess, timeout=10)