Enable zone import to import wildcard entries (softlayer#769)

alexderz · sudorandom · commit 88a5b21ef001 · 2016-08-30T14:15:46.000-05:00
Enable zone import to import wildcard entries
diff --git a/SoftLayer/CLI/dns/zone_import.py b/SoftLayer/CLI/dns/zone_import.py
@@ -9,7 +9,7 @@
 from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import helpers
 
-RECORD_REGEX = re.compile(r"""^((?P<domain>([\w-]+(\.)?)*|\@)?\s+
+RECORD_REGEX = re.compile(r"""^((?P<domain>(([\w-]+|\*)(\.)?)*|\@)?\s+
                                (?P<ttl>\d+)?\s+
                                (?P<class>\w+)?)?\s+
                                (?P<type>\w+)\s+
diff --git a/tests/CLI/modules/dns_tests.py b/tests/CLI/modules/dns_tests.py
@@ -115,6 +115,8 @@ def test_parse_zone_file(self):
 dev.realtest.com    IN  TXT "This is just a test of the txt record"
     IN  AAAA  2001:db8:10::1
 spf  IN TXT "v=spf1 ip4:192.0.2.0/24 ip4:198.51.100.123 a"
+*.testing              86400    IN A     127.0.0.2
+*                      86400    IN A     127.0.0.3
 
 """
         expected = [{'data': 'ns1.softlayer.com.',
@@ -148,7 +150,15 @@ def test_parse_zone_file(self):
                     {'data': '"v=spf1 ip4:192.0.2.0/24 ip4:198.51.100.123 a"',
                      'record': 'spf',
                      'type': 'TXT',
-                     'ttl': None}]
+                     'ttl': None},
+                    {'data': '127.0.0.2',
+                     'record': '*.testing',
+                     'type': 'A',
+                     'ttl': '86400'},
+                    {'data': '127.0.0.3',
+                     'record': '*',
+                     'type': 'A',
+                     'ttl': '86400'}]
         zone, records, bad_lines = zone_import.parse_zone_details(zone_file)
         self.assertEqual(zone, 'realtest.com')
         self.assertEqual(records, expected)
