X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Finfra_collectors%2Fbase_osinfra.py;h=1b5531d38d7de98aff61e6aeec0d13f9d5dbf11a;hb=refs%2Fchanges%2F56%2F11956%2F3;hp=61e9e4277323ea73645ebcb2d694dfebc1101ca2;hpb=8e4179facf22c8096992f0a83caeec9f2f4996c7;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 61e9e42..1b5531d 100644 --- a/osm_mon/collector/infra_collectors/base_osinfra.py +++ b/osm_mon/collector/infra_collectors/base_osinfra.py @@ -24,6 +24,8 @@ from typing import List from keystoneclient.v3 import client as keystone_client from novaclient import client as nova_client +from cinderclient import client as cinder_client +from neutronclient.neutron import client as neutron_client from osm_mon.collector.infra_collectors.base_vim import BaseVimInfraCollector from osm_mon.collector.metric import Metric @@ -40,12 +42,18 @@ class BaseOpenStackInfraCollector(BaseVimInfraCollector): 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.keystone = self._build_keystone_client(self.vim_account) + self.vim_session = None self.nova = self._build_nova_client(self.vim_account) + self.cinder = self._build_cinder_client(self.vim_account) + self.neutron, self.tenant_id = self._build_neutron_client(self.vim_account) def collect(self) -> List[Metric]: metrics = [] vim_status = self.is_vim_ok() + if vim_status: + # Updating the resources in mongoDB + self.update_resources() if self.vim_account["_admin"]["projects_read"]: vim_project_id = self.vim_account["_admin"]["projects_read"][0] else: @@ -73,15 +81,15 @@ class BaseOpenStackInfraCollector(BaseVimInfraCollector): tags = { "vim_account_id": self.vim_account["_id"], "resource_uuid": resource_uuid, - "nsr_id": nsr_id, + "ns_id": nsr_id, "ns_name": ns_name, "vnf_member_index": vnf_member_index, - "vdur_name": vdur.get("name", ""), + "vdu_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 = (0 if (vm.status == 'ERROR') else 1) vm_status_metric = Metric(tags, "vm_status", vm_status) except Exception as e: log.warning("VM status is not OK: %s" % e) @@ -98,10 +106,86 @@ class BaseOpenStackInfraCollector(BaseVimInfraCollector): log.warning("VIM status is not OK: %s" % e) return False + def update_resources(self): + if "resources" in self.vim_account: + vimacc_resources = self.vim_account["resources"] + # Compute resources + try: + com_lim = self.nova.limits.get()._info['absolute'] + if ("compute" in vimacc_resources) \ + and ((vimacc_resources["compute"]["ram"]["total"] != com_lim['maxTotalRAMSize']) + or (vimacc_resources["compute"]["vcpus"]["total"] != com_lim['maxTotalCores']) + or (vimacc_resources["compute"]["ram"]["used"] != com_lim['totalRAMUsed']) + or (vimacc_resources["compute"]["vcpus"]["used"] != com_lim['totalCoresUsed']) + or (vimacc_resources["compute"]["instances"]["total"] != com_lim['maxTotalInstances']) + or (vimacc_resources["compute"]["instances"]["used"] != com_lim['totalInstancesUsed'])): + update_dict = {"resources.compute": {"ram": {"total": com_lim['maxTotalRAMSize'], + "used": com_lim['totalRAMUsed']}, + "vcpus": {"total": com_lim['maxTotalCores'], + "used": com_lim['totalCoresUsed']}, + "instances": {"total": com_lim['maxTotalInstances'], + "used": com_lim['totalInstancesUsed']}}} + suc_value = self.common_db.set_vim_account(str(self.vim_account['_id']), update_dict) + log.info("Compute resources update in mongoDB = %s" % suc_value) + except Exception as e: + log.warning("Error in updating compute resources: %s" % e) + + # Volume resources + try: + vol_lim = self.cinder.limits.get()._info['absolute'] + if ("storage" in vimacc_resources) and\ + ((vimacc_resources["storage"]["volumes"]["total"] != vol_lim['maxTotalVolumes']) + or (vimacc_resources["storage"]["snapshots"]["total"] != vol_lim['maxTotalSnapshots']) + or (vimacc_resources["storage"]["volumes"]["used"] != vol_lim['totalVolumesUsed']) + or (vimacc_resources["storage"]["snapshots"]["used"] != vol_lim['totalSnapshotsUsed']) + or (vimacc_resources["storage"]["storage"]["total"] != vol_lim['maxTotalVolumeGigabytes']) + or (vimacc_resources["storage"]["storage"]["used"] != vol_lim['totalGigabytesUsed'])): + update_dict = {"resources.storage": {"volumes": {"total": vol_lim['maxTotalVolumes'], + "used": vol_lim['totalVolumesUsed']}, + "snapshots": {"total": vol_lim['maxTotalSnapshots'], + "used": vol_lim['totalSnapshotsUsed']}, + "storage": {"total": vol_lim['maxTotalVolumeGigabytes'], + "used": vol_lim['totalGigabytesUsed']}}} + suc_value = self.common_db.set_vim_account(str(self.vim_account['_id']), update_dict) + log.info("Volume resources update in mongoDB = %s" % suc_value) + except Exception as e: + log.warning("Error in updating volume resources: %s" % e) + + # Network resources + try: + net_lim = self.neutron.show_quota_details(self.tenant_id)["quota"] + if ("network" in vimacc_resources) and\ + ((vimacc_resources["network"]["networks"]["total"] != net_lim["network"]["limit"]) + or (vimacc_resources["network"]["networks"]["used"] != net_lim['network']['used']) + or (vimacc_resources["network"]["subnets"]["total"] != net_lim['subnet']['limit']) + or (vimacc_resources["network"]["subnets"]["used"] != net_lim['subnet']['used']) + or (vimacc_resources["network"]["floating_ips"]["total"] != net_lim['floatingip']['limit']) + or (vimacc_resources["network"]["floating_ips"]["used"] != net_lim['floatingip']['used'])): + update_dict = {"resources.network": {"networks": {"total": net_lim['network']['limit'], + "used": net_lim['network']['used']}, + "subnets": {"total": net_lim['subnet']['limit'], + "used": net_lim['subnet']['used']}, + "floating_ips": {"total": net_lim['floatingip']['limit'], + "used": net_lim['floatingip']['used']}}} + suc_value = self.common_db.set_vim_account(str(self.vim_account['_id']), update_dict) + log.info("Network resources update in mongoDB = %s" % suc_value) + except Exception as e: + log.warning("Error in updating network resources: %s" % e) + 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: dict) -> nova_client.Client: sess = OpenstackUtils.get_session(vim_account) + self.vim_session = sess return nova_client.Client("2", session=sess, timeout=10) + + def _build_cinder_client(self, vim_account: dict) -> cinder_client.Client: + # sess = OpenstackUtils.get_session(vim_account) + return cinder_client.Client("3", session=self.vim_session, timeout=10) + + def _build_neutron_client(self, vim_account: dict) -> tuple: + # sess = OpenstackUtils.get_session(vim_account) + tenant_id = self.vim_session.get_project_id() + return neutron_client.Client("2", session=self.vim_session, timeout=10), tenant_id