Merge pull request #1226 from zhaoqin-github/flavor1/6

[OPENSTACK-2936] Disable SNAT IP validation

Author: zhaoqin-github

f5lbaasdriver/v2/bigip/driver_v2.py

@@ -472,8 +472,9 @@ def __init__(self, driver):
         super(LoadBalancerManager, self).__init__(driver)
         self.model = models.LoadBalancer
         self.validators = [
-            validator.FlavorValidator(),
-            validator.SnatIPValidator(driver)
+            validator.FlavorValidator()
+            # NOTE(qzhao): Disable SNAT validation until we need it again
+            # validator.SnatIPValidator(driver)
         ]
 
     @log_helpers.log_method_call

f5lbaasdriver/v2/bigip/validator.py

@@ -112,7 +112,7 @@ def get_available_ips(self, context, lb):
 
     def validate_create(self, context, lb):
         flavor = lb.flavor
-        if flavor in [7, 8]:
+        if flavor not in [11, 12, 13]:
             return
 
         v4_r, v6_r = self._calculate_snat(lb)
@@ -131,13 +131,13 @@ def validate_update(self, context, old_lb, lb):
         flavor = lb.flavor
         old_flavor = old_lb.flavor
 
-        if flavor in [7, 8]:
+        if flavor not in [11, 12, 13]:
             return
 
         v4_r, v6_r = self._calculate_snat(lb)
         old_v4_r, old_v6_r = self._calculate_snat(old_lb)
 
-        if old_flavor not in [7, 8]:
+        if old_flavor in [11, 12, 13]:
             v4_r -= old_v4_r
             v6_r -= old_v6_r