Merge ~ack/maas:backport-18171674 into maas:2.5

[Alberto Donato]

backport 20a6b1e4ae4f4b48a6763a4915e18195ae4defb6 - LP: #1817674 - Completely remove the DNS resource when deleting from the UI

[Alberto Donato (ack)]

review: Approve

diff --git a/src/maasserver/static/js/angular/factories/domains.js b/src/maasserver/static/js/angular/factories/domains.js
index 5a9537f..355c917 100644
--- a/src/maasserver/static/js/angular/factories/domains.js
+++ b/src/maasserver/static/js/angular/factories/domains.js
@@ -71,7 +71,7 @@ angular.module('MAAS').factory(
             if(record.rrtype === 'A' || record.rrtype === 'AAAA') {
                 record.ip_addresses = record.rrdata.split(/[ ,]+/);
                 return RegionConnection.callMethod(
-                    "domain.delete_address_record", record);
+                    "domain.delete_dnsresource", record);
             } else {
                 return RegionConnection.callMethod(
                     "domain.delete_dnsdata", record);
diff --git a/src/maasserver/static/js/angular/factories/tests/test_domains.js b/src/maasserver/static/js/angular/factories/tests/test_domains.js
index 920c12c..8c5823c 100644
--- a/src/maasserver/static/js/angular/factories/tests/test_domains.js
+++ b/src/maasserver/static/js/angular/factories/tests/test_domains.js
@@ -135,6 +135,41 @@ describe("DomainsManager", function() {
         });
     });
 
+    describe("deleteDNSRecord", function() {
+        it("calls delete_dnsresource for A record", function() {
+            spyOn(RegionConnection, "callMethod");
+            var record = {
+                'rrtype': 'A',
+                'rrdata': '192.168.0.1'
+            };
+            DomainsManager.deleteDNSRecord(record);
+            expect(RegionConnection.callMethod).toHaveBeenCalledWith(
+                "domain.delete_dnsresource", record);
+        });
+
+        it("calls delete_dnsresource for AAAA record", function() {
+            spyOn(RegionConnection, "callMethod");
+            var record = {
+                'rrtype': 'AAAA',
+                'rrdata': '2001:db8::1, 10.0.0.1 127.0.0.1'
+            };
+            DomainsManager.deleteDNSRecord(record);
+            expect(RegionConnection.callMethod).toHaveBeenCalledWith(
+                "domain.delete_dnsresource", record);
+        });
+
+        it("calls update_dnsdata for other types", function() {
+            spyOn(RegionConnection, "callMethod");
+            var record = {
+                'rrtype': 'SRV'
+            };
+            DomainsManager.deleteDNSRecord(record);
+            expect(RegionConnection.callMethod).toHaveBeenCalledWith(
+                "domain.delete_dnsdata", record);
+        });
+
+    });
+
     describe("getDomainByName", function() {
         it("returns null when no domains", function() {
             expect(DomainsManager.getDomainByName('meh')).toBe(null);