1
diff --git a/config.yaml.sample b/config.yaml.sample
2
index 3c00237..fc4655d 100644
3
--- a/config.yaml.sample
4
+++ b/config.yaml.sample
5
@@ -11,8 +11,12 @@ networks:
6
11
            start: 10.5.33.0
11
            start: 10.5.33.0
7
12
            end: 10.5.33.255
12
            end: 10.5.33.255
8
13
        reserved:
13
        reserved:
11
14
            start: 10.5.32.1
14
            - start: 10.5.32.1
12
15
            end: 10.5.32.255
15
              end: 10.5.32.20
13
16
              comment: Reserved for foo
14
17
            - start: 10.5.32.31
15
18
              end: 10.5.32.255
16
19
              comment: Reserved for bar
17
16
# The MAAS deployment. Currently only one container is created that has
20
# The MAAS deployment. Currently only one container is created that has
18
17
# both the region and rack in it. In the future we want to extend this
21
# both the region and rack in it. In the future we want to extend this
19
18
# so that you can specify multiple containers, creating a HA setup, or
22
# so that you can specify multiple containers, creating a HA setup, or
20
@@ -52,8 +56,7 @@ machines:
21
52
            power_username: ...
56
            power_username: ...
22
53
            power_password: ...
57
            power_password: ...
23
54
            mac_address: ec:b1:d7:7f:ef:34
58
            mac_address: ec:b1:d7:7f:ef:34
26
55
            osystem: windows  # This parameter is optional, ubuntu is the default value.
59
            osystem: windows  # This parameter is optional, ubuntu is the default.
25
56
27
57
60
28
58
61
29
59
# If you want to test installing maas from a snap
62
# If you want to test installing maas from a snap
30
diff --git a/systemtests/api.py b/systemtests/api.py
31
index ab6276d..eac9d7b 100644
32
--- a/systemtests/api.py
33
+++ b/systemtests/api.py
34
@@ -81,9 +81,19 @@ class AuthenticatedAPIClient:
35
81
        )
81
        )
36
82
        return result
82
        return result
37
83
83
39
84
    def create_ip_range(self, start: str, end: str, range_type: str) -> dict[str, Any]:
84
    def create_ip_range(
40
85
        self, start: str, end: str, range_type: str, comment: Optional[str] = None
41
86
    ) -> dict[str, Any]:
42
87
        comment_arg = [f"comment={comment}"] if comment else []
43
85
        ip_range: dict[str, Any] = self.execute(
88
        ip_range: dict[str, Any] = self.execute(
45
86
            ["ipranges", "create", "type=dynamic", f"start_ip={start}", f"end_ip={end}"]
89
            [
46
90
                "ipranges",
47
91
                "create",
48
92
                f"type={range_type}",
49
93
                f"start_ip={start}",
50
94
                f"end_ip={end}",
51
95
            ]
52
96
            + comment_arg
53
87
        )
97
        )
54
88
        return ip_range
98
        return ip_range
55
89
99
56
diff --git a/systemtests/region.py b/systemtests/region.py
57
index 3ef0ab2..85be256 100644
58
--- a/systemtests/region.py
59
+++ b/systemtests/region.py
60
@@ -76,6 +76,13 @@ class MAASRegion:
61
76
            client.create_ip_range(
76
            client.create_ip_range(
62
77
                network["dynamic"]["start"], network["dynamic"]["end"], "dynamic"
77
                network["dynamic"]["start"], network["dynamic"]["end"], "dynamic"
63
78
            )
78
            )
64
79
            for reserved in network.get("reserved", []):
65
80
                client.create_ip_range(
66
81
                    reserved["start"],
67
82
                    reserved["end"],
68
83
                    "reserved",
69
84
                    reserved.get("comment"),
70
85
                )
71
79
            client.enable_dhcp(dhcp_fabric, dhcp_vlan, primary_controller)
86
            client.enable_dhcp(dhcp_fabric, dhcp_vlan, primary_controller)
72
80
87
73
81
        # Wait for the task to complete and create the dhcpd.conf file.
88
        # Wait for the task to complete and create the dhcpd.conf file.
74
@@ -101,6 +108,9 @@ class MAASRegion:
75
101
            for ip_range in ip_ranges:
108
            for ip_range in ip_ranges:
76
102
                if ip_range["start_ip"] == network["dynamic"]["start"]:
109
                if ip_range["start_ip"] == network["dynamic"]["start"]:
77
103
                    client.delete_ip_range(ip_range["id"])
110
                    client.delete_ip_range(ip_range["id"])
78
111
            for reserved in network.get("reserved", []):
79
112
                if ip_range["start_ip"] == reserved["start"]:
80
113
                    client.delete_ip_range(ip_range["id"])
81
104
        # Wait for the task to complete and create the dhcpd.conf file.
114
        # Wait for the task to complete and create the dhcpd.conf file.
82
105
        for _ in range(10):
115
        for _ in range(10):
83
106
            if not self.is_dhcp_enabled():
116
            if not self.is_dhcp_enabled():
Status:	Merged
Approved by:	Adam Collard on 2021-09-24
Approved revision:	479be697e6cc4cea8bb3ae6c0de09180846eacd3
Merge reported by:	MAAS Lander
Merged at revision:	not available
Proposed branch:	~adam-collard/maas-ci/+git/system-tests:reserved-ip-ranges
Merge into:	~maas-committers/maas-ci/+git/system-tests:master
Diff against target:	83 lines (+29/-6) 3 files modified config.yaml.sample (+7/-4) systemtests/api.py (+12/-2) systemtests/region.py (+10/-0)
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Björn Tillenius	2021-09-24	Approve on 2021-09-24
MAAS Lander		Approve on 2021-09-24
Review via email: mp+409146@code.launchpad.net