Skip to content

Commit 0dd1824

Browse files
authored
Add lke versions helper and update tests (#772)
1 parent c04d864 commit 0dd1824

File tree

1 file changed

+32
-9
lines changed

1 file changed

+32
-9
lines changed

tests/integration/lke/test_lke_enterprise.py

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,27 @@
1515
BASE_CMD = ["linode-cli", "lke"]
1616

1717

18+
def get_lke_enterprise_id():
19+
enterprise_tier_info_list = (
20+
exec_test_command(
21+
BASE_CMD
22+
+ [
23+
"tiered-versions-list",
24+
"enterprise",
25+
"--json",
26+
]
27+
)
28+
.stdout.decode()
29+
.rstrip()
30+
)
31+
32+
parsed = json.loads(enterprise_tier_info_list)
33+
34+
enterprise_ti = parsed[0]
35+
36+
return enterprise_ti.get("id")
37+
38+
1839
def test_enterprise_tier_available_in_types(monkeypatch: MonkeyPatch):
1940
monkeypatch.setenv("LINODE_CLI_API_VERSION", "v4beta")
2041
lke_types = (
@@ -41,6 +62,8 @@ def test_create_lke_enterprise(monkeypatch: MonkeyPatch):
4162
required_capabilities=["Linodes", "Kubernetes Enterprise"]
4263
)
4364

65+
k8s_version = get_lke_enterprise_id()
66+
4467
output = (
4568
exec_test_command(
4669
BASE_CMD
@@ -51,7 +74,7 @@ def test_create_lke_enterprise(monkeypatch: MonkeyPatch):
5174
"--tier",
5275
"enterprise",
5376
"--k8s_version",
54-
"v1.31.1+lke4",
77+
k8s_version,
5578
"--node_pools.type",
5679
"g6-standard-6",
5780
"--node_pools.count",
@@ -77,7 +100,7 @@ def test_create_lke_enterprise(monkeypatch: MonkeyPatch):
77100
assert_headers_in_lines(headers, output.splitlines())
78101

79102
assert label in output
80-
assert "v1.31.1+lke4" in output
103+
assert k8s_version in output
81104
assert "enterprise" in output
82105

83106
delete_target_id(
@@ -122,21 +145,22 @@ def test_lke_tiered_versions_list():
122145
)
123146

124147
s_ti_list = json.loads(standard_tier_info_list)
148+
version_pattern = r"^\d+\.\d+$"
125149

126-
assert s_ti_list[0].get("id") == "1.32"
127-
assert s_ti_list[0].get("tier") == "standard"
128-
assert s_ti_list[1].get("id") == "1.31"
129-
assert s_ti_list[1].get("tier") == "standard"
150+
for item in s_ti_list:
151+
assert re.match(version_pattern, item.get("id"))
152+
assert item.get("tier") == "standard"
130153

131154

132155
def test_lke_tiered_versions_view():
156+
enterprise_id = get_lke_enterprise_id()
133157
enterprise_tier_info = (
134158
exec_test_command(
135159
BASE_CMD
136160
+ [
137161
"tiered-version-view",
138162
"enterprise",
139-
"v1.31.1+lke4",
163+
enterprise_id,
140164
"--json",
141165
]
142166
)
@@ -148,7 +172,7 @@ def test_lke_tiered_versions_view():
148172

149173
enterprise_ti = parsed[0]
150174

151-
assert enterprise_ti.get("id") == "v1.31.1+lke4"
175+
assert enterprise_ti.get("id") == enterprise_id
152176
assert enterprise_ti.get("tier") == "enterprise"
153177

154178
standard_tier_info = (
@@ -169,5 +193,4 @@ def test_lke_tiered_versions_view():
169193

170194
stardard_ti = parsed[0]
171195

172-
assert stardard_ti.get("id") == "1.31"
173196
assert stardard_ti.get("tier") == "standard"

0 commit comments

Comments
 (0)