@@ -23,7 +23,6 @@ def merge_environment_settings(self, url, proxies, stream, verify, cert):
23
23
opened_adapters .add (self .get_adapter (url ))
24
24
25
25
settings = OLD_MERGE_ENVIRONMENT_SETTINGS (self , url , proxies , stream , verify , cert )
26
- settings ['verify' ] = False
27
26
28
27
return settings
29
28
@@ -79,11 +78,11 @@ def cluster_get(cluster, endpoint, params=None):
79
78
80
79
with no_ssl_verification ():
81
80
params ['Api-Token' ] = cluster ['cluster_token' ]
82
-
81
+
83
82
response = requests .get (
84
83
HTTPS_STR + cluster ['url' ] + CLUSTER_V1_PATH + endpoint ,
85
84
params = params ,
86
- verify = False
85
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ])
87
86
)
88
87
check_response (response )
89
88
return response
@@ -105,7 +104,7 @@ def cluster_post(cluster, endpoint, params=None, json=None):
105
104
HTTPS_STR + cluster ['url' ] + CLUSTER_V1_PATH + endpoint ,
106
105
params = params ,
107
106
json = json ,
108
- verify = False
107
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ])
109
108
)
110
109
check_response (response )
111
110
return response
@@ -126,7 +125,7 @@ def cluster_put(cluster, endpoint, params=None, json=None):
126
125
HTTPS_STR + cluster ['url' ] + CLUSTER_V1_PATH + endpoint ,
127
126
params = params ,
128
127
json = json ,
129
- verify = False
128
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ])
130
129
)
131
130
check_response (response )
132
131
return response
@@ -146,7 +145,7 @@ def cluster_delete(cluster, endpoint, params=None, json=None):
146
145
HTTPS_STR + cluster ['url' ] + CLUSTER_V1_PATH + endpoint ,
147
146
params = params ,
148
147
json = json ,
149
- verify = False
148
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ])
150
149
)
151
150
check_response (response )
152
151
return response
@@ -163,7 +162,7 @@ def env_get(cluster, tenant, endpoint, params=None):
163
162
response = requests .get (
164
163
generate_tenant_url (cluster , tenant ) + ENV_API_V1 + endpoint ,
165
164
params = params ,
166
- verify = False
165
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ])
167
166
)
168
167
check_response (response )
169
168
return response
@@ -181,7 +180,7 @@ def env_post(cluster, tenant, endpoint, params=None, json=None):
181
180
response = requests .post (
182
181
generate_tenant_url (cluster , tenant ) + ENV_API_V1 + endpoint ,
183
182
params = params ,
184
- verify = False ,
183
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ]) ,
185
184
json = json
186
185
)
187
186
check_response (response )
@@ -200,7 +199,7 @@ def env_put(cluster, tenant, endpoint, params=None, json=None):
200
199
response = requests .put (
201
200
generate_tenant_url (cluster , tenant ) + ENV_API_V1 + endpoint ,
202
201
params = params ,
203
- verify = False ,
202
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ]) ,
204
203
json = json
205
204
)
206
205
check_response (response )
@@ -218,7 +217,7 @@ def env_delete(cluster, tenant, endpoint, params=None):
218
217
response = requests .delete (
219
218
generate_tenant_url (cluster , tenant ) + ENV_API_V1 + endpoint ,
220
219
params = params ,
221
- verify = False
220
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ])
222
221
)
223
222
check_response (response )
224
223
return response
@@ -237,7 +236,7 @@ def config_get(cluster, tenant, endpoint, params=None, json=None):
237
236
response = requests .get (
238
237
generate_tenant_url (cluster , tenant ) + CONFIG_API_V1 + endpoint ,
239
238
params = params ,
240
- verify = False ,
239
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ]) ,
241
240
json = json
242
241
)
243
242
check_response (response )
@@ -256,7 +255,7 @@ def config_post(cluster, tenant, endpoint, params=None, json=None):
256
255
response = requests .post (
257
256
generate_tenant_url (cluster , tenant ) + CONFIG_API_V1 + endpoint ,
258
257
params = params ,
259
- verify = False ,
258
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ]) ,
260
259
json = json
261
260
)
262
261
check_response (response )
@@ -275,7 +274,7 @@ def config_put(cluster, tenant, endpoint, params=None, json=None):
275
274
response = requests .put (
276
275
generate_tenant_url (cluster , tenant ) + CONFIG_API_V1 + endpoint ,
277
276
params = params ,
278
- verify = False ,
277
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ]) ,
279
278
json = json
280
279
)
281
280
check_response (response )
@@ -294,7 +293,7 @@ def config_delete(cluster, tenant, endpoint, params=None, json=None):
294
293
response = requests .delete (
295
294
generate_tenant_url (cluster , tenant ) + CONFIG_API_V1 + endpoint ,
296
295
params = params ,
297
- verify = False ,
296
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ]) ,
298
297
json = json
299
298
)
300
299
check_response (response )
0 commit comments