SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename isPodAlive() to podExists()

Browse Source
This commit is contained in:
Gytis Trikleris
2018-06-11 14:47:53 +02:00
committed by Ioannis Canellos
parent c90d1b5765
commit 0690831e9e
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/KubernetesHelper.java
View File

@@ -46,7 +46,7 @@ public class KubernetesHelper {
this.kubernetesClient = kubernetesClient;
}
public boolean isPodAlive(String id) {
public boolean podExists(String id) {
return kubernetesClient.pods()
.inNamespace(leaderProperties.getNamespace(kubernetesClient.getNamespace()))
.withLabels(leaderProperties.getLabels())

2
spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/Leader.java
View File

@@ -42,7 +42,7 @@ public class Leader {
}
public boolean isValid() {
return kubernetesHelper.isPodAlive(id);
return kubernetesHelper.podExists(id);
}
}

4
spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/KubernetesHelperTest.java
View File

@@ -95,7 +95,7 @@ public class KubernetesHelperTest {
}
@Test
public void shouldCheckIfPodIsAlive() {
public void shouldCheckIfPodExists() {
given(mockKubernetesClient.getNamespace()).willReturn(NAMESPACE);
given(mockKubernetesClient.pods()).willReturn(podMixedOperation);
given(podMixedOperation.inNamespace(NAMESPACE)).willReturn(podNonNamespaceOperation);
@@ -105,7 +105,7 @@ public class KubernetesHelperTest {
given(mockPod.getMetadata()).willReturn(mockObjectMeta);
given(mockObjectMeta.getName()).willReturn("test-id");
boolean result = kubernetesHelper.isPodAlive("test-id");
boolean result = kubernetesHelper.podExists("test-id");
assertThat(result).isTrue();
verify(mockObjectMeta).getName();

4
spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderTest.java
View File

@@ -42,12 +42,12 @@ public class LeaderTest {
@Test
public void shouldCheckValidity() {
given(mockKubernetesHelper.isPodAlive(ID)).willReturn(true);
given(mockKubernetesHelper.podExists(ID)).willReturn(true);
boolean result = leader.isValid();
assertThat(result).isTrue();
verify(mockKubernetesHelper).isPodAlive(ID);
verify(mockKubernetesHelper).podExists(ID);
}
}

6
spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeadershipControllerTest.java
View File

@@ -86,7 +86,7 @@ public class LeadershipControllerTest {
@Test
public void shouldAcquireWithoutEventsIfAlreadyLeader() throws InterruptedException {
given(mockKubernetesHelper.getConfigMap()).willReturn(mockConfigMap);
given(mockKubernetesHelper.isPodAlive(ID)).willReturn(true);
given(mockKubernetesHelper.podExists(ID)).willReturn(true);
given(mockConfigMap.getData()).willReturn(leaderData);
boolean result = leadershipController.acquire(mockCandidate);
@@ -102,7 +102,7 @@ public class LeadershipControllerTest {
public void shouldTakeOverLeadershipFromInvalidLeader() throws InterruptedException {
String anotherId = "another-test-id";
given(mockKubernetesHelper.getConfigMap()).willReturn(mockConfigMap);
given(mockKubernetesHelper.isPodAlive(ID)).willReturn(false);
given(mockKubernetesHelper.podExists(ID)).willReturn(false);
given(mockConfigMap.getData()).willReturn(leaderData);
given(mockCandidate.getId()).willReturn(anotherId);
@@ -117,7 +117,7 @@ public class LeadershipControllerTest {
@Test
public void shouldFailToAcquireIfThereIsAnotherLeader() {
given(mockKubernetesHelper.getConfigMap()).willReturn(mockConfigMap);
given(mockKubernetesHelper.isPodAlive(ID)).willReturn(true);
given(mockKubernetesHelper.podExists(ID)).willReturn(true);
given(mockConfigMap.getData()).willReturn(leaderData);
given(mockCandidate.getId()).willReturn("another-test-id");