From: kasar Date: Thu, 9 May 2019 07:55:30 +0000 (-0700) Subject: Added vio infra collector plugin X-Git-Tag: v6.0.0~7^2 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=e82c062416d75b96cb6981423e1e900f7496653c;p=osm%2FMON.git Added vio infra collector plugin Change-Id: I709b2b358cb6aae1d07e01ba9a010cf8592ee735 Signed-off-by: kasar --- diff --git a/osm_mon/collector/infra_collectors/base_osinfra.py b/osm_mon/collector/infra_collectors/base_osinfra.py new file mode 100644 index 0000000..278cc20 --- /dev/null +++ b/osm_mon/collector/infra_collectors/base_osinfra.py @@ -0,0 +1,102 @@ +# Copyright 2018 Whitestack, LLC +# ************************************************************* + +# This file is part of OSM Monitoring module +# All Rights Reserved to Whitestack, LLC + +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +# For those usages not covered by the Apache License, Version 2.0 please +# contact: bdiaz@whitestack.com or glavado@whitestack.com +## +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.core.common_db import CommonDbClient +from osm_mon.core.config import Config + +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.common_db = CommonDbClient(config) + + 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) + metrics.append(vim_status_metric) + 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'] + 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'] + } + 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) + metrics.append(vm_status_metric) + + return metrics + + def is_vim_ok(self) -> bool: + try: + self.keystone.projects.list() + return True + except Exception: + log.exception("VIM status is not OK!") + 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_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) diff --git a/osm_mon/collector/infra_collectors/openstack.py b/osm_mon/collector/infra_collectors/openstack.py index 6086dd3..8801757 100644 --- a/osm_mon/collector/infra_collectors/openstack.py +++ b/osm_mon/collector/infra_collectors/openstack.py @@ -19,84 +19,12 @@ # For those usages not covered by the Apache License, Version 2.0 please # contact: bdiaz@whitestack.com or glavado@whitestack.com ## -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_osinfra import BaseOpenStackInfraCollector -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.core.common_db import CommonDbClient from osm_mon.core.config import Config -log = logging.getLogger(__name__) - -class OpenstackInfraCollector(BaseVimInfraCollector): +class OpenstackInfraCollector(BaseOpenStackInfraCollector): 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.common_db = CommonDbClient(config) - - 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) - metrics.append(vim_status_metric) - 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'] - 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'] - } - 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) - metrics.append(vm_status_metric) - - return metrics - - def is_vim_ok(self) -> bool: - try: - self.keystone.projects.list() - return True - except Exception: - log.exception("VIM status is not OK!") - 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_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) + pass diff --git a/osm_mon/collector/infra_collectors/vio.py b/osm_mon/collector/infra_collectors/vio.py new file mode 100644 index 0000000..781b402 --- /dev/null +++ b/osm_mon/collector/infra_collectors/vio.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- + +## +# Copyright 2016-2017 VMware Inc. +# This file is part of ETSI OSM +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# For those usages not covered by the Apache License, Version 2.0 please +# contact: osslegalrouting@vmware.com +## + +from osm_mon.collector.infra_collectors.base_osinfra import BaseOpenStackInfraCollector + +from osm_mon.core.config import Config + + +class VIOInfraCollector(BaseOpenStackInfraCollector): + def __init__(self, config: Config, vim_account_id: str): + pass diff --git a/osm_mon/collector/service.py b/osm_mon/collector/service.py index 12814bf..98f3f16 100644 --- a/osm_mon/collector/service.py +++ b/osm_mon/collector/service.py @@ -5,6 +5,7 @@ from typing import List from osm_mon.collector.infra_collectors.onos import OnosInfraCollector from osm_mon.collector.infra_collectors.openstack import OpenstackInfraCollector from osm_mon.collector.infra_collectors.vmware import VMwareInfraCollector +from osm_mon.collector.infra_collectors.vio import VIOInfraCollector from osm_mon.collector.metric import Metric from osm_mon.collector.utils import CollectorUtils from osm_mon.collector.vnf_collectors.juju import VCACollector @@ -23,7 +24,8 @@ VIM_COLLECTORS = { } VIM_INFRA_COLLECTORS = { "openstack": OpenstackInfraCollector, - "vmware": VMwareInfraCollector + "vmware": VMwareInfraCollector, + "vio": VIOInfraCollector } SDN_INFRA_COLLECTORS = { "onos": OnosInfraCollector