-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
addressing comments and refactoring new logic
Signed-off-by: mrMoZ1 <[email protected]>
- Loading branch information
mrMoZ1
committed
Sep 27, 2021
1 parent
1b8af93
commit ca79a52
Showing
7 changed files
with
201 additions
and
139 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
157 changes: 157 additions & 0 deletions
157
...ice/src/test/java/com/vmware/taurus/service/KubernetesServiceStartJobWithArgumentsIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| /* | ||
| * Copyright 2021 VMware, Inc. | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package com.vmware.taurus.service; | ||
|
|
||
| import com.vmware.taurus.service.deploy.JobCommandProvider; | ||
| import com.vmware.taurus.service.kubernetes.DataJobsKubernetesService; | ||
| import io.kubernetes.client.apis.BatchV1beta1Api; | ||
| import io.kubernetes.client.models.V1JobSpec; | ||
| import io.kubernetes.client.models.V1beta1CronJob; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.mockito.ArgumentCaptor; | ||
| import org.mockito.Mockito; | ||
|
|
||
| import java.lang.reflect.Method; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import static org.mockito.ArgumentMatchers.any; | ||
|
|
||
|
|
||
| public class KubernetesServiceStartJobWithArgumentsIT { | ||
|
|
||
| private KubernetesService kubernetesService; | ||
|
|
||
| @BeforeEach | ||
| public void getMockKubernetesServiceForVdkRunExtraArgsTests() throws Exception { | ||
|
|
||
| kubernetesService = Mockito.mock(KubernetesService.class); | ||
| V1beta1CronJob internalCronjobTemplate = getValidCronJobForVdkRunExtraArgsTests(); | ||
| BatchV1beta1Api mockBatch = Mockito.mock(BatchV1beta1Api.class); | ||
| Mockito.when(kubernetesService.initBatchV1beta1Api()).thenReturn(mockBatch); | ||
| Mockito.when(mockBatch.readNamespacedCronJob(any(), any(), any(), any(), any())).thenReturn(internalCronjobTemplate); | ||
| Mockito.doNothing().when(kubernetesService).createNewJob(any(), any(), any(), any()); | ||
| Mockito.doCallRealMethod().when(kubernetesService).startNewCronJobExecution(any(), any(), any(), any(), any(), any()); | ||
| kubernetesService.afterPropertiesSet(); | ||
| // We have to set this field manually which would normally get injected by Spring, since | ||
| // Kubernetes Service is an abstract class and a lot of the methods which depend on this field and are mocked here | ||
| // cannot be mocked or accessed by the extending classes since they are not public. | ||
| var f1 = kubernetesService.getClass().getSuperclass().getDeclaredField("jobCommandProvider"); | ||
| f1.setAccessible(true); | ||
| f1.set(kubernetesService, new JobCommandProvider()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testStartCronJobWithExtraArgumentForVdkRun() { | ||
|
|
||
| try { | ||
| ArgumentCaptor<V1JobSpec> specCaptor = ArgumentCaptor.forClass(V1JobSpec.class); | ||
| Map<String, Object> extraArgs = Map.of("argument1", "value1"); | ||
| kubernetesService.startNewCronJobExecution("test-job", "test-id", new HashMap<>(), new HashMap<>(), extraArgs, "test-job"); | ||
| Mockito.verify(kubernetesService).createNewJob(Mockito.any(), specCaptor.capture(), Mockito.any(), Mockito.any()); | ||
| var capturedSpec = specCaptor.getValue(); | ||
| var capturedCommand = capturedSpec.getTemplate().getSpec().getContainers().get(0).getCommand().get(2); | ||
| //check if command arg starts correctly | ||
| Assertions.assertEquals("export PYTHONPATH=/usr/local/lib/python3.7/site-packages:/vdk/" + | ||
| "site-packages/ && /vdk/vdk run ./test-job --arguments '{\"argument1\":\"value1\"}'", capturedCommand); | ||
|
|
||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| Assertions.fail(e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testStartCronJobWithExtraArgumentsForVdkRun() { | ||
|
|
||
| try { | ||
| ArgumentCaptor<V1JobSpec> specCaptor = ArgumentCaptor.forClass(V1JobSpec.class); | ||
| Map<String, Object> extraArgs = Map.of("argument1", "value1", "argument2", "value2"); | ||
| kubernetesService.startNewCronJobExecution("test-job", "test-id", new HashMap<>(), new HashMap<>(), extraArgs, "test-job"); | ||
| Mockito.verify(kubernetesService).createNewJob(Mockito.any(), specCaptor.capture(), Mockito.any(), Mockito.any()); | ||
| var capturedSpec = specCaptor.getValue(); | ||
| var capturedCommand = capturedSpec.getTemplate().getSpec().getContainers().get(0).getCommand().get(2); | ||
| //check if command arg starts correctly | ||
| Assertions.assertTrue(capturedCommand.startsWith("export PYTHONPATH=/usr/local/lib/python3.7/si" + | ||
| "te-packages:/vdk/site-packages/ && /vdk/vdk run ./test-job --arguments '{"), "Vdk run command string invalid."); | ||
| //extra arguments passed as a map, print order might be different. | ||
| Assertions.assertTrue(capturedCommand.contains("\"argument2\":\"value2\""), "Second argument not present."); | ||
| Assertions.assertTrue(capturedCommand.contains("\"argument1\":\"value1\""), "First argument not present."); | ||
|
|
||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| Assertions.fail(e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testStartCronJobWithNullArgumentsForVdkRun() { | ||
|
|
||
| try { | ||
| ArgumentCaptor<V1JobSpec> specCaptor = ArgumentCaptor.forClass(V1JobSpec.class); | ||
| kubernetesService.startNewCronJobExecution("test-job", "test-id", new HashMap<>(), new HashMap<>(), null, "test-job"); | ||
|
|
||
| Mockito.verify(kubernetesService).createNewJob(Mockito.any(), specCaptor.capture(), Mockito.any(), Mockito.any()); | ||
| var capturedSpec = specCaptor.getValue(); | ||
| var capturedCommand = capturedSpec.getTemplate().getSpec().getContainers().get(0).getCommand().get(2); | ||
| //check if command arg hasn't changed. | ||
| Assertions.assertEquals("export PYTHONPATH=/usr/local/lib/python3.7/site-packages:/vdk/" + | ||
| "site-packages/ && /vdk/vdk run ./test-job", capturedCommand); | ||
|
|
||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| Assertions.fail(e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testStartCronJobWithEmptyArgumentsForVdkRun() { | ||
|
|
||
| try { | ||
| ArgumentCaptor<V1JobSpec> specCaptor = ArgumentCaptor.forClass(V1JobSpec.class); | ||
| kubernetesService.startNewCronJobExecution("test-job", "test-id", new HashMap<>(), new HashMap<>(), Map.of(), "test-job"); | ||
|
|
||
| Mockito.verify(kubernetesService).createNewJob(Mockito.any(), specCaptor.capture(), Mockito.any(), Mockito.any()); | ||
| var capturedSpec = specCaptor.getValue(); | ||
| var capturedCommand = capturedSpec.getTemplate().getSpec().getContainers().get(0).getCommand().get(2); | ||
| //check if command arg hasn't changed. | ||
| Assertions.assertEquals("export PYTHONPATH=/usr/local/lib/python3.7/site-packages:/vdk/" + | ||
| "site-packages/ && /vdk/vdk run ./test-job", capturedCommand); | ||
|
|
||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| Assertions.fail(e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| private V1beta1CronJob getValidCronJobForVdkRunExtraArgsTests() throws Exception { | ||
| KubernetesService service = new DataJobsKubernetesService("default", "someConfig"); | ||
| // V1betaCronJob initializing snippet copied from tests above, using reflection | ||
| service.afterPropertiesSet(); | ||
| Method loadInternalCronjobTemplate = KubernetesService.class.getDeclaredMethod("loadInternalCronjobTemplate"); | ||
| if (loadInternalCronjobTemplate == null) { | ||
| Assertions.fail("The method 'loadInternalCronjobTemplate' does not exist."); | ||
| } | ||
| loadInternalCronjobTemplate.setAccessible(true); | ||
| V1beta1CronJob internalCronjobTemplate = (V1beta1CronJob) loadInternalCronjobTemplate.invoke(service); | ||
| var container = internalCronjobTemplate.getSpec() | ||
| .getJobTemplate() | ||
| .getSpec() | ||
| .getTemplate() | ||
| .getSpec() | ||
| .getContainers() | ||
| .get(0); | ||
|
|
||
| var newCommand = new ArrayList<>(container.getCommand()); | ||
| newCommand.set(2, "export PYTHONPATH=/usr/local/lib/python3.7/site-packages:/vdk/site-packages/ && /vdk/vdk run ./test-job"); | ||
| container.setCommand(newCommand); | ||
| return internalCronjobTemplate; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.