# -*- coding: utf-8 -*-
##
-# Copyright 2016-2017 VMware Inc.
+# Copyright 2016-2019 VMware Inc.
# This file is part of ETSI OSM
# All Rights Reserved.
#
# 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 = '30.0'
+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
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