Merge "Add 'additional_vips' field to driver datamodel"

.gitignore

@@ -59,3 +59,7 @@ ChangeLog
 
 # Files created by releasenotes build
 releasenotes/build
+
+# IDEs
+.idea/*
+.vscode/*

octavia_lib/api/drivers/data_models.py

@@ -106,7 +106,7 @@ class LoadBalancer(BaseDataModel):
                  listeners=Unset, loadbalancer_id=Unset, name=Unset,
                  pools=Unset, project_id=Unset, vip_address=Unset,
                  vip_network_id=Unset, vip_port_id=Unset, vip_subnet_id=Unset,
-                 vip_qos_policy_id=Unset):
+                 vip_qos_policy_id=Unset, additional_vips=Unset):
 
         self.admin_state_up = admin_state_up
         self.description = description
@@ -121,6 +121,7 @@ class LoadBalancer(BaseDataModel):
         self.vip_port_id = vip_port_id
         self.vip_subnet_id = vip_subnet_id
         self.vip_qos_policy_id = vip_qos_policy_id
+        self.additional_vips = additional_vips
 
 
 class Listener(BaseDataModel):

octavia_lib/tests/unit/api/drivers/test_data_models.py

@@ -374,6 +374,7 @@ class TestProviderDataModels(base.TestCase):
         new_ref_lib_dict = deepcopy(self.ref_lb_dict)
         new_ref_lib_dict['pools'] = None
         new_ref_lib_dict['listeners'] = None
+        new_ref_lib_dict['additional_vips'] = None
 
         self.assertEqual(new_ref_lib_dict, ref_lb_converted_to_dict)
 
@@ -421,6 +422,7 @@ class TestProviderDataModels(base.TestCase):
         ref_lb_dict_with_listener = deepcopy(self.ref_lb_dict_with_listener)
         ref_lb_dict_with_listener['pools'] = None
         ref_lb_dict_with_listener['name'] = None
+        ref_lb_dict_with_listener['additional_vips'] = None
 
         ref_lb_converted_to_dict = ref_lb.to_dict(recurse=True,
                                                   render_unsets=True)

releasenotes/notes/add-additional-vip-support-becdb29c5187b514.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Add the ability to pass multiple VIP objects to providers. This allows for
+    multiple subnets/IPs on a single LB.