Merge pull request #2320 from szok/dns-improvements

DNS form improvements

docs/user/dns.md

@@ -15,6 +15,3 @@ Ralph integrated with DNSAAS [PowerDNS](https://github.com/allegro/django-powerd
 
 On the edit page of DataCenterAsset will appear a new tab DNS Edit.
 DNS records are matched using DataCenterAssets IP
-
-
-> "DNS edit is not transaction-safe, since it's communicating with external system through the api."

src/ralph/dns/dnsaas.py

@@ -55,8 +55,7 @@ def get_dns_records(self, ipaddresses):
             )
         )
         api_results = self.get_api_result(url)
-        ptr_list = set(
-            [i['content'] for i in api_results if i['type'] == 'PTR'])
+        ptrs = set([i['content'] for i in api_results if i['type'] == 'PTR'])
 
         for item in api_results:
             if item['type'] in {'A', 'CNAME', 'TXT'}:
@@ -65,7 +64,7 @@ def get_dns_records(self, ipaddresses):
                     'name': item['name'],
                     'type': RecordType.from_name(item['type'].lower()).id,
                     'content': item['content'],
-                    'ptr': item['name'] in ptr_list and item['type'] == 'A',
+                    'ptr': item['name'] in ptrs and item['type'] == 'A',
                     'owner': settings.DNSAAS_OWNER
                 })
         return sorted(dns_records, key=lambda x: x['type'])
@@ -78,7 +77,7 @@ def update_dns_records(self, record):
             record: record cleaned data
 
         Returns:
-            True or False if an error from api
+            Validation error from API or None if update correct
         """
         url = urljoin(
             settings.DNSAAS_URL, 'api/records/{}/'.format(record['pk'])
@@ -126,7 +125,7 @@ def create_dns_records(self, record):
             records: Record cleaned data
 
         Returns:
-            True or False if an error from api
+            Validation error from API or None if create correct
         """
 
         url = urljoin(settings.DNSAAS_URL, 'api/records/')
@@ -162,7 +161,7 @@ def delete_dns_records(self, record_id):
             record_ids: ID's to delete
 
         Returns:
-            True or False if an error from api
+            Validation error from API or None if delete correct
         """
         url = urljoin(
             settings.DNSAAS_URL, 'api/records/{}/'.format(record_id)

src/ralph/dns/forms.py

@@ -45,3 +45,11 @@ class DNSRecordForm(forms.Form):
         initial=False,
         required=False
     )
+
+    def clean(self):
+        cleaned_data = super().clean()
+        if (
+            cleaned_data.get('ptr', False) and
+            cleaned_data.get('type', None) != str(RecordType.a.id)
+        ):
+            raise forms.ValidationError(_('Only A type record can be PTR'))

src/ralph/dns/templates/dns/dns_edit.html

@@ -4,7 +4,7 @@
 {% block view_content %}
   <div class="row">
     <div class="large-12 columns">
-      <h1>DNS edit</h1>
+      <h1>{% trans 'DNS edit' %}</h1>
         <table>
           <thead>
             {% for name, field in forms.0.fields.items %}

src/ralph/dns/views.py

@@ -35,12 +35,14 @@ def get_forms(self):
         return forms
 
     def get(self, request, *args, **kwargs):
-        kwargs['forms'] = self.get_forms()
+        if 'forms' not in kwargs:
+            kwargs['forms'] = self.get_forms()
         return super().get(request, *kwargs, **kwargs)
 
     def post(self, request, *args, **kwargs):
         forms = self.get_forms()
         posted_form = DNSRecordForm(request.POST)
+        # Find form which request's data belongs to
         for i, form in enumerate(forms):
             if (
                 str(form.data.get('pk', '')) ==
@@ -69,4 +71,4 @@ def post(self, request, *args, **kwargs):
                 return HttpResponseRedirect('.')
 
         kwargs['forms'] = forms
-        return super().get(request, *args, **kwargs)
+        return self.get(request, *args, **kwargs)