Skip to content

Commit 21abc58

Browse files
committed
fix(k8sworker): tags
Signed-off-by: Chris Snow <[email protected]>
1 parent d0eb9fb commit 21abc58

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

hpecp/cli/k8sworker.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def create_with_ssh_key(
5555
ip=None,
5656
ssh_key=None,
5757
ssh_key_file=None,
58-
tags=[],
58+
tags=None,
5959
ephemeral_disks=None,
6060
persistent_disks=None,
6161
wait_for_operation_secs=0,
@@ -73,7 +73,7 @@ def create_with_ssh_key(
7373
ssh_key_file : str, optional
7474
The SSH key file path, by default None
7575
tags : list, optional
76-
Tags to use, e.g. "{ "tag1": "foo", "tag2": "bar"}", by default []
76+
Tags to use, e.g. /api/v2/tag/1:foo,/api/v2/tag/1:bar, by default None
7777
ephemeral_disks : str
7878
Comma separated string containing ephemeral disks.
7979
e.g: "/dev/nvme2n1,/dev/nvme2n2"
@@ -123,10 +123,14 @@ def create_with_ssh_key(
123123
)
124124
sys.exit(1)
125125

126+
tags_parsed=[]
127+
if tags is not None:
128+
tags_parsed=[dict(item.split(":") for item in tags.split(','))]
129+
126130
worker_id = base.get_client().k8s_worker.create_with_ssh_key(
127131
ip=ip,
128132
ssh_key_data=ssh_key,
129-
tags=tags,
133+
tags=tags_parsed,
130134
)
131135

132136
if wait_for_operation_secs > 0:

tests/k8s_worker_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def test_key_or_keycontent_provided(
173173
self.assertEqual(cm.exception.code, 1)
174174

175175
actual_err = self.err.getvalue().strip()
176-
expected_err = "Either ssh_key or ssh_key_file must be provided"
176+
expected_err = "At least one of ssh_key or ssh_key_file must be provided"
177177

178178
self.assertEqual(self.out.getvalue(), "", "stdout should be empty")
179179

@@ -197,7 +197,7 @@ def test_key_and_keycontent_provided(
197197
self.assertEqual(cm.exception.code, 1)
198198

199199
actual_err = self.err.getvalue().strip()
200-
expected_err = "Either ssh_key or ssh_key_file must be provided"
200+
expected_err = "Either ssh_key or ssh_key_file must be provided, but not both."
201201

202202
self.assertEqual(self.out.getvalue(), "", "stdout should be empty")
203203

0 commit comments

Comments
 (0)