#1195 refactored the vs/hw dns-sync commands, moved most of the logic to the managers/dns.py file. Fixed up unit tests to take account of the changes

Author: allmightyspiff

SoftLayer/CLI/hardware/dns.py

@@ -52,7 +52,7 @@ def cli(env, identifier, a_record, aaaa_record, ptr, ttl):
 
     if both or ptr:
         # getReverseDomainRecords returns a list of 1 element, so just get the top.
-        ptr_domains = env.client['Virtual_Guest'].getReverseDomainRecords(id=instance['id']).pop()
+        ptr_domains = env.client['Hardware_Server'].getReverseDomainRecords(id=instance['id']).pop()
         dns.sync_ptr_record(ptr_domains, instance['primaryIpAddress'], instance['fullyQualifiedDomainName'], ttl)
 
     if aaaa_record:

SoftLayer/managers/dns.py

@@ -269,7 +269,7 @@ def sync_ptr_record(self, ptr_domains, ip_address, fqdn, ttl=7200):
         host_rec = ip_address.split('.')[-1]
         edit_ptr = None
         for ptr in ptr_domains['resourceRecords']:
-            if ptr['host'] == host_rec:
+            if ptr.get('host', '') == host_rec:
                 ptr['ttl'] = ttl
                 edit_ptr = ptr
                 break

tests/CLI/modules/server_tests.py

@@ -12,6 +12,7 @@
 import sys
 
 from SoftLayer.CLI import exceptions
+from SoftLayer import SoftLayerError
 from SoftLayer import testing
 
 import json
@@ -660,7 +661,7 @@ def test_dns_sync_both(self, confirm_mock):
         createAargs = ({
             'type': 'a',
             'host': 'hardware-test1',
-            'domainId': 98765,
+            'domainId': 12345,  # from SoftLayer_Account::getDomains
             'data': '172.16.1.100',
             'ttl': 7200
         },)
@@ -715,7 +716,7 @@ def test_dns_sync_v6(self, confirm_mock):
         createV6args = ({
             'type': 'aaaa',
             'host': 'hardware-test1',
-            'domainId': 98765,
+            'domainId': 12345,  # from SoftLayer_Account::getDomains
             'data': '2607:f0d0:1b01:0023:0000:0000:0000:0004',
             'ttl': 7200
         },)
@@ -748,8 +749,8 @@ def test_dns_sync_v6(self, confirm_mock):
                                            'getResourceRecords')
         getResourceRecords.return_value = [v6Record, v6Record]
         result = self.run_command(['hw', 'dns-sync', '--aaaa-record', '1000'])
-        self.assertEqual(result.exit_code, 2)
-        self.assertIsInstance(result.exception, exceptions.CLIAbort)
+        self.assertEqual(result.exit_code, 1)
+        self.assertIsInstance(result.exception, SoftLayerError)
 
     @mock.patch('SoftLayer.CLI.formatting.confirm')
     def test_dns_sync_edit_a(self, confirm_mock):
@@ -779,8 +780,8 @@ def test_dns_sync_edit_a(self, confirm_mock):
              'host': 'hardware-test1', 'type': 'a'}
         ]
         result = self.run_command(['hw', 'dns-sync', '-a', '1000'])
-        self.assertEqual(result.exit_code, 2)
-        self.assertIsInstance(result.exception, exceptions.CLIAbort)
+        self.assertEqual(result.exit_code, 1)
+        self.assertIsInstance(result.exception, SoftLayerError)
 
     @mock.patch('SoftLayer.CLI.formatting.confirm')
     def test_dns_sync_edit_ptr(self, confirm_mock):
@@ -789,7 +790,7 @@ def test_dns_sync_edit_ptr(self, confirm_mock):
                                                 'getReverseDomainRecords')
         getReverseDomainRecords.return_value = [{
             'networkAddress': '172.16.1.100',
-            'name': '2.240.16.172.in-addr.arpa',
+            'name': '100.1.16.172.in-addr.arpa',
             'resourceRecords': [{'data': 'test.softlayer.com.',
                                  'id': 123,
                                  'host': '100'}],

tests/CLI/modules/vs/vs_tests.py

@@ -12,6 +12,7 @@
 from SoftLayer.CLI import exceptions
 from SoftLayer.fixtures import SoftLayer_Virtual_Guest as SoftLayer_Virtual_Guest
 from SoftLayer import SoftLayerAPIError
+from SoftLayer import SoftLayerError
 from SoftLayer import testing
 
 
@@ -310,7 +311,7 @@ def test_dns_sync_both(self, confirm_mock):
         createAargs = ({
             'type': 'a',
             'host': 'vs-test1',
-            'domainId': 98765,
+            'domainId': 12345,  # from SoftLayer_Account::getDomains
             'data': '172.16.240.2',
             'ttl': 7200
         },)
@@ -365,7 +366,7 @@ def test_dns_sync_v6(self, confirm_mock):
         createV6args = ({
             'type': 'aaaa',
             'host': 'vs-test1',
-            'domainId': 98765,
+            'domainId': 12345,
             'data': '2607:f0d0:1b01:0023:0000:0000:0000:0004',
             'ttl': 7200
         },)
@@ -398,8 +399,8 @@ def test_dns_sync_v6(self, confirm_mock):
                                            'getResourceRecords')
         getResourceRecords.return_value = [v6Record, v6Record]
         result = self.run_command(['vs', 'dns-sync', '--aaaa-record', '100'])
-        self.assertEqual(result.exit_code, 2)
-        self.assertIsInstance(result.exception, exceptions.CLIAbort)
+        self.assertEqual(result.exit_code, 1)
+        self.assertIsInstance(result.exception, SoftLayerError)
 
     @mock.patch('SoftLayer.CLI.formatting.confirm')
     def test_dns_sync_edit_a(self, confirm_mock):
@@ -429,8 +430,8 @@ def test_dns_sync_edit_a(self, confirm_mock):
              'host': 'vs-test1', 'type': 'a'}
         ]
         result = self.run_command(['vs', 'dns-sync', '-a', '100'])
-        self.assertEqual(result.exit_code, 2)
-        self.assertIsInstance(result.exception, exceptions.CLIAbort)
+        self.assertEqual(result.exit_code, 1)
+        self.assertIsInstance(result.exception, SoftLayerError)
 
     @mock.patch('SoftLayer.CLI.formatting.confirm')
     def test_dns_sync_edit_ptr(self, confirm_mock):