@@ -18,7 +18,6 @@ def merge_environment_settings(self, url, proxies, stream, verify, cert):
18
18
opened_adapters .add (self .get_adapter (url ))
19
19
20
20
settings = OLD_MERGE_ENVIRONMENT_SETTINGS (self , url , proxies , stream , verify , cert )
21
- settings ['verify' ] = False
22
21
23
22
return settings
24
23
@@ -74,11 +73,11 @@ def cluster_get(cluster, endpoint, params=None):
74
73
75
74
with no_ssl_verification ():
76
75
params ['Api-Token' ] = cluster ['cluster_token' ]
77
-
76
+
78
77
response = requests .get (
79
78
"https://" + cluster ['url' ] + "/api/v1.0/onpremise/" + endpoint ,
80
79
params = params ,
81
- verify = False
80
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ])
82
81
)
83
82
check_response (response )
84
83
return response
@@ -100,7 +99,7 @@ def cluster_post(cluster, endpoint, params=None, json=None):
100
99
"https://" + cluster ['url' ] + "/api/v1.0/onpremise/" + endpoint ,
101
100
params = params ,
102
101
json = json ,
103
- verify = False
102
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ])
104
103
)
105
104
check_response (response )
106
105
return response
@@ -121,7 +120,7 @@ def cluster_put(cluster, endpoint, params=None, json=None):
121
120
"https://" + cluster ['url' ] + "/api/v1.0/onpremise/" + endpoint ,
122
121
params = params ,
123
122
json = json ,
124
- verify = False
123
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ])
125
124
)
126
125
check_response (response )
127
126
return response
@@ -141,7 +140,7 @@ def cluster_delete(cluster, endpoint, params=None, json=None):
141
140
"https://" + cluster ['url' ] + "/api/v1.0/onpremise/" + endpoint ,
142
141
params = params ,
143
142
json = json ,
144
- verify = False
143
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ])
145
144
)
146
145
check_response (response )
147
146
return response
@@ -158,7 +157,7 @@ def env_get(cluster, tenant, endpoint, params=None):
158
157
response = requests .get (
159
158
generate_tenant_url (cluster , tenant ) + "/api/v1/" + endpoint ,
160
159
params = params ,
161
- verify = False
160
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ])
162
161
)
163
162
check_response (response )
164
163
return response
@@ -176,7 +175,7 @@ def env_post(cluster, tenant, endpoint, params=None, json=None):
176
175
response = requests .post (
177
176
generate_tenant_url (cluster , tenant ) + "/api/v1/" + endpoint ,
178
177
params = params ,
179
- verify = False ,
178
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ]) ,
180
179
json = json
181
180
)
182
181
check_response (response )
@@ -195,7 +194,7 @@ def env_put(cluster, tenant, endpoint, params=None, json=None):
195
194
response = requests .put (
196
195
generate_tenant_url (cluster , tenant ) + "/api/v1/" + endpoint ,
197
196
params = params ,
198
- verify = False ,
197
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ]) ,
199
198
json = json
200
199
)
201
200
check_response (response )
@@ -213,7 +212,7 @@ def env_delete(cluster, tenant, endpoint, params=None):
213
212
response = requests .delete (
214
213
generate_tenant_url (cluster , tenant ) + "/api/v1/" + endpoint ,
215
214
params = params ,
216
- verify = False
215
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ])
217
216
)
218
217
check_response (response )
219
218
return response
@@ -232,7 +231,7 @@ def config_get(cluster, tenant, endpoint, params=None, json=None):
232
231
response = requests .get (
233
232
generate_tenant_url (cluster , tenant ) + "/api/config/v1/" + endpoint ,
234
233
params = params ,
235
- verify = False ,
234
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ]) ,
236
235
json = json
237
236
)
238
237
check_response (response )
@@ -251,7 +250,7 @@ def config_post(cluster, tenant, endpoint, params=None, json=None):
251
250
response = requests .post (
252
251
generate_tenant_url (cluster , tenant ) + "/api/config/v1/" + endpoint ,
253
252
params = params ,
254
- verify = False ,
253
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ]) ,
255
254
json = json
256
255
)
257
256
check_response (response )
@@ -270,7 +269,7 @@ def config_put(cluster, tenant, endpoint, params=None, json=None):
270
269
response = requests .put (
271
270
generate_tenant_url (cluster , tenant ) + "/api/config/v1/" + endpoint ,
272
271
params = params ,
273
- verify = False ,
272
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ]) ,
274
273
json = json
275
274
)
276
275
check_response (response )
@@ -289,7 +288,7 @@ def config_delete(cluster, tenant, endpoint, params=None, json=None):
289
288
response = requests .delete (
290
289
generate_tenant_url (cluster , tenant ) + "/api/config/v1/" + endpoint ,
291
290
params = params ,
292
- verify = False ,
291
+ verify = ( True if "verify_ssl" not in cluster else cluster [ "verify_ssl" ]) ,
293
292
json = json
294
293
)
295
294
check_response (response )
0 commit comments