X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Finfra_collectors%2Fvmware.py;h=43be2b280252a0cb91ca688db8781121435e14a1;hb=645de19eb4cc2b4c9f315af8e3331abfb953bb4d;hp=00f9bf7e026d7cac534938e42448566ec20e9b8b;hpb=14076751bae9f0450650ef54f671ed9aa39a3327;p=osm%2FMON.git diff --git a/osm_mon/collector/infra_collectors/vmware.py b/osm_mon/collector/infra_collectors/vmware.py index 00f9bf7..43be2b2 100644 --- a/osm_mon/collector/infra_collectors/vmware.py +++ b/osm_mon/collector/infra_collectors/vmware.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2016-2017 VMware Inc. +# Copyright 2016-2019 VMware Inc. # This file is part of ETSI OSM # All Rights Reserved. # @@ -21,26 +21,27 @@ # contact: osslegalrouting@vmware.com ## +import json import logging from typing import List - from xml.etree import ElementTree as XmlElementTree + +import requests from pyvcloud.vcd.client import BasicLoginCredentials from pyvcloud.vcd.client import Client -from osm_mon.collector.utils import CollectorUtils from osm_mon.collector.infra_collectors.base_vim import BaseVimInfraCollector from osm_mon.collector.metric import Metric +from osm_mon.collector.utils.collector import CollectorUtils from osm_mon.core.common_db import CommonDbClient from osm_mon.core.config import Config -import requests -import json log = logging.getLogger(__name__) API_VERSION = '27.0' class VMwareInfraCollector(BaseVimInfraCollector): + def __init__(self, config: Config, vim_account_id: str): super().__init__(config, vim_account_id) self.vim_account_id = vim_account_id @@ -70,6 +71,7 @@ class VMwareInfraCollector(BaseVimInfraCollector): admin_passwd = self.admin_password org = 'System' client = Client(host, verify_ssl_certs=False) + client.set_highest_supported_version() client.set_credentials(BasicLoginCredentials(admin_user, org, admin_passwd)) return client