issues192 added ability to sync aaaa records

allmightyspiff · allmightyspiff · commit 6769d8c472e4 · 2015-12-07T18:38:17.000-06:00
diff --git a/SoftLayer/CLI/virt/dns.py b/SoftLayer/CLI/virt/dns.py
@@ -18,29 +18,43 @@
 @click.option('--a-record', '-a',
               is_flag=True,
               help="Sync the A record for the host")
+@click.option('--aaaa-record',
+              is_flag=True,
+              help="Sync the AAAA record for the host")
 @click.option('--ptr', is_flag=True, help="Sync the PTR record for the host")
 @click.option('--ttl',
               default=7200,
               show_default=True,
               type=click.INT,
               help="Sets the TTL for the A and/or PTR records")
 @environment.pass_env
-def cli(env, identifier, a_record, ptr, ttl):
+def cli(env, identifier, a_record, aaaa_record, ptr, ttl):
     """Sync DNS records."""
 
+    items = ['id',
+             'globalIdentifier',
+             'fullyQualifiedDomainName',
+             'hostname',
+             'domain',
+             'primaryBackendIpAddress',
+             'primaryIpAddress',
+             '''primaryNetworkComponent[
+                id, primaryIpAddress,
+                primaryVersion6IpAddressRecord[ipAddress]
+             ]''']
+    mask = "mask[%s]" % ','.join(items)
     dns = SoftLayer.DNSManager(env.client)
     vsi = SoftLayer.VSManager(env.client)
 
     vs_id = helpers.resolve_id(vsi.resolve_ids, identifier, 'VS')
-    instance = vsi.get_instance(vs_id)
+    instance = vsi.get_instance(vs_id, mask=mask)
     zone_id = helpers.resolve_id(dns.resolve_ids,
                                  instance['domain'],
                                  name='zone')
 
     def sync_a_record():
         """Sync A record."""
         records = dns.get_records(zone_id, host=instance['hostname'])
-
         if not records:
             # don't have a record, lets add one to the base zone
             dns.create_record(zone['id'],
@@ -58,6 +72,38 @@ def sync_a_record():
             rec['ttl'] = ttl
             dns.edit_record(rec)
 
+    def sync_aaaa_record():
+        """Sync AAAA record."""
+        records = dns.get_records(zone_id,
+                                  host=instance['hostname'],
+                                  record_type='aaaa')
+
+        try:
+            # done this way to stay within 80 character lines
+            component = instance['primaryNetworkComponent']
+            record = component['primaryVersion6IpAddressRecord']
+            ip_address = record['ipAddress']
+        except KeyError:
+            raise exceptions.CLIAbort("%s does not have an ipv6 address"
+                                      % instance['fullyQualifiedDomainName'])
+
+        if not records:
+            # don't have a record, lets add one to the base zone
+            dns.create_record(zone['id'],
+                              instance['hostname'],
+                              'aaaa',
+                              ip_address,
+                              ttl=ttl)
+        else:
+            recs = [x for x in records if x['type'].lower() == 'aaaa']
+            if len(recs) != 1:
+                raise exceptions.CLIAbort("Aborting A record sync, found "
+                                          "%d A record exists!" % len(recs))
+            rec = recs[0]
+            rec['data'] = ip_address
+            rec['ttl'] = ttl
+            dns.edit_record(rec)
+
     def sync_ptr_record():
         """Sync PTR record."""
         host_rec = instance['primaryIpAddress'].split('.')[-1]
@@ -102,3 +148,6 @@ def sync_ptr_record():
 
     if both or ptr:
         sync_ptr_record()
+
+    if aaaa_record:
+        sync_aaaa_record()
diff --git a/tests/CLI/modules/vs_tests.py b/tests/CLI/modules/vs_tests.py
@@ -5,7 +5,7 @@
     :license: MIT, see LICENSE for more details.
 """
 import mock
-
+from pprint import pprint as pp
 from SoftLayer import testing
 
 import json
@@ -132,3 +132,35 @@ def test_create(self, confirm_mock):
                  'networkComponents': [{'maxSpeed': '100'}]},)
         self.assert_called_with('SoftLayer_Virtual_Guest', 'createObject',
                                 args=args)
+
+    @mock.patch('SoftLayer.CLI.formatting.confirm')
+    def test_dns_sync(self, confirm_mock):
+        confirm_mock.return_value = True
+        getReverseDomainRecords = self.set_mock('SoftLayer_Virtual_Guest', 
+                                  'getReverseDomainRecords')
+        getReverseDomainRecords.return_value = [{
+            'networkAddress': '172.16.240.2',
+            'name': '2.240.16.172.in-addr.arpa',
+            'resourceRecords': [{'data': 'test.softlayer.com.',
+                                 'id': 100,
+                                 'host': '2'}],
+            'updateDate': '2013-09-11T14:36:57-07:00',
+            'serial': 1234665663,
+            'id': 123456,
+        }]
+        getResourceRecords = self.set_mock('SoftLayer_Dns_Domain', 
+                                           'getResourceRecords')
+        getResourceRecords.return_value = [
+            {'id': 1, 
+             'ttl': 7200, 
+             'data': '172.16.240.2', 
+             'host': 'test', 
+             'type': 'a'}
+        ]
+        result = self.run_command(['vs', 'dns-sync', '100'])
+        self.assertEqual(result.exit_code, 0)
+        result = self.run_command(['vs', 'dns-sync', '--aaaa-record', '100'])
+        self.assertEqual(result.exit_code, 2)
+
+
+
