diff --git a/src/azure-cli/azure/cli/command_modules/network/tests/latest/test_dns_commands.py b/src/azure-cli/azure/cli/command_modules/network/tests/latest/test_dns_commands.py index 3c6af0f0640..2853604166e 100644 --- a/src/azure-cli/azure/cli/command_modules/network/tests/latest/test_dns_commands.py +++ b/src/azure-cli/azure/cli/command_modules/network/tests/latest/test_dns_commands.py @@ -442,7 +442,11 @@ def test_zone_file_1(self): (7200, 7, 'foo bar') ]) self._check_txt(zone, 'mytxtrs.' + zn, [(3600, 2, 'hi')]) - self._check_srv(zone, 'mysrv.' + zn, [(3600, 1, 2, 1234, 'target.contoso.com.')]) + self._check_srv(zone, 'mysrv.' + zn, [ + (3600, 1, 2, 1234, 'target-1.contoso.com.'), + (3600, 1, 2, 1234, 'target-2.contoso.com.'), + (3600, 1, 2, 1234, 'target-3.contoso.com.') + ]) self._check_caa(zone, 'caa1.' + zn, [ (60, 0, 'issue', 'ca1.contoso.com'), (60, 128, 'iodef', 'mailto:test@contoso.com') diff --git a/src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone1.txt b/src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone1.txt index b275d4ab781..3a9def49fb1 100644 --- a/src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone1.txt +++ b/src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone1.txt @@ -17,9 +17,11 @@ myname2 3600 TXT "manualtxt" mytxt2 7200 TXT "abc def" mytxt2 7200 TXT "foo bar" mytxtrs 3600 TXT "hi" -mysrv 3600 SRV 1 2 1234 target.contoso.com. +mysrv 3600 SRV 1 2 1234 target-1.contoso.com. +mysrv 3600 SRV 1 2 1234 target-2.contoso.com. +mysrv 3600 SRV 1 2 1234 target-3.contoso.com. _sip._tls.@ 3600 IN SRV 100 1 443 target.contoso.com. caa1 60 IN CAA 0 issue "ca1.contoso.com" 60 IN CAA 128 iodef mailto:test@contoso.com caa2 60 IN CAA 0 issue ca1.contoso.com - 600 IN CAA 45 tag56 "test test test" \ No newline at end of file + 600 IN CAA 45 tag56 "test test test" diff --git a/src/azure-cli/azure/cli/command_modules/network/zone_file/parse_zone_file.py b/src/azure-cli/azure/cli/command_modules/network/zone_file/parse_zone_file.py index 35b4a3ab253..3323ca5d046 100644 --- a/src/azure-cli/azure/cli/command_modules/network/zone_file/parse_zone_file.py +++ b/src/azure-cli/azure/cli/command_modules/network/zone_file/parse_zone_file.py @@ -69,7 +69,7 @@ 'mx': r'(?P[@\*\w\.-]*)\s+(?:(?P\d+\w*)\s+)?(?:(?Pin)\s+)?(?Pmx)\s+(?P\d+)\s+(?P[@\w\.-]+)', 'txt': r'(?P[@\*\w\.-]*)\s+(?:(?P\d+\w*)\s+)?(?:(?Pin)\s+)?(?Ptxt)\s+(?P.+)', 'ptr': r'(?P[@\*\w\.-]*)\s+(?:(?P\d+\w*)\s+)?(?:(?Pin)\s+)?(?Pptr)\s+(?P[\w\.-]+)', - 'srv': r'(?P[@\*\w\.-]*)\s+(?:(?P\d+\w*)\s+)?(?:(?Pin)\s+)?(?Psrv)\s+(?P\d+)\s+(?P\d+)\s+(?P\d+)\s+(?P[@\w\.]+)', + 'srv': r'(?P[@\*\w\.-]*)\s+(?:(?P\d+\w*)\s+)?(?:(?Pin)\s+)?(?Psrv)\s+(?P\d+)\s+(?P\d+)\s+(?P\d+)\s+(?P[@\w\.-]+)', 'spf': r'(?P[@\*\w\.-]*)\s+(?:(?P\d+\w*)\s+)?(?:(?Pin)\s+)?(?Pspf)\s+(?P.+)', 'uri': r'(?P[@\*\w\.-]*)\s+(?:(?P\d+\w*)\s+)?(?:(?Pin)\s+)?(?Puri)\s+(?P\d+)\s+(?P\d+)\s+(?P[\w\.]+)' }