changed x-ha-policy to ha-mode for rabbitmq 3 changes (#4971)

celery/app/amqp.py

@@ -142,9 +142,9 @@ class Queues(dict):
     def _set_ha_policy(self, args):
         policy = self.ha_policy
         if isinstance(policy, (list, tuple)):
-            return args.update({'x-ha-policy': 'nodes',
-                                'x-ha-policy-params': list(policy)})
-        args['x-ha-policy'] = policy
+            return args.update({'ha-mode': 'nodes',
+                                'ha-params': list(policy)})
+        args['ha-mode'] = policy
 
     def _set_max_priority(self, args):
         if 'x-max-priority' not in args and self.max_priority is not None:

t/unit/app/test_amqp.py

@@ -95,14 +95,14 @@ class test_Queues:
     @pytest.mark.parametrize('ha_policy,qname,q,qargs,expected', [
         (None, 'xyz', 'xyz', None, None),
         (None, 'xyz', 'xyz', {'x-foo': 'bar'}, {'x-foo': 'bar'}),
-        ('all', 'foo', Queue('foo'), None, {'x-ha-policy': 'all'}),
+        ('all', 'foo', Queue('foo'), None, {'ha-mode': 'all'}),
         ('all', 'xyx2',
-         Queue('xyx2', queue_arguments={'x-foo': 'bari'}),
+         Queue('xyx2', queue_arguments={'x-foo': 'bar'}),
          None,
-         {'x-ha-policy': 'all', 'x-foo': 'bari'}),
+         {'ha-mode': 'all', 'x-foo': 'bar'}),
         (['A', 'B', 'C'], 'foo', Queue('foo'), None, {
-            'x-ha-policy': 'nodes',
-            'x-ha-policy-params': ['A', 'B', 'C']}),
+            'ha-mode': 'nodes',
+            'ha-params': ['A', 'B', 'C']}),
     ])
     def test_with_ha_policy(self, ha_policy, qname, q, qargs, expected):
         queues = Queues(ha_policy=ha_policy, create_missing=False)
@@ -124,7 +124,7 @@ class test_Queues:
     def test_with_ha_policy_compat(self):
         q = Queues(ha_policy='all')
         q.add('bar')
-        assert q['bar'].queue_arguments == {'x-ha-policy': 'all'}
+        assert q['bar'].queue_arguments == {'ha-mode': 'all'}
 
     def test_add_default_exchange(self):
         ex = Exchange('fff', 'fanout')
@@ -148,10 +148,10 @@ class test_Queues:
          {'x-max-priority': 10}),
         ({'ha_policy': 'all', 'max_priority': 5},
          'bar', 'bar',
-         {'x-ha-policy': 'all', 'x-max-priority': 5}),
+         {'ha-mode': 'all', 'x-max-priority': 5}),
         ({'ha_policy': 'all', 'max_priority': 5},
          'xyx2', Queue('xyx2', queue_arguments={'x-max-priority': 2}),
-         {'x-ha-policy': 'all', 'x-max-priority': 2}),
+         {'ha-mode': 'all', 'x-max-priority': 2}),
         ({'max_priority': None},
          'foo2', 'foo2',
          None),