remove priority from api tests

(cherry picked from commit 05cf6a71fc0434a307149163db6e99c1fc9e37e9)

diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index cfdeebec32996737efe37d8d36508ae4eb1ccfe7..5596d61e95f1889dc736e9fe1ef3cd1b012e95f5 100644 (file)
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -342,7 +342,10 @@ static void fillZone(const string& zonename, HttpResponse* resp) {
     object.AddMember("ttl", rr.ttl, doc.GetAllocator());
     object.AddMember("priority", rr.priority, doc.GetAllocator());
     object.AddMember("disabled", rr.disabled, doc.GetAllocator());
-    Value jcontent(rr.content.c_str(), doc.GetAllocator()); // copy
+    string temp_content = rr.content;
+    if (rr.qtype.getCode() == QType::MX || rr.qtype.getCode() == QType::SRV)
+      temp_content = lexical_cast<string>(rr.priority)+" "+rr.content;
+    Value jcontent(temp_content.c_str(), doc.GetAllocator()); // copy
     object.AddMember("content", jcontent, doc.GetAllocator());
     records.PushBack(object, doc.GetAllocator());
   }

diff --git a/regression-tests.api/test_Zones.py b/regression-tests.api/test_Zones.py
index 30f22fdd31a8e897a03ef57a6de2b9d2ed5c4ca9..b627d15fdcc0c6e43976ba8cafbad13f709c2d52 100644 (file)
--- a/regression-tests.api/test_Zones.py
+++ b/regression-tests.api/test_Zones.py
@@ -81,7 +81,6 @@ class AuthZones(ApiTestCase):
             {
                 "name": name,
                 "type": "A",
-                "priority": 0,
                 "ttl": 3600,
                 "content": "4.3.2.1",
                 "disabled": False
@@ -112,7 +111,6 @@ class AuthZones(ApiTestCase):
             {
                 "name": name,
                 "type": "SOA",
-                "priority": 0,
                 "ttl": 3600,
                 "content": "ns1.example.net testmaster@example.net 10 10800 3600 604800 3600",
                 "disabled": False
@@ -291,7 +289,7 @@ powerdns.com.           86400   IN      SOA     powerdnssec1.ds9a.nl. ahu.ds9a.n
             'SOA': [
                 { 'content': 'powerdnssec1.ds9a.nl. ahu.ds9a.nl. 1343746984 10800 3600 604800 10800' } ],
             'MX': [
-                { 'content': 'xs.powerdns.com.', 'priority': 0 } ],
+                { 'content': '0 xs.powerdns.com.' } ],
             'A': [
                 { 'content': '82.94.213.34', 'name': 'powerdns.com' } ],
             'AAAA': [
@@ -307,10 +305,6 @@ powerdns.com.           86400   IN      SOA     powerdnssec1.ds9a.nl. ahu.ds9a.n
                         if ret['name'] == ev['name'] and ret['content'] == ev['content'].rstrip('.'):
                             counter[et] = counter[et]-1
                             continue
-                    if 'priority' in ev:
-                        if ret['priority'] == ev['priority'] and ret['content'] == ev['content'].rstrip('.'):
-                            counter[et] = counter[et]-1
-                            continue
                     if ret['content'] == ev['content'].rstrip('.'):
                         counter[et] = counter[et]-1
             self.assertEquals(counter[et], 0)
@@ -358,7 +352,7 @@ fred   IN  A      192.168.0.4
             'SOA': [
                 { 'content': 'ns1.example.org. hostmaster.example.org. 2002022401 10800 15 604800 10800' } ],
             'MX': [
-                { 'content': 'mail.another.com.', 'priority': 10 } ],
+                { 'content': '10 mail.another.com.' } ],
             'A': [
                 { 'content': '192.168.0.1', 'name': 'ns1.example.org' },
                 { 'content': '192.168.0.2', 'name': 'www.example.org' },
@@ -377,10 +371,6 @@ fred   IN  A      192.168.0.4
                         if ret['name'] == ev['name'] and ret['content'] == ev['content'].rstrip('.'):
                             counter[et] = counter[et]-1
                             continue
-                    if 'priority' in ev:
-                        if ret['priority'] == ev['priority'] and ret['content'] == ev['content'].rstrip('.'):
-                            counter[et] = counter[et]-1
-                            continue
                     if ret['content'] == ev['content'].rstrip('.'):
                         counter[et] = counter[et]-1
             self.assertEquals(counter[et], 0)
@@ -464,7 +454,6 @@ fred   IN  A      192.168.0.4
                 {
                     "name": name,
                     "type": "NS",
-                    "priority": 0,
                     "ttl": 3600,
                     "content": "ns1.bar.com",
                     "disabled": False
@@ -472,7 +461,6 @@ fred   IN  A      192.168.0.4
                 {
                     "name": name,
                     "type": "NS",
-                    "priority": 0,
                     "ttl": 1800,
                     "content": "ns2-disabled.bar.com",
                     "disabled": True
@@ -492,7 +480,7 @@ fred   IN  A      192.168.0.4
         self.assertEquals(recs, rrset['records'])
 
     def test_zone_rr_update_mx(self):
-        # Important to test with MX records, as they have a priority field, which must not end up in the content field.
+        # Important to test with MX records, as they have a priority field, which must end up in the content field.
         payload, zone = self.create_zone()
         name = payload['name']
         # do a replace (= update)
@@ -504,9 +492,8 @@ fred   IN  A      192.168.0.4
                 {
                     "name": name,
                     "type": "MX",
-                    "priority": 10,
                     "ttl": 3600,
-                    "content": "mail.example.org",
+                    "content": "10 mail.example.org",
                     "disabled": False
                 }
             ]
@@ -534,7 +521,6 @@ fred   IN  A      192.168.0.4
                 {
                     "name": name,
                     "type": "NS",
-                    "priority": 0,
                     "ttl": 3600,
                     "content": "ns9999.example.com",
                     "disabled": False
@@ -549,9 +535,8 @@ fred   IN  A      192.168.0.4
                 {
                     "name": name,
                     "type": "MX",
-                    "priority": 10,
                     "ttl": 3600,
-                    "content": "mx444.example.com",
+                    "content": "10 mx444.example.com",
                     "disabled": False
                 }
             ]
@@ -604,7 +589,6 @@ fred   IN  A      192.168.0.4
                 {
                     "name": name,
                     "type": "SOA",
-                    "priority": 0,
                     "ttl": 3600,
                     "content": "ns1.bar.com hostmaster.foo.org 1 1 1 1 1",
                     "disabled": True
@@ -653,7 +637,6 @@ fred   IN  A      192.168.0.4
                 {
                     "name": name,
                     "type": "NS",
-                    "priority": 0,
                     "ttl": 3600,
                     "content": "ns1.bar.com",
                     "disabled": False
@@ -679,7 +662,6 @@ fred   IN  A      192.168.0.4
                 {
                     "name": 'blah.'+name,
                     "type": "NS",
-                    "priority": 0,
                     "ttl": 3600,
                     "content": "ns1.bar.com",
                     "disabled": False
@@ -705,7 +687,6 @@ fred   IN  A      192.168.0.4
                 {
                     "name": name,
                     "type": "NS",
-                    "priority": 0,
                     "ttl": 3600,
                     "content": "ns1.bar.com",
                     "disabled": False
@@ -833,7 +814,6 @@ fred   IN  A      192.168.0.4
                 {
                     "name": name,
                     "type": "NS",
-                    "priority": 0,
                     "ttl": 3600,
                     "content": "ns1.bar.com",
                     "disabled": False
@@ -873,7 +853,6 @@ fred   IN  A      192.168.0.4
                 {
                     "name": name,
                     "type": "A",
-                    "priority": 0,
                     "ttl": 3600,
                     "content": '192.2.0.2',
                     "disabled": False,
@@ -895,7 +874,6 @@ fred   IN  A      192.168.0.4
             u'content': name,
             u'disabled': False,
             u'ttl': 3600,
-            u'priority': 0,
             u'type': u'PTR',
             u'name': u'2.0.2.192.in-addr.arpa'
         }])
@@ -915,7 +893,6 @@ fred   IN  A      192.168.0.4
                 {
                     "name": name,
                     "type": "AAAA",
-                    "priority": 0,
                     "ttl": 3600,
                     "content": '2001:DB8::bb:aa',
                     "disabled": False,
@@ -937,7 +914,6 @@ fred   IN  A      192.168.0.4
             u'content': name,
             u'disabled': False,
             u'ttl': 3600,
-            u'priority': 0,
             u'type': u'PTR',
             u'name': u'a.a.0.0.b.b.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa'
         }])