forked from fabric8io/kubernetes-client
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request fabric8io#2705 from rohanKanojia/pr/fix-discovery-…
…apiversion
- Loading branch information
Showing
7 changed files
with
211 additions
and
8 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
81 changes: 81 additions & 0 deletions
81
...ry/src/test/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/EndpointSliceTest.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,81 @@ | ||
| /** | ||
| * Copyright (C) 2015 Red Hat, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.fabric8.kubernetes.api.model.discovery.v1beta1; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
|
|
||
| import io.fabric8.kubernetes.api.model.discovery.EndpointSlice; | ||
| import io.fabric8.kubernetes.api.model.discovery.EndpointSliceBuilder; | ||
| import io.fabric8.kubernetes.model.util.Helper; | ||
| import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; | ||
| import static net.javacrumbs.jsonunit.core.Option.IGNORING_EXTRA_FIELDS; | ||
| import static net.javacrumbs.jsonunit.core.Option.TREATING_NULL_AS_ABSENT; | ||
| import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| class EndpointSliceTest { | ||
| private final ObjectMapper mapper = new ObjectMapper(); | ||
|
|
||
| @Test | ||
| void loadTest() throws Exception { | ||
| // given | ||
| final String originalJson = Helper.loadJson("/valid-endpointslice.json"); | ||
|
|
||
| // when | ||
| final EndpointSlice endpointSlice = mapper.readValue(originalJson, EndpointSlice.class); | ||
| final String serializedJson = mapper.writeValueAsString(endpointSlice); | ||
|
|
||
| // then | ||
| assertThatJson(serializedJson).when(IGNORING_ARRAY_ORDER, TREATING_NULL_AS_ABSENT, IGNORING_EXTRA_FIELDS) | ||
| .isEqualTo(originalJson); | ||
| } | ||
|
|
||
| @Test | ||
| void testBuilder() { | ||
| // Given + When | ||
| EndpointSlice endpointSlice = new EndpointSliceBuilder() | ||
| .withNewMetadata() | ||
| .withName("example-abc") | ||
| .addToLabels("kubernetes.io/service-name", "example") | ||
| .endMetadata() | ||
| .withAddressType("IPv4") | ||
| .addNewPort() | ||
| .withName("http") | ||
| .withPort(80) | ||
| .endPort() | ||
| .addNewEndpoint() | ||
| .withAddresses("10.1.2.3") | ||
| .withNewConditions().withReady(true).endConditions() | ||
| .withHostname("pod-1") | ||
| .addToTopology("kubernetes.io/hostname", "node-1") | ||
| .addToTopology("topology.kubernetes.io/zone", "us-west2-a") | ||
| .endEndpoint() | ||
| .build(); | ||
|
|
||
| // Then | ||
| assertEquals("discovery.k8s.io/v1beta1", endpointSlice.getApiVersion()); | ||
| assertEquals("example-abc", endpointSlice.getMetadata().getName()); | ||
| assertEquals("example", endpointSlice.getMetadata().getLabels().get("kubernetes.io/service-name")); | ||
| assertEquals("IPv4", endpointSlice.getAddressType()); | ||
| assertEquals(1, endpointSlice.getPorts().size()); | ||
| assertEquals(1, endpointSlice.getEndpoints().size()); | ||
| assertEquals("pod-1", endpointSlice.getEndpoints().get(0).getHostname()); | ||
| assertEquals("node-1", endpointSlice.getEndpoints().get(0).getTopology().get("kubernetes.io/hostname")); | ||
| assertEquals("us-west2-a", endpointSlice.getEndpoints().get(0).getTopology().get("topology.kubernetes.io/zone")); | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
...es-model-generator/kubernetes-model-discovery/src/test/resources/valid-endpointslice.json
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,33 @@ | ||
| { | ||
| "apiVersion": "discovery.k8s.io/v1beta1", | ||
| "kind": "EndpointSlice", | ||
| "metadata": { | ||
| "name": "example-abc", | ||
| "labels": { | ||
| "kubernetes.io/service-name": "example" | ||
| } | ||
| }, | ||
| "addressType": "IPv4", | ||
| "ports": [ | ||
| { | ||
| "name": "http", | ||
| "protocol": "TCP", | ||
| "port": 80 | ||
| } | ||
| ], | ||
| "endpoints": [ | ||
| { | ||
| "addresses": [ | ||
| "10.1.2.3" | ||
| ], | ||
| "conditions": { | ||
| "ready": true | ||
| }, | ||
| "hostname": "pod-1", | ||
| "topology": { | ||
| "kubernetes.io/hostname": "node-1", | ||
| "topology.kubernetes.io/zone": "us-west2-a" | ||
| } | ||
| } | ||
| ] | ||
| } |
89 changes: 89 additions & 0 deletions
89
kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/EndpointSliceTest.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,89 @@ | ||
| /** | ||
| * Copyright (C) 2015 Red Hat, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.fabric8.kubernetes.client.mock; | ||
|
|
||
| import io.fabric8.kubernetes.api.model.discovery.EndpointSlice; | ||
| import io.fabric8.kubernetes.api.model.discovery.EndpointSliceBuilder; | ||
| import io.fabric8.kubernetes.client.KubernetesClient; | ||
| import io.fabric8.kubernetes.client.server.mock.KubernetesServer; | ||
| import org.junit.Rule; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.migrationsupport.rules.EnableRuleMigrationSupport; | ||
|
|
||
| import java.net.HttpURLConnection; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
|
|
||
| @EnableRuleMigrationSupport | ||
| class EndpointSliceTest { | ||
| @Rule | ||
| public KubernetesServer server = new KubernetesServer(); | ||
|
|
||
| private KubernetesClient client; | ||
|
|
||
| @BeforeEach | ||
| void init() { | ||
| this.client = server.getClient(); | ||
| } | ||
|
|
||
| @Test | ||
| void resourceCreate() { | ||
| // Given | ||
| EndpointSlice endpointSlice = getEndpointSlice(); | ||
| server.expect().post().withPath("/apis/discovery.k8s.io/v1beta1/namespaces/ns1/endpointslices") | ||
| .andReturn(HttpURLConnection.HTTP_OK, endpointSlice) | ||
| .once(); | ||
|
|
||
| // When | ||
| EndpointSlice endpointSliceCreated = client.resource(endpointSlice).inNamespace("ns1").createOrReplace(); | ||
|
|
||
| // Then | ||
| assertNotNull(endpointSliceCreated); | ||
| assertEquals("example-abc", endpointSliceCreated.getMetadata().getName()); | ||
| assertEquals("discovery.k8s.io/v1beta1", endpointSliceCreated.getApiVersion()); | ||
| assertEquals("example-abc", endpointSliceCreated.getMetadata().getName()); | ||
| assertEquals("example", endpointSliceCreated.getMetadata().getLabels().get("kubernetes.io/service-name")); | ||
| assertEquals("IPv4", endpointSliceCreated.getAddressType()); | ||
| assertEquals(1, endpointSliceCreated.getPorts().size()); | ||
| assertEquals(1, endpointSliceCreated.getEndpoints().size()); | ||
| assertEquals("pod-1", endpointSliceCreated.getEndpoints().get(0).getHostname()); | ||
| assertEquals("node-1", endpointSliceCreated.getEndpoints().get(0).getTopology().get("kubernetes.io/hostname")); | ||
| assertEquals("us-west2-a", endpointSliceCreated.getEndpoints().get(0).getTopology().get("topology.kubernetes.io/zone")); | ||
| } | ||
|
|
||
| private EndpointSlice getEndpointSlice() { | ||
| return new EndpointSliceBuilder() | ||
| .withNewMetadata() | ||
| .withName("example-abc") | ||
| .addToLabels("kubernetes.io/service-name", "example") | ||
| .endMetadata() | ||
| .withAddressType("IPv4") | ||
| .addNewPort() | ||
| .withName("http") | ||
| .withPort(80) | ||
| .endPort() | ||
| .addNewEndpoint() | ||
| .withAddresses("10.1.2.3") | ||
| .withNewConditions().withReady(true).endConditions() | ||
| .withHostname("pod-1") | ||
| .addToTopology("kubernetes.io/hostname", "node-1") | ||
| .addToTopology("topology.kubernetes.io/zone", "us-west2-a") | ||
| .endEndpoint() | ||
| .build(); | ||
| } | ||
| } |
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