Skip to content

Commit 7c98617

Browse files
jgallagherjgallagher
authored
[reconfigurator-cli] DNS diffs: summarize unchanged names (#8923)
This pretty significantly improves the signal-to-noise ratio in reconfigurator-cli tests. Probably should've done this a while ago!
1 parent 672aed5 commit 7c98617

12 files changed

+131
-7182
lines changed

‎dev-tools/reconfigurator-cli/tests/output/cmds-example-stdout

Lines changed: 8 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -641,18 +641,15 @@ to: blueprint 86db3308-f817-4626-8838-4085949a6a41
641641

642642
internal DNS:
643643
* DNS zone: "control-plane.oxide.internal":
644-
name: 89d02b1b-478c-401a-8e28-7a26f74fa41b.sled (records: 1)
645-
AAAA fd00:1122:3344:101::1
646644
+ name: _internal-ntp._tcp (records: 1)
647645
+ SRV port 123 b3c9c041-d2f0-4767-bdaf-0e52e9d7a013.host.control-plane.oxide.internal
648-
name: _repo-depot._tcp (records: 1)
649-
SRV port 12348 89d02b1b-478c-401a-8e28-7a26f74fa41b.sled.control-plane.oxide.internal
650646
+ name: b3c9c041-d2f0-4767-bdaf-0e52e9d7a013.host (records: 1)
651647
+ AAAA fd00:1122:3344:101::21
648+
unchanged names: 2 (records: 2)
652649

653650
external DNS:
654651
DNS zone: "oxide.example" (unchanged)
655-
name: example-silo.sys (records: 0)
652+
unchanged names: 1 (records: 0)
656653

657654

658655

@@ -721,18 +718,15 @@ to: blueprint 86db3308-f817-4626-8838-4085949a6a41
721718

722719
internal DNS:
723720
* DNS zone: "control-plane.oxide.internal":
724-
name: 89d02b1b-478c-401a-8e28-7a26f74fa41b.sled (records: 1)
725-
AAAA fd00:1122:3344:101::1
726721
+ name: _internal-ntp._tcp (records: 1)
727722
+ SRV port 123 b3c9c041-d2f0-4767-bdaf-0e52e9d7a013.host.control-plane.oxide.internal
728-
name: _repo-depot._tcp (records: 1)
729-
SRV port 12348 89d02b1b-478c-401a-8e28-7a26f74fa41b.sled.control-plane.oxide.internal
730723
+ name: b3c9c041-d2f0-4767-bdaf-0e52e9d7a013.host (records: 1)
731724
+ AAAA fd00:1122:3344:101::21
725+
unchanged names: 2 (records: 2)
732726

733727
external DNS:
734728
DNS zone: "oxide.example" (unchanged)
735-
name: example-silo.sys (records: 0)
729+
unchanged names: 1 (records: 0)
736730

737731

738732

@@ -801,18 +795,15 @@ to: blueprint 02697f74-b14a-4418-90f0-c28b2a3a6aa9
801795

802796
internal DNS:
803797
* DNS zone: "control-plane.oxide.internal":
804-
name: 89d02b1b-478c-401a-8e28-7a26f74fa41b.sled (records: 1)
805-
AAAA fd00:1122:3344:101::1
806798
- name: _internal-ntp._tcp (records: 1)
807799
- SRV port 123 b3c9c041-d2f0-4767-bdaf-0e52e9d7a013.host.control-plane.oxide.internal
808-
name: _repo-depot._tcp (records: 1)
809-
SRV port 12348 89d02b1b-478c-401a-8e28-7a26f74fa41b.sled.control-plane.oxide.internal
810800
- name: b3c9c041-d2f0-4767-bdaf-0e52e9d7a013.host (records: 1)
811801
- AAAA fd00:1122:3344:101::21
802+
unchanged names: 2 (records: 2)
812803

813804
external DNS:
814805
DNS zone: "oxide.example" (unchanged)
815-
name: example-silo.sys (records: 0)
806+
unchanged names: 1 (records: 0)
816807

817808

818809

@@ -1678,141 +1669,31 @@ to: blueprint 86db3308-f817-4626-8838-4085949a6a41
16781669

16791670
internal DNS:
16801671
* DNS zone: "control-plane.oxide.internal":
1681-
name: 03ba2f16-8b5e-41c4-906d-5a7a0af460ef.host (records: 1)
1682-
AAAA fd00:1122:3344:101::26
1683-
name: 056fd45c-2498-4ce4-8c97-79dfc9321080.host (records: 1)
1684-
AAAA fd00:1122:3344:101::24
16851672
- name: 0ab3dbe9-8387-4600-b097-cb71ee91ee83.host (records: 1)
16861673
- AAAA fd00:1122:3344:103::21
1687-
name: 17ed8f62-8cd0-416c-86d1-5eaf6f7358ef.host (records: 1)
1688-
AAAA fd00:1122:3344:101::2b
1689-
name: 18b3781d-571b-4d7c-b65d-18a452e5a64a.host (records: 1)
1690-
AAAA fd00:1122:3344:102::21
1691-
name: 2eb69596-f081-4e2d-9425-9994926e0832.sled (records: 1)
1692-
AAAA fd00:1122:3344:102::1
1693-
name: 32d8d836-4d8a-4e54-8fa9-f31d79c42646.sled (records: 1)
1694-
AAAA fd00:1122:3344:103::1
1695-
name: 397841de-588e-4fe7-94ee-a944b7340074.host (records: 1)
1696-
AAAA fd00:1122:3344:101::2c
1697-
name: 4692cc31-6eb6-437c-9634-9688663d06ae.host (records: 1)
1698-
AAAA fd00:1122:3344:1::1
1699-
name: 4a81477d-5a28-4246-93ef-01db835a5c5e.host (records: 1)
1700-
AAAA fd00:1122:3344:101::2d
1701-
name: 534dad87-2b4c-4250-8ad9-2ec1d93b2994.host (records: 1)
1702-
AAAA fd00:1122:3344:101::29
1703-
name: 587da9e8-8fc0-4854-b585-070741a7b00d.host (records: 1)
1704-
AAAA fd00:1122:3344:2::1
1705-
name: 5954ecdc-c5ad-49a6-9c5f-4689f783ba83.host (records: 1)
1706-
AAAA fd00:1122:3344:101::28
17071674
- name: 6c2a57b0-2de0-4409-a6b9-c9aa5614eefa.host (records: 1)
17081675
- AAAA fd00:1122:3344:103::22
1709-
name: 83ac30bd-ae85-4d6b-84c3-add02d3214cf.host (records: 1)
1710-
AAAA fd00:1122:3344:101::27
1711-
name: 89d02b1b-478c-401a-8e28-7a26f74fa41b.sled (records: 1)
1712-
AAAA fd00:1122:3344:101::1
17131676
- name: 99a750b2-724d-4828-ae5f-0df1aad90166.host (records: 1)
17141677
- AAAA fd00:1122:3344:103::23
1715-
name: @ (records: 3)
1716-
NS ns1.control-plane.oxide.internal
1717-
NS ns2.control-plane.oxide.internal
1718-
NS ns3.control-plane.oxide.internal
1719-
name: _clickhouse-admin-single-server._tcp (records: 1)
1720-
SRV port 8888 a27817ff-db8d-49ba-9682-9e3c13bc4e4b.host.control-plane.oxide.internal
1721-
name: _clickhouse-native._tcp (records: 1)
1722-
SRV port 9000 a27817ff-db8d-49ba-9682-9e3c13bc4e4b.host.control-plane.oxide.internal
1723-
name: _clickhouse._tcp (records: 1)
1724-
SRV port 8123 a27817ff-db8d-49ba-9682-9e3c13bc4e4b.host.control-plane.oxide.internal
1725-
name: _crucible-pantry._tcp (records: 3)
1726-
SRV port 17000 17ed8f62-8cd0-416c-86d1-5eaf6f7358ef.host.control-plane.oxide.internal
1727-
SRV port 17000 534dad87-2b4c-4250-8ad9-2ec1d93b2994.host.control-plane.oxide.internal
1728-
SRV port 17000 dc2666e6-4c3e-4b8e-99bc-bcdb5f8986e1.host.control-plane.oxide.internal
1729-
name: _crucible._tcp.397841de-588e-4fe7-94ee-a944b7340074 (records: 1)
1730-
SRV port 32345 397841de-588e-4fe7-94ee-a944b7340074.host.control-plane.oxide.internal
1731-
name: _crucible._tcp.4a81477d-5a28-4246-93ef-01db835a5c5e (records: 1)
1732-
SRV port 32345 4a81477d-5a28-4246-93ef-01db835a5c5e.host.control-plane.oxide.internal
17331678
- name: _crucible._tcp.6c2a57b0-2de0-4409-a6b9-c9aa5614eefa (records: 1)
17341679
- SRV port 32345 6c2a57b0-2de0-4409-a6b9-c9aa5614eefa.host.control-plane.oxide.internal
17351680
- name: _crucible._tcp.99a750b2-724d-4828-ae5f-0df1aad90166 (records: 1)
17361681
- SRV port 32345 99a750b2-724d-4828-ae5f-0df1aad90166.host.control-plane.oxide.internal
1737-
name: _crucible._tcp.b61b7c3c-d665-44b3-9312-794aa81c59de (records: 1)
1738-
SRV port 32345 b61b7c3c-d665-44b3-9312-794aa81c59de.host.control-plane.oxide.internal
1739-
name: _crucible._tcp.b957d6cf-f7b2-4bee-9928-c5fde8c59e04 (records: 1)
1740-
SRV port 32345 b957d6cf-f7b2-4bee-9928-c5fde8c59e04.host.control-plane.oxide.internal
1741-
name: _crucible._tcp.e246f5e3-0650-4afc-860f-ee7114d309c5 (records: 1)
1742-
SRV port 32345 e246f5e3-0650-4afc-860f-ee7114d309c5.host.control-plane.oxide.internal
17431682
- name: _crucible._tcp.e668d83e-a28c-42dc-b574-467e57403cc1 (records: 1)
17441683
- SRV port 32345 e668d83e-a28c-42dc-b574-467e57403cc1.host.control-plane.oxide.internal
1745-
name: _crucible._tcp.f4dc5b5d-6eb6-40a9-a079-971eca862285 (records: 1)
1746-
SRV port 32345 f4dc5b5d-6eb6-40a9-a079-971eca862285.host.control-plane.oxide.internal
1747-
name: _external-dns._tcp (records: 3)
1748-
SRV port 5353 03ba2f16-8b5e-41c4-906d-5a7a0af460ef.host.control-plane.oxide.internal
1749-
SRV port 5353 5954ecdc-c5ad-49a6-9c5f-4689f783ba83.host.control-plane.oxide.internal
1750-
SRV port 5353 83ac30bd-ae85-4d6b-84c3-add02d3214cf.host.control-plane.oxide.internal
17511684
* name: _internal-ntp._tcp (records: 3 -> 2)
17521685
- SRV port 123 0ab3dbe9-8387-4600-b097-cb71ee91ee83.host.control-plane.oxide.internal
17531686
- SRV port 123 18b3781d-571b-4d7c-b65d-18a452e5a64a.host.control-plane.oxide.internal
17541687
- SRV port 123 ac5bb28e-91d5-42f3-a57a-d84e1c414c17.host.control-plane.oxide.internal
17551688
+ SRV port 123 18b3781d-571b-4d7c-b65d-18a452e5a64a.host.control-plane.oxide.internal
17561689
+ SRV port 123 ac5bb28e-91d5-42f3-a57a-d84e1c414c17.host.control-plane.oxide.internal
1757-
name: _nameservice._tcp (records: 3)
1758-
SRV port 5353 4692cc31-6eb6-437c-9634-9688663d06ae.host.control-plane.oxide.internal
1759-
SRV port 5353 587da9e8-8fc0-4854-b585-070741a7b00d.host.control-plane.oxide.internal
1760-
SRV port 5353 ffbf02f0-261d-4723-b613-eb861245acbd.host.control-plane.oxide.internal
1761-
name: _nexus._tcp (records: 3)
1762-
SRV port 12221 056fd45c-2498-4ce4-8c97-79dfc9321080.host.control-plane.oxide.internal
1763-
SRV port 12221 a67ac9b3-427b-4ea6-a891-1c76a22720f5.host.control-plane.oxide.internal
1764-
SRV port 12221 d856156c-2bc2-41ad-beef-7ca1da5802d3.host.control-plane.oxide.internal
1765-
name: _oximeter-reader._tcp (records: 1)
1766-
SRV port 9000 a27817ff-db8d-49ba-9682-9e3c13bc4e4b.host.control-plane.oxide.internal
1767-
name: _repo-depot._tcp (records: 3)
1768-
SRV port 12348 2eb69596-f081-4e2d-9425-9994926e0832.sled.control-plane.oxide.internal
1769-
SRV port 12348 32d8d836-4d8a-4e54-8fa9-f31d79c42646.sled.control-plane.oxide.internal
1770-
SRV port 12348 89d02b1b-478c-401a-8e28-7a26f74fa41b.sled.control-plane.oxide.internal
1771-
name: a27817ff-db8d-49ba-9682-9e3c13bc4e4b.host (records: 1)
1772-
AAAA fd00:1122:3344:101::25
1773-
name: a67ac9b3-427b-4ea6-a891-1c76a22720f5.host (records: 1)
1774-
AAAA fd00:1122:3344:101::22
1775-
name: ac5bb28e-91d5-42f3-a57a-d84e1c414c17.host (records: 1)
1776-
AAAA fd00:1122:3344:101::21
1777-
name: b61b7c3c-d665-44b3-9312-794aa81c59de.host (records: 1)
1778-
AAAA fd00:1122:3344:102::23
1779-
name: b957d6cf-f7b2-4bee-9928-c5fde8c59e04.host (records: 1)
1780-
AAAA fd00:1122:3344:102::24
1781-
name: d856156c-2bc2-41ad-beef-7ca1da5802d3.host (records: 1)
1782-
AAAA fd00:1122:3344:101::23
1783-
name: dc2666e6-4c3e-4b8e-99bc-bcdb5f8986e1.host (records: 1)
1784-
AAAA fd00:1122:3344:101::2a
1785-
name: e246f5e3-0650-4afc-860f-ee7114d309c5.host (records: 1)
1786-
AAAA fd00:1122:3344:102::22
17871690
- name: e668d83e-a28c-42dc-b574-467e57403cc1.host (records: 1)
17881691
- AAAA fd00:1122:3344:103::24
1789-
name: f4dc5b5d-6eb6-40a9-a079-971eca862285.host (records: 1)
1790-
AAAA fd00:1122:3344:101::2e
1791-
name: ffbf02f0-261d-4723-b613-eb861245acbd.host (records: 1)
1792-
AAAA fd00:1122:3344:3::1
1793-
name: ns1 (records: 1)
1794-
AAAA fd00:1122:3344:1::1
1795-
name: ns2 (records: 1)
1796-
AAAA fd00:1122:3344:2::1
1797-
name: ns3 (records: 1)
1798-
AAAA fd00:1122:3344:3::1
1692+
unchanged names: 43 (records: 55)
17991693

18001694
external DNS:
18011695
DNS zone: "oxide.example" (unchanged)
1802-
name: @ (records: 3)
1803-
NS ns1.oxide.example
1804-
NS ns2.oxide.example
1805-
NS ns3.oxide.example
1806-
name: example-silo.sys (records: 3)
1807-
A 192.0.2.4
1808-
A 192.0.2.2
1809-
A 192.0.2.3
1810-
name: ns1 (records: 1)
1811-
A 198.51.100.1
1812-
name: ns2 (records: 1)
1813-
A 198.51.100.2
1814-
name: ns3 (records: 1)
1815-
A 198.51.100.3
1696+
unchanged names: 5 (records: 9)
18161697

18171698

18181699

0 commit comments

Comments
 (0)