@@ -260,7 +260,28 @@ def test_config_creation():
260
260
assert config .local_interactive == False
261
261
262
262
263
+ def sample_no_routes ():
264
+ api_versions = client .V1APIGroupList (
265
+ api_version = "v1" ,
266
+ groups = [
267
+ {
268
+ "name" : "route.openshift.io" ,
269
+ "preferred_version" : {
270
+ "group_version" : "route.openshift.io/v1" ,
271
+ "version" : "v1" ,
272
+ },
273
+ "versions" : [
274
+ {"group_version" : "route.openshift.io/v1" , "version" : "v1" }
275
+ ],
276
+ }
277
+ ],
278
+ )
279
+
280
+ return api_versions
281
+
282
+
263
283
def test_cluster_creation (mocker ):
284
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
264
285
cluster = createClusterWithConfig (mocker )
265
286
assert cluster .app_wrapper_yaml == f"{ aw_dir } unit-test-cluster.yaml"
266
287
assert cluster .app_wrapper_name == "unit-test-cluster"
@@ -285,6 +306,7 @@ def test_create_app_wrapper_raises_error_with_no_image():
285
306
286
307
287
308
def test_cluster_creation_no_mcad (mocker ):
309
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
288
310
mocker .patch (
289
311
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object" ,
290
312
return_value = {"spec" : {"domain" : "apps.cluster.awsroute.org" }},
@@ -303,6 +325,7 @@ def test_cluster_creation_no_mcad(mocker):
303
325
304
326
305
327
def test_cluster_creation_priority (mocker ):
328
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
306
329
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
307
330
mocker .patch (
308
331
"kubernetes.client.CustomObjectsApi.list_cluster_custom_object" ,
@@ -326,6 +349,7 @@ def test_cluster_creation_priority(mocker):
326
349
327
350
328
351
def test_default_cluster_creation (mocker ):
352
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
329
353
mocker .patch (
330
354
"codeflare_sdk.cluster.cluster.get_current_namespace" ,
331
355
return_value = "opendatahub" ,
@@ -408,6 +432,7 @@ def arg_check_del_effect(group, version, namespace, plural, name, *args):
408
432
409
433
410
434
def test_cluster_up_down (mocker ):
435
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
411
436
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
412
437
mocker .patch (
413
438
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object" ,
@@ -431,6 +456,7 @@ def test_cluster_up_down(mocker):
431
456
432
457
433
458
def test_cluster_up_down_no_mcad (mocker ):
459
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
434
460
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
435
461
mocker .patch (
436
462
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object" ,
@@ -537,6 +563,7 @@ def test_delete_openshift_oauth_objects(mocker):
537
563
538
564
539
565
def test_cluster_uris (mocker ):
566
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
540
567
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
541
568
mocker .patch (
542
569
"codeflare_sdk.cluster.cluster._get_ingress_domain" ,
@@ -636,6 +663,7 @@ def ingress_retrieval(port, annotations=None):
636
663
637
664
638
665
def test_ray_job_wrapping (mocker ):
666
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
639
667
cluster = cluster = createClusterWithConfig (mocker )
640
668
cluster .config .image = "quay.io/project-codeflare/ray:latest-py39-cu118"
641
669
mocker .patch (
@@ -730,6 +758,7 @@ def test_print_appwrappers(capsys):
730
758
731
759
732
760
def test_ray_details (mocker , capsys ):
761
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
733
762
ray1 = RayCluster (
734
763
name = "raytest1" ,
735
764
status = RayClusterStatus .READY ,
@@ -1796,6 +1825,7 @@ def get_aw_obj(group, version, namespace, plural):
1796
1825
1797
1826
1798
1827
def test_get_cluster (mocker ):
1828
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
1799
1829
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
1800
1830
mocker .patch (
1801
1831
"kubernetes.client.CustomObjectsApi.list_namespaced_custom_object" ,
@@ -1904,6 +1934,7 @@ def test_list_queue(mocker, capsys):
1904
1934
1905
1935
1906
1936
def test_cluster_status (mocker ):
1937
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
1907
1938
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
1908
1939
fake_aw = AppWrapper (
1909
1940
"test" , AppWrapperStatus .FAILED , can_run = True , job_state = "unused"
@@ -1993,6 +2024,7 @@ def test_cluster_status(mocker):
1993
2024
1994
2025
1995
2026
def test_wait_ready (mocker , capsys ):
2027
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
1996
2028
mocker .patch (
1997
2029
"kubernetes.client.NetworkingV1Api.list_namespaced_ingress" ,
1998
2030
return_value = ingress_retrieval (8265 ),
@@ -2053,6 +2085,7 @@ def test_wait_ready(mocker, capsys):
2053
2085
2054
2086
2055
2087
def test_jobdefinition_coverage (mocker ):
2088
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2056
2089
mocker .patch (
2057
2090
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object" ,
2058
2091
return_value = {"spec" : {"domain" : "" }},
@@ -2069,7 +2102,8 @@ def test_job_coverage():
2069
2102
abstract .logs ()
2070
2103
2071
2104
2072
- def test_DDPJobDefinition_creation ():
2105
+ def test_DDPJobDefinition_creation (mocker ):
2106
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2073
2107
ddp = createTestDDP ()
2074
2108
assert ddp .script == "test.py"
2075
2109
assert ddp .m == None
@@ -2093,6 +2127,7 @@ def test_DDPJobDefinition_dry_run(mocker: MockerFixture):
2093
2127
that the attributes of the returned object are of the correct type,
2094
2128
and that the values from cluster and job definition are correctly passed.
2095
2129
"""
2130
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2096
2131
mocker .patch ("kubernetes.config.load_kube_config" , return_value = "ignore" )
2097
2132
mocker .patch (
2098
2133
"codeflare_sdk.cluster.cluster.Cluster.cluster_dashboard_uri" ,
@@ -2129,7 +2164,7 @@ def test_DDPJobDefinition_dry_run_no_cluster(mocker):
2129
2164
that the attributes of the returned object are of the correct type,
2130
2165
and that the values from cluster and job definition are correctly passed.
2131
2166
"""
2132
-
2167
+ mocker . patch ( "kubernetes.client.ApisApi.get_api_versions" )
2133
2168
mocker .patch (
2134
2169
"codeflare_sdk.job.jobs.get_current_namespace" ,
2135
2170
return_value = "opendatahub" ,
@@ -2168,6 +2203,7 @@ def test_DDPJobDefinition_dry_run_no_resource_args(mocker):
2168
2203
Test that the dry run correctly gets resources from the cluster object
2169
2204
when the job definition does not specify resources.
2170
2205
"""
2206
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2171
2207
mocker .patch .object (Cluster , "job_client" )
2172
2208
mocker .patch (
2173
2209
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object" ,
@@ -2207,6 +2243,7 @@ def test_DDPJobDefinition_dry_run_no_cluster_no_resource_args(mocker):
2207
2243
that the attributes of the returned object are of the correct type,
2208
2244
and that the values from cluster and job definition are correctly passed.
2209
2245
"""
2246
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2210
2247
2211
2248
mocker .patch (
2212
2249
"codeflare_sdk.job.jobs.get_current_namespace" ,
@@ -2261,6 +2298,7 @@ def test_DDPJobDefinition_submit(mocker: MockerFixture):
2261
2298
Tests that the submit method returns the correct type: DDPJob
2262
2299
And that the attributes of the returned object are of the correct type
2263
2300
"""
2301
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2264
2302
mock_schedule = MagicMock ()
2265
2303
mocker .patch .object (Runner , "schedule" , mock_schedule )
2266
2304
mock_schedule .return_value = "fake-dashboard-url"
@@ -2291,6 +2329,7 @@ def test_DDPJobDefinition_submit(mocker: MockerFixture):
2291
2329
2292
2330
2293
2331
def test_DDPJob_creation (mocker : MockerFixture ):
2332
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2294
2333
mocker .patch .object (Cluster , "job_client" )
2295
2334
mock_schedule = MagicMock ()
2296
2335
mocker .patch .object (Runner , "schedule" , mock_schedule )
@@ -2316,6 +2355,7 @@ def test_DDPJob_creation(mocker: MockerFixture):
2316
2355
2317
2356
2318
2357
def test_DDPJob_creation_no_cluster (mocker : MockerFixture ):
2358
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2319
2359
ddp_def = createTestDDP ()
2320
2360
ddp_def .image = "fake-image"
2321
2361
mocker .patch (
@@ -2341,6 +2381,7 @@ def test_DDPJob_creation_no_cluster(mocker: MockerFixture):
2341
2381
2342
2382
2343
2383
def test_DDPJob_status (mocker : MockerFixture ):
2384
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2344
2385
# Setup the neccesary mock patches
2345
2386
mock_status = MagicMock ()
2346
2387
mocker .patch .object (Runner , "status" , mock_status )
@@ -2355,6 +2396,7 @@ def test_DDPJob_status(mocker: MockerFixture):
2355
2396
2356
2397
2357
2398
def test_DDPJob_logs (mocker : MockerFixture ):
2399
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2358
2400
mock_log = MagicMock ()
2359
2401
mocker .patch .object (Runner , "log_lines" , mock_log )
2360
2402
# Setup the neccesary mock patches
@@ -2401,7 +2443,8 @@ def parse_j(cmd):
2401
2443
return f"{ worker } x{ gpu } "
2402
2444
2403
2445
2404
- def test_AWManager_creation ():
2446
+ def test_AWManager_creation (mocker ):
2447
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2405
2448
testaw = AWManager (f"{ aw_dir } test.yaml" )
2406
2449
assert testaw .name == "test"
2407
2450
assert testaw .namespace == "ns"
@@ -2442,6 +2485,7 @@ def arg_check_aw_del_effect(group, version, namespace, plural, name, *args):
2442
2485
2443
2486
2444
2487
def test_AWManager_submit_remove (mocker , capsys ):
2488
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2445
2489
testaw = AWManager (f"{ aw_dir } test.yaml" )
2446
2490
testaw .remove ()
2447
2491
captured = capsys .readouterr ()
@@ -2822,6 +2866,7 @@ def test_replace_openshift_oauth(mocker: MockerFixture):
2822
2866
2823
2867
2824
2868
def test_gen_app_wrapper_with_oauth (mocker : MockerFixture ):
2869
+ mocker .patch ("kubernetes.client.ApisApi.get_api_versions" )
2825
2870
mocker .patch (
2826
2871
"codeflare_sdk.utils.generate_yaml._get_api_host" , return_value = "foo.com"
2827
2872
)
0 commit comments