Merge "Add a compatible check before creating pool"

neutron_lbaas/services/loadbalancer/plugin.py

@@ -683,6 +683,11 @@ class LoadBalancerPluginv2(loadbalancerv2.LoadBalancerPluginBaseV2,
             if db_l.default_pool_id:
                 raise sharedpools.ListenerDefaultPoolAlreadySet(
                     listener_id=db_l.id, pool_id=db_l.default_pool_id)
+            if ((pool['protocol'], db_l.protocol)
+                not in lb_const.LISTENER_POOL_COMPATIBLE_PROTOCOLS):
+                raise loadbalancerv2.ListenerPoolProtocolMismatch(
+                    listener_proto=db_l.protocol,
+                    pool_proto=pool['protocol'])
         if not lb_id:
             raise sharedpools.PoolMustHaveLoadbalancer()
         pool['loadbalancer_id'] = lb_id

neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py

@@ -2553,6 +2553,22 @@ class LbaasPoolTests(PoolTestBase):
             resp, body = self._create_pool_api(data)
             self.assertEqual(webob.exc.HTTPConflict.code, resp.status_int)
 
+    def test_cannot_create_pool_with_listener_protocol_incompatible(self):
+        with self.listener(protocol=lb_const.PROTOCOL_TCP,
+                           loadbalancer_id=self.lb_id,
+                           protocol_port=8000) as listener:
+            listener_id = listener['listener']['id']
+            data = {'pool': {'listener_id': listener_id,
+                             'protocol': lb_const.PROTOCOL_HTTP,
+                             'lb_algorithm': lb_const.LB_METHOD_ROUND_ROBIN,
+                             'admin_state_up': True,
+                             'tenant_id': self._tenant_id}}
+            self.assertRaises(
+                loadbalancerv2.ListenerPoolProtocolMismatch,
+                self.plugin.create_pool,
+                context.get_admin_context(),
+                data)
+
     def test_create_pool_with_protocol_invalid(self):
         data = {'pool': {
             'name': '',