From c9debca32d33559e3b4db9c7318f67bb0d6826db Mon Sep 17 00:00:00 2001 From: beierl Date: Tue, 18 Jun 2019 21:17:08 -0400 Subject: [PATCH] Negotiate vCD Version Request highest supported vCD version between MON and vCD on setup and then continue to use v27.0 as the confirmed tested version. BUG 775 Change-Id: I04333fa0c915107fb432d799d3440fec711d95ec Signed-off-by: beierl (cherry picked from commit 7f8f893631706371a5e073a57b23866cfae712cb) --- osm_mon/collector/infra_collectors/vmware.py | 4 +++- osm_mon/collector/vnf_collectors/vmware.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/osm_mon/collector/infra_collectors/vmware.py b/osm_mon/collector/infra_collectors/vmware.py index 00f9bf7..206083a 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. # @@ -41,6 +41,7 @@ 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 diff --git a/osm_mon/collector/vnf_collectors/vmware.py b/osm_mon/collector/vnf_collectors/vmware.py index 9322408..438c40c 100644 --- a/osm_mon/collector/vnf_collectors/vmware.py +++ b/osm_mon/collector/vnf_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. # @@ -94,6 +94,7 @@ class VMwareCollector(BaseVimCollector): 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 -- 2.25.1