Skip to content

Commit 469e798

Browse files
committed
fix(k8sworker): tidy up
Signed-off-by: Chris Snow <[email protected]>
1 parent 65b3269 commit 469e798

File tree

1 file changed

+29
-16
lines changed

1 file changed

+29
-16
lines changed

hpecp/cli/k8scluster.py

+29-16
Original file line numberDiff line numberDiff line change
@@ -134,56 +134,69 @@ def create(
134134
:param ext_id_svr_group_attribute str
135135
:param ext_id_svr_security_protocol str
136136
:param ext_id_svr_base_dn str
137-
:param ext_id_svr_verify_peer str
137+
:param ext_id_svr_verify_peer bool
138138
:param ext_id_svr_type str
139-
:param ext_id_svr_port str
139+
:param ext_id_svr_port int
140140
"""
141141
host_config = [
142142
K8sClusterHostConfig.create_from_list(h.split(":"))
143143
for h in k8shosts_config.split(",")
144144
]
145145

146-
if external_identity_server and not isinstance(
147-
external_identity_server, dict
148-
):
149-
print(
150-
(
151-
"Could not parse 'external_identity_server' parameter"
152-
" - is it valid json?\n"
153-
"Received: " + external_identity_server + "\n"
154-
),
155-
file=sys.stderr,
156-
)
157-
sys.exit(1)
146+
if external_identity_server:
147+
if not isinstance(external_identity_server, dict):
148+
print(
149+
(
150+
"Could not parse 'external_identity_server' parameter"
151+
" - is it valid json?\n"
152+
"Received: " + external_identity_server + "\n"
153+
),
154+
file=sys.stderr,
155+
)
156+
sys.exit(1)
157+
else:
158+
external_identity_server = {}
158159

159160
if ext_id_svr_bind_pwd is not None:
160161
external_identity_server["bind_pwd"] = ext_id_svr_bind_pwd
162+
161163
if ext_id_svr_user_attribute is not None:
162164
external_identity_server[
163165
"user_attribute"
164166
] = ext_id_svr_user_attribute
167+
165168
if ext_id_svr_bind_type is not None:
166169
external_identity_server["bind_type"] = ext_id_svr_bind_type
170+
167171
if ext_id_svr_bind_dn is not None:
168172
external_identity_server["bind_dn"] = ext_id_svr_bind_dn
173+
169174
if ext_id_svr_host is not None:
170175
external_identity_server["host"] = ext_id_svr_host
176+
171177
if ext_id_svr_group_attribute is not None:
172178
external_identity_server[
173179
"group_attribute"
174180
] = ext_id_svr_group_attribute
181+
175182
if ext_id_svr_security_protocol is not None:
176183
external_identity_server[
177184
"security_protocol"
178185
] = ext_id_svr_security_protocol
186+
179187
if ext_id_svr_base_dn is not None:
180188
external_identity_server["base_dn"] = ext_id_svr_base_dn
189+
181190
if ext_id_svr_verify_peer is not None:
182-
external_identity_server["verify_peer"] = ext_id_svr_verify_peer
191+
external_identity_server["verify_peer"] = json.loads(
192+
ext_id_svr_verify_peer.lower()
193+
)
194+
183195
if ext_id_svr_type is not None:
184196
external_identity_server["svr_type"] = ext_id_svr_type
197+
185198
if ext_id_svr_port is not None:
186-
external_identity_server["svr_port"] = ext_id_svr_port
199+
external_identity_server["svr_port"] = int(ext_id_svr_port)
187200

188201
print(
189202
base.get_client().k8s_cluster.create(

0 commit comments

Comments
 (0)