@@ -261,7 +261,28 @@ def test_config_creation():
261
261
assert config .local_interactive == False
262
262
263
263
264
+ def sample_no_routes ():
265
+ api_versions = client .V1APIGroupList (
266
+ api_version = "v1" ,
267
+ groups = [
268
+ {
269
+ "name" : "route.openshift.io" ,
270
+ "preferred_version" : {
271
+ "group_version" : "route.openshift.io/v1" ,
272
+ "version" : "v1" ,
273
+ },
274
+ "versions" : [
275
+ {"group_version" : "route.openshift.io/v1" , "version" : "v1" }
276
+ ],
277
+ }
278
+ ],
279
+ )
280
+
281
+ return api_versions
282
+
283
+
264
284
def test_cluster_creation (mocker ):
285
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
265
286
cluster = createClusterWithConfig (mocker )
266
287
assert cluster .app_wrapper_yaml == f"{ aw_dir } unit-test-cluster.yaml"
267
288
assert cluster .app_wrapper_name == "unit-test-cluster"
@@ -286,6 +307,7 @@ def test_create_app_wrapper_raises_error_with_no_image():
286
307
287
308
288
309
def test_cluster_creation_no_mcad (mocker ):
310
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
289
311
mocker .patch (
290
312
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object" ,
291
313
return_value = {"spec" : {"domain" : "apps.cluster.awsroute.org" }},
@@ -304,6 +326,7 @@ def test_cluster_creation_no_mcad(mocker):
304
326
305
327
306
328
def test_cluster_creation_priority (mocker ):
329
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
307
330
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
308
331
mocker .patch (
309
332
"kubernetes.client.CustomObjectsApi.list_cluster_custom_object" ,
@@ -327,6 +350,7 @@ def test_cluster_creation_priority(mocker):
327
350
328
351
329
352
def test_default_cluster_creation (mocker ):
353
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
330
354
mocker .patch (
331
355
"codeflare_sdk.cluster.cluster.get_current_namespace" ,
332
356
return_value = "opendatahub" ,
@@ -409,6 +433,7 @@ def arg_check_del_effect(group, version, namespace, plural, name, *args):
409
433
410
434
411
435
def test_cluster_up_down (mocker ):
436
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
412
437
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
413
438
mocker .patch (
414
439
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object" ,
@@ -432,6 +457,7 @@ def test_cluster_up_down(mocker):
432
457
433
458
434
459
def test_cluster_up_down_no_mcad (mocker ):
460
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
435
461
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
436
462
mocker .patch (
437
463
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object" ,
@@ -538,6 +564,7 @@ def test_delete_openshift_oauth_objects(mocker):
538
564
539
565
540
566
def test_cluster_uris (mocker ):
567
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
541
568
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
542
569
mocker .patch (
543
570
"codeflare_sdk.cluster.cluster._get_ingress_domain" ,
@@ -637,6 +664,7 @@ def ingress_retrieval(port, annotations=None):
637
664
638
665
639
666
def test_ray_job_wrapping (mocker ):
667
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
640
668
cluster = cluster = createClusterWithConfig (mocker )
641
669
cluster .config .image = "quay.io/project-codeflare/ray:latest-py39-cu118"
642
670
mocker .patch (
@@ -731,6 +759,7 @@ def test_print_appwrappers(capsys):
731
759
732
760
733
761
def test_ray_details (mocker , capsys ):
762
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
734
763
ray1 = RayCluster (
735
764
name = "raytest1" ,
736
765
status = RayClusterStatus .READY ,
@@ -1764,6 +1793,7 @@ def get_aw_obj(group, version, namespace, plural):
1764
1793
1765
1794
1766
1795
def test_get_cluster (mocker ):
1796
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
1767
1797
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
1768
1798
mocker .patch (
1769
1799
"kubernetes.client.CustomObjectsApi.list_namespaced_custom_object" ,
@@ -1872,6 +1902,7 @@ def test_list_queue(mocker, capsys):
1872
1902
1873
1903
1874
1904
def test_cluster_status (mocker ):
1905
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
1875
1906
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
1876
1907
fake_aw = AppWrapper (
1877
1908
"test" , AppWrapperStatus .FAILED , can_run = True , job_state = "unused"
@@ -1961,6 +1992,7 @@ def test_cluster_status(mocker):
1961
1992
1962
1993
1963
1994
def test_wait_ready (mocker , capsys ):
1995
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
1964
1996
mocker .patch (
1965
1997
"kubernetes.client.NetworkingV1Api.list_namespaced_ingress" ,
1966
1998
return_value = ingress_retrieval (8265 ),
@@ -2021,6 +2053,7 @@ def test_wait_ready(mocker, capsys):
2021
2053
2022
2054
2023
2055
def test_jobdefinition_coverage (mocker ):
2056
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2024
2057
mocker .patch (
2025
2058
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object" ,
2026
2059
return_value = {"spec" : {"domain" : "" }},
@@ -2037,7 +2070,8 @@ def test_job_coverage():
2037
2070
abstract .logs ()
2038
2071
2039
2072
2040
- def test_DDPJobDefinition_creation ():
2073
+ def test_DDPJobDefinition_creation (mocker ):
2074
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2041
2075
ddp = createTestDDP ()
2042
2076
assert ddp .script == "test.py"
2043
2077
assert ddp .m == None
@@ -2061,6 +2095,7 @@ def test_DDPJobDefinition_dry_run(mocker: MockerFixture):
2061
2095
that the attributes of the returned object are of the correct type,
2062
2096
and that the values from cluster and job definition are correctly passed.
2063
2097
"""
2098
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2064
2099
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
2065
2100
mocker .patch (
2066
2101
"codeflare_sdk.cluster.cluster.Cluster.cluster_dashboard_uri" ,
@@ -2097,7 +2132,7 @@ def test_DDPJobDefinition_dry_run_no_cluster(mocker):
2097
2132
that the attributes of the returned object are of the correct type,
2098
2133
and that the values from cluster and job definition are correctly passed.
2099
2134
"""
2100
-
2135
+ mocker . patch ( "kubernetes.client.ApisApi.get_api_versions" )
2101
2136
mocker .patch (
2102
2137
"codeflare_sdk.job.jobs.get_current_namespace" ,
2103
2138
return_value = "opendatahub" ,
@@ -2136,6 +2171,7 @@ def test_DDPJobDefinition_dry_run_no_resource_args(mocker):
2136
2171
Test that the dry run correctly gets resources from the cluster object
2137
2172
when the job definition does not specify resources.
2138
2173
"""
2174
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2139
2175
mocker .patch .object (Cluster , "job_client" )
2140
2176
mocker .patch (
2141
2177
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object" ,
@@ -2175,6 +2211,7 @@ def test_DDPJobDefinition_dry_run_no_cluster_no_resource_args(mocker):
2175
2211
that the attributes of the returned object are of the correct type,
2176
2212
and that the values from cluster and job definition are correctly passed.
2177
2213
"""
2214
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2178
2215
2179
2216
mocker .patch (
2180
2217
"codeflare_sdk.job.jobs.get_current_namespace" ,
@@ -2229,6 +2266,7 @@ def test_DDPJobDefinition_submit(mocker: MockerFixture):
2229
2266
Tests that the submit method returns the correct type: DDPJob
2230
2267
And that the attributes of the returned object are of the correct type
2231
2268
"""
2269
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2232
2270
mock_schedule = MagicMock ()
2233
2271
mocker .patch .object (Runner , "schedule" , mock_schedule )
2234
2272
mock_schedule .return_value = "fake-dashboard-url"
@@ -2259,6 +2297,7 @@ def test_DDPJobDefinition_submit(mocker: MockerFixture):
2259
2297
2260
2298
2261
2299
def test_DDPJob_creation (mocker : MockerFixture ):
2300
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2262
2301
mocker .patch .object (Cluster , "job_client" )
2263
2302
mock_schedule = MagicMock ()
2264
2303
mocker .patch .object (Runner , "schedule" , mock_schedule )
@@ -2284,6 +2323,7 @@ def test_DDPJob_creation(mocker: MockerFixture):
2284
2323
2285
2324
2286
2325
def test_DDPJob_creation_no_cluster (mocker : MockerFixture ):
2326
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2287
2327
ddp_def = createTestDDP ()
2288
2328
ddp_def .image = "fake-image"
2289
2329
mocker .patch (
@@ -2309,6 +2349,7 @@ def test_DDPJob_creation_no_cluster(mocker: MockerFixture):
2309
2349
2310
2350
2311
2351
def test_DDPJob_status (mocker : MockerFixture ):
2352
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2312
2353
# Setup the neccesary mock patches
2313
2354
mock_status = MagicMock ()
2314
2355
mocker .patch .object (Runner , "status" , mock_status )
@@ -2323,6 +2364,7 @@ def test_DDPJob_status(mocker: MockerFixture):
2323
2364
2324
2365
2325
2366
def test_DDPJob_logs (mocker : MockerFixture ):
2367
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2326
2368
mock_log = MagicMock ()
2327
2369
mocker .patch .object (Runner , "log_lines" , mock_log )
2328
2370
# Setup the neccesary mock patches
@@ -2369,7 +2411,8 @@ def parse_j(cmd):
2369
2411
return f"{ worker } x{ gpu } "
2370
2412
2371
2413
2372
- def test_AWManager_creation ():
2414
+ def test_AWManager_creation (mocker ):
2415
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2373
2416
testaw = AWManager (f"{ aw_dir } test.yaml" )
2374
2417
assert testaw .name == "test"
2375
2418
assert testaw .namespace == "ns"
@@ -2410,6 +2453,7 @@ def arg_check_aw_del_effect(group, version, namespace, plural, name, *args):
2410
2453
2411
2454
2412
2455
def test_AWManager_submit_remove (mocker , capsys ):
2456
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2413
2457
testaw = AWManager (f"{ aw_dir } test.yaml" )
2414
2458
testaw .remove ()
2415
2459
captured = capsys .readouterr ()
@@ -2790,6 +2834,7 @@ def test_replace_openshift_oauth(mocker: MockerFixture):
2790
2834
2791
2835
2792
2836
def test_gen_app_wrapper_with_oauth (mocker : MockerFixture ):
2837
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2793
2838
mocker .patch (
2794
2839
"codeflare_sdk.utils.generate_yaml._get_api_host" , return_value = "foo.com"
2795
2840
)
0 commit comments