Skip to content

Commit 06b09b8

Browse files
rammanojezilber-akamairpotla-akamlgarber-akamai
authored
Add firewall_id to LNP (#615)
* add firewall_id * Add to integration tests --------- Co-authored-by: Erik Zilber <ezilber@akamai.com> Co-authored-by: rpotla <rpotla@akamai.com> Co-authored-by: Lena Garber <lgarber@akamai.com>
1 parent be4afe8 commit 06b09b8

File tree

5 files changed

+15
-2
lines changed

5 files changed

+15
-2
lines changed

linode_api4/objects/lke.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ class LKENodePool(DerivedBase):
205205
# directly exposed in the node pool response.
206206
"k8s_version": Property(mutable=True),
207207
"update_strategy": Property(mutable=True),
208+
"firewall_id": Property(mutable=True),
208209
}
209210

210211
def _parse_raw_node(

test/fixtures/lke_clusters_18881_pools_456.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"bar": "foo"
3636
},
3737
"label": "example-node-pool",
38+
"firewall_id": 456,
3839
"type": "g6-standard-4",
3940
"disk_encryption": "enabled"
4041
}

test/fixtures/lke_clusters_18882_pools_789.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
"tags": [],
1616
"disk_encryption": "enabled",
1717
"k8s_version": "1.31.1+lke1",
18+
"firewall_id": 789,
1819
"update_strategy": "rolling_update"
1920
}

test/integration/models/lke/test_lke.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def lke_cluster_with_apl(test_linode_client):
138138

139139

140140
@pytest.fixture(scope="session")
141-
def lke_cluster_enterprise(test_linode_client):
141+
def lke_cluster_enterprise(e2e_test_firewall, test_linode_client):
142142
# We use the oldest version here so we can test upgrades
143143
version = sorted(
144144
v.id for v in test_linode_client.lke.tier("enterprise").versions()
@@ -153,6 +153,7 @@ def lke_cluster_enterprise(test_linode_client):
153153
3,
154154
k8s_version=version,
155155
update_strategy="rolling_update",
156+
firewall_id=e2e_test_firewall.id,
156157
)
157158
label = get_test_label() + "_cluster"
158159

@@ -434,13 +435,18 @@ def test_lke_cluster_with_apl(lke_cluster_with_apl):
434435
)
435436

436437

437-
def test_lke_cluster_enterprise(test_linode_client, lke_cluster_enterprise):
438+
def test_lke_cluster_enterprise(
439+
e2e_test_firewall,
440+
test_linode_client,
441+
lke_cluster_enterprise,
442+
):
438443
lke_cluster_enterprise.invalidate()
439444
assert lke_cluster_enterprise.tier == "enterprise"
440445

441446
pool = lke_cluster_enterprise.pools[0]
442447
assert str(pool.k8s_version) == lke_cluster_enterprise.k8s_version.id
443448
assert pool.update_strategy == "rolling_update"
449+
assert pool.firewall_id == e2e_test_firewall.id
444450

445451
target_version = sorted(
446452
v.id for v in test_linode_client.lke.tier("enterprise").versions()

test/unit/objects/lke_test.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ def test_get_pool(self):
5252
assert pool.cluster_id == 18881
5353
assert pool.type.id == "g6-standard-4"
5454
assert pool.label == "example-node-pool"
55+
assert pool.firewall_id == 456
5556
assert pool.disk_encryption == InstanceDiskEncryptionType.enabled
5657

5758
assert pool.disks is not None
@@ -254,6 +255,7 @@ def test_lke_node_pool_update(self):
254255
pool.tags = ["foobar"]
255256
pool.count = 5
256257
pool.label = "testing-label"
258+
pool.firewall_id = 852
257259
pool.autoscaler = {
258260
"enabled": True,
259261
"min": 2,
@@ -281,6 +283,7 @@ def test_lke_node_pool_update(self):
281283
"labels": {
282284
"updated-key": "updated-value",
283285
},
286+
"firewall_id": 852,
284287
"taints": [
285288
{
286289
"key": "updated-key",
@@ -551,6 +554,7 @@ def test_cluster_enterprise(self):
551554
assert pool.k8s_version == "1.31.1+lke1"
552555
assert pool.update_strategy == "rolling_update"
553556
assert pool.label == "enterprise-node-pool"
557+
assert pool.firewall_id == 789
554558

555559
def test_lke_tiered_version(self):
556560
version = TieredKubeVersion(self.client, "1.32", "standard")

0 commit comments

Comments
 (0)