From 64f4a1cdc0b138f98cbdcff531699c314c40c671 Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Sun, 7 Jul 2019 08:47:39 +0300 Subject: [PATCH] Update NSX ver 3.0 features NSX 2.6 is irrelevant, and partial updates are still not supported Change-Id: I043936a6ae32d4f55f21717fb25e6d7ab4413c47 --- vmware_nsxlib/v3/nsx_constants.py | 1 - vmware_nsxlib/v3/policy/__init__.py | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vmware_nsxlib/v3/nsx_constants.py b/vmware_nsxlib/v3/nsx_constants.py index 238d3b08..b2dfe0f3 100644 --- a/vmware_nsxlib/v3/nsx_constants.py +++ b/vmware_nsxlib/v3/nsx_constants.py @@ -146,7 +146,6 @@ NSX_VERSION_2_2_0 = '2.2.0' NSX_VERSION_2_3_0 = '2.3.0' NSX_VERSION_2_4_0 = '2.4.0' NSX_VERSION_2_5_0 = '2.5.0' -NSX_VERSION_2_6_0 = '2.6.0' NSX_VERSION_3_0_0 = '3.0.0' # Features available depending on the NSX Manager backend version diff --git a/vmware_nsxlib/v3/policy/__init__.py b/vmware_nsxlib/v3/policy/__init__.py index 10f0fbdf..2685fd93 100644 --- a/vmware_nsxlib/v3/policy/__init__.py +++ b/vmware_nsxlib/v3/policy/__init__.py @@ -158,10 +158,11 @@ class NsxPolicyLib(lib.NsxLibBase): if (feature == nsx_constants.FEATURE_ENS_WITH_QOS): return True - if (version.LooseVersion(self.get_version()) >= - version.LooseVersion(nsx_constants.NSX_VERSION_2_6_0)): - if feature == nsx_constants.FEATURE_PARTIAL_UPDATES: - return True + # TODO(asarfaty): Uncomment this once partial updates are supported + # if (version.LooseVersion(self.get_version()) >= + # version.LooseVersion(nsx_constants.NSX_VERSION_3_0_0)): + # if feature == nsx_constants.FEATURE_PARTIAL_UPDATES: + # return True return (feature == nsx_constants.FEATURE_NSX_POLICY)