X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Finfra_collectors%2Fbase_osinfra.py;h=61e9e4277323ea73645ebcb2d694dfebc1101ca2;hb=refs%2Fchanges%2F03%2F10803%2F1;hp=afbf2455b73aee5b3cfa8a694eaad13655a48bbe;hpb=5959c93436ec38c1fb513adfbccaf0c9ede542c1;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 afbf245..61e9e42 100644 --- a/osm_mon/collector/infra_collectors/base_osinfra.py +++ b/osm_mon/collector/infra_collectors/base_osinfra.py @@ -22,15 +22,12 @@ import logging from typing import List -from keystoneauth1 import session -from keystoneauth1.identity import v3 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 -from osm_mon.collector.utils import CollectorUtils +from osm_mon.collector.utils.openstack import OpenstackUtils from osm_mon.core.common_db import CommonDbClient from osm_mon.core.config import Config @@ -40,36 +37,55 @@ 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'] - vnf_member_index = vnfr['member-vnf-index-ref'] - for vdur in vnfr['vdur']: - resource_uuid = vdur['vim-id'] + 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, - 'resource_uuid': resource_uuid, - 'nsr_id': nsr_id, - 'vnf_member_index': vnf_member_index, - 'vdur_name': vdur['name'] + "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.get("name", ""), + "project_id": vnfr_project_id, } try: vm = self.nova.servers.get(resource_uuid) - vm_status = (1 if vm.status == 'ACTIVE' else 0) - vm_status_metric = Metric(tags, 'vm_status', vm_status) - except Exception: - log.exception("VM status is not OK!") - vm_status_metric = Metric(tags, 'vm_status', 0) + vm_status = 1 if vm.status == "ACTIVE" else 0 + vm_status_metric = Metric(tags, "vm_status", vm_status) + except Exception as e: + log.warning("VM status is not OK: %s" % e) + vm_status_metric = Metric(tags, "vm_status", 0) metrics.append(vm_status_metric) return metrics @@ -78,25 +94,14 @@ class BaseOpenStackInfraCollector(BaseVimInfraCollector): try: self.nova.servers.list() return True - except Exception: - log.exception("VIM status is not OK!") + except Exception as e: + log.warning("VIM status is not OK: %s" % e) return False - def _build_keystone_client(self, vim_account_id) -> keystone_client.Client: - sess = self._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 = self._get_session(vim_account_id) - return nova_client.Client("2", session=sess) - - def _get_session(self, vim_account_id: str): - creds = CollectorUtils.get_credentials(vim_account_id) - verify_ssl = CollectorUtils.is_verify_ssl(creds) - auth = v3.Password(auth_url=creds.url, - username=creds.user, - password=creds.password, - project_name=creds.tenant_name, - project_domain_id='default', - user_domain_id='default') - return session.Session(auth=auth, verify=verify_ssl) + 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)