From 81b37943af417ecafe8ed068afc99318064845c9 Mon Sep 17 00:00:00 2001
From: Shawn Wang <wshaoquan@vmware.com>
Date: Wed, 20 Nov 2019 15:29:36 -0800
Subject: [PATCH] Update supported NSX version for relax_scale_validation

Support for relax_scale_validation for LBS is postponed to NSX 3.0.0.
Updated related version check for MP and Policy in nsxlib. Previous unit
test is still working after this change. Thus no additional UT added.

Change-Id: I26ce4b1af9e9b6c19a3245675a3db2c027361acb
---
 vmware_nsxlib/v3/__init__.py        | 4 ----
 vmware_nsxlib/v3/nsx_constants.py   | 1 -
 vmware_nsxlib/v3/policy/__init__.py | 8 ++------
 vmware_nsxlib/v3/policy/lb_defs.py  | 4 ++--
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/vmware_nsxlib/v3/__init__.py b/vmware_nsxlib/v3/__init__.py
index d646e193..5427d351 100644
--- a/vmware_nsxlib/v3/__init__.py
+++ b/vmware_nsxlib/v3/__init__.py
@@ -172,10 +172,6 @@ class NsxLib(lib.NsxLibBase):
             # features available since 3.0.0
             if (feature == nsx_constants.FEATURE_GET_TZ_FROM_SWITCH):
                 return True
-
-        if (version.LooseVersion(self.get_version()) >=
-            version.LooseVersion(nsx_constants.NSX_VERSION_2_5_1)):
-            # features available since 2.5.1
             if (feature == nsx_constants.FEATURE_RELAX_SCALE_VALIDATION):
                 return True
 
diff --git a/vmware_nsxlib/v3/nsx_constants.py b/vmware_nsxlib/v3/nsx_constants.py
index 43911d1e..601874a4 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_5_1 = '2.5.1'
 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 a24f684a..b5f87301 100644
--- a/vmware_nsxlib/v3/policy/__init__.py
+++ b/vmware_nsxlib/v3/policy/__init__.py
@@ -167,12 +167,6 @@ 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_5_1)):
-            # features available since 2.5.1
-            if (feature == nsx_constants.FEATURE_RELAX_SCALE_VALIDATION):
-                return True
-
         if (version.LooseVersion(self.get_version()) >=
             version.LooseVersion(nsx_constants.NSX_VERSION_3_0_0)):
             # features available since 3.0.0
@@ -188,6 +182,8 @@ class NsxPolicyLib(lib.NsxLibBase):
                 return True
             if feature == nsx_constants.FEATURE_NSX_POLICY_ADMIN_STATE:
                 return True
+            if (feature == nsx_constants.FEATURE_RELAX_SCALE_VALIDATION):
+                return True
 
         return (feature == nsx_constants.FEATURE_NSX_POLICY)
 
diff --git a/vmware_nsxlib/v3/policy/lb_defs.py b/vmware_nsxlib/v3/policy/lb_defs.py
index 32700c93..9eacb132 100644
--- a/vmware_nsxlib/v3/policy/lb_defs.py
+++ b/vmware_nsxlib/v3/policy/lb_defs.py
@@ -390,7 +390,7 @@ class LBServiceDef(ResourceDef):
 
     def _version_dependant_attr_supported(self, attr):
         if (version.LooseVersion(self.nsx_version) >=
-            version.LooseVersion(nsx_constants.NSX_VERSION_2_5_1)):
+            version.LooseVersion(nsx_constants.NSX_VERSION_3_0_0)):
             if attr == 'relax_scale_validation':
                 return True
         else:
@@ -398,7 +398,7 @@ class LBServiceDef(ResourceDef):
                 "Ignoring %s for %s %s: this feature is not supported."
                 "Current NSX version: %s. Minimum supported version: %s",
                 attr, self.resource_type, self.attrs.get('name', ''),
-                self.nsx_version, nsx_constants.NSX_VERSION_2_5_1)
+                self.nsx_version, nsx_constants.NSX_VERSION_3_0_0)
             return False
 
         return False