Repository: stratos Updated Branches: refs/heads/tenant-isolation ad9b2c29d -> 573b70380
http://git-wip-us.apache.org/repos/asf/stratos/blob/12c0ea00/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/InlineTest.java ---------------------------------------------------------------------- diff --git a/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/InlineTest.java b/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/InlineTest.java deleted file mode 100644 index 72e6617..0000000 --- a/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/InlineTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.fabric8.kubernetes.api.model; - -import com.fasterxml.jackson.core.JsonProcessingException; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -public class InlineTest { - - @Test - public void testIntOrString() throws JsonProcessingException { - ServicePort port = new ServicePortBuilder().withNewTargetPort(2181).build(); - assertEquals(2181, port.getTargetPort().getIntVal().intValue()); - - port = new ServicePortBuilder().withNewTargetPort("2181").build(); - assertEquals("2181", port.getTargetPort().getStrVal()); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/12c0ea00/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/KubernetesListTest.java ---------------------------------------------------------------------- diff --git a/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/KubernetesListTest.java b/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/KubernetesListTest.java deleted file mode 100644 index e7b994d..0000000 --- a/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/KubernetesListTest.java +++ /dev/null @@ -1,85 +0,0 @@ -package io.fabric8.kubernetes.api.model; - -import com.fasterxml.jackson.core.JsonProcessingException; -import org.hamcrest.CoreMatchers; -import org.junit.Test; - -import static org.junit.Assert.*; - -public class KubernetesListTest { - - @Test - public void testDefaultValues() throws JsonProcessingException { - Service service = new ServiceBuilder() - .withNewMetadata() - .withName("test-service") - .endMetadata() - .build(); - assertNotNull(service.getApiVersion()); - assertEquals(service.getKind(), "Service"); - - ReplicationController replicationController = new ReplicationControllerBuilder() - .withNewMetadata() - .withName("test-controller") - .endMetadata() - .build(); - assertNotNull(replicationController.getApiVersion()); - assertEquals(replicationController.getKind(), "ReplicationController"); - - KubernetesList kubernetesList = new KubernetesListBuilder() - .addNewServiceItem() - .withNewMetadata() - .withName("test-service") - .endMetadata() - .and() - .addNewReplicationControllerItem() - .withNewMetadata() - .withName("test-controller") - .endMetadata() - .and() - .build(); - - assertNotNull(kubernetesList.getApiVersion()); - assertEquals(kubernetesList.getKind(), "List"); - assertThat(kubernetesList.getItems(), CoreMatchers.hasItem(service)); - assertThat(kubernetesList.getItems(), CoreMatchers.hasItem(replicationController)); - } - - @Test - public void testVisitor() throws JsonProcessingException { - KubernetesList list = new KubernetesListBuilder() - .addNewPodItem() - .withNewSpec() - .addNewContainer() - .withName("my-container") - .withImage("my/image") - .endContainer() - .endSpec() - .and() - .build(); - - list = new KubernetesListBuilder(list).accept(new io.fabric8.common.Visitor() { - public void visit(Object item) { - if (item instanceof io.fabric8.kubernetes.api.model.PodSpecBuilder) { - ((io.fabric8.kubernetes.api.model.PodSpecBuilder)item).addNewContainer() - .withName("other-container") - .withImage("other/image") - .and(); - } - } - }).build(); - } - - - @Test - public void testDefaultNullValues() throws JsonProcessingException { - Container container = new ContainerBuilder().build(); - assertNull(container.getLifecycle()); - assertNull(container.getLivenessProbe()); - - - Pod pod = new PodBuilder().build(); - assertNull(pod.getSpec()); - assertNull(pod.getStatus()); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/12c0ea00/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/UnmarshallTest.java ---------------------------------------------------------------------- diff --git a/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/UnmarshallTest.java b/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/UnmarshallTest.java deleted file mode 100644 index cd6d9df..0000000 --- a/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/UnmarshallTest.java +++ /dev/null @@ -1,66 +0,0 @@ -package io.fabric8.kubernetes.api.model; - -import com.fasterxml.jackson.databind.ObjectMapper; -import io.fabric8.common.Visitor; -import io.fabric8.kubernetes.api.model.resource.Quantity; -import io.fabric8.openshift.api.model.template.Template; -import io.fabric8.openshift.api.model.template.TemplateBuilder; -import org.junit.Assert; -import org.junit.Test; - -import java.util.concurrent.atomic.AtomicInteger; - -import static org.junit.Assert.assertEquals; - -public class UnmarshallTest { - - @Test - public void testUnmarshallInt64ToLong() throws Exception { - ObjectMapper mapper = new ObjectMapper(); // can reuse, share globally - Pod pod = (Pod) mapper.readValue(getClass().getResourceAsStream("/valid-pod.json"), KubernetesResource.class); - assertEquals(pod.getSpec().getContainers().get(0).getResources().getLimits().get("memory"), new Quantity("5Mi")); - assertEquals(pod.getSpec().getContainers().get(0).getResources().getLimits().get("cpu"), new Quantity("1")); - } - - @Test - public void testUnmarshallWithVisitors() throws Exception { - ObjectMapper mapper = new ObjectMapper(); // can reuse, share globally - KubernetesList list = (KubernetesList) mapper.readValue(getClass().getResourceAsStream("/simple-list.json"), KubernetesResource.class); - final AtomicInteger integer = new AtomicInteger(); - new KubernetesListBuilder(list).accept(new Visitor() { - public void visit(Object o) { - integer.incrementAndGet(); - } - }); - - //We just want to make sure that it visits nested objects when deserialization from json is used. - // The exact number is volatile so we just care about the minimum number of objects (list, pod and service). - Assert.assertTrue(integer.intValue() >= 3); - - - Template template = (Template) mapper.readValue(getClass().getResourceAsStream("/simple-template.json"), KubernetesResource.class); - integer.set(0); - new TemplateBuilder(template).accept(new Visitor() { - public void visit(Object o) { - integer.incrementAndGet(); - } - }); - - //We just want to make sure that it visits nested objects when deserialization from json is used. - // The exact number is volatile so we just care about the minimum number of objects (list, pod and service). - Assert.assertTrue(integer.intValue() >= 2); - - - ServiceList serviceList = (ServiceList) mapper.readValue(getClass().getResourceAsStream("/service-list.json"), KubernetesResource.class); - integer.set(0); - new ServiceListBuilder(serviceList).accept(new Visitor() { - public void visit(Object o) { - integer.incrementAndGet(); - } - }); - - //We just want to make sure that it visits nested objects when deserialization from json is used. - // The exact number is volatile so we just care about the minimum number of objects (list, pod and service). - Assert.assertTrue(integer.intValue() >= 2); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/12c0ea00/dependencies/fabric8/kubernetes-model/src/test/resources/service-list.json ---------------------------------------------------------------------- diff --git a/dependencies/fabric8/kubernetes-model/src/test/resources/service-list.json b/dependencies/fabric8/kubernetes-model/src/test/resources/service-list.json deleted file mode 100644 index ef87d15..0000000 --- a/dependencies/fabric8/kubernetes-model/src/test/resources/service-list.json +++ /dev/null @@ -1,239 +0,0 @@ -{ - "kind": "ServiceList", - "apiVersion": "v1beta3", - "metadata": { - "selfLink": "/api/v1beta3/services", - "resourceVersion": "443" - }, - "items": [ - { - "metadata": { - "name": "app-library", - "namespace": "default", - "selfLink": "/api/v1beta3/namespaces/default/services/app-library", - "uid": "d2907fce-02e4-11e5-8091-08002719a237", - "resourceVersion": "79", - "creationTimestamp": "2015-05-25T13:49:11Z", - "labels": { - "component": "AppLibrary", - "provider": "fabric8" - } - }, - "spec": { - "ports": [ - { - "name": "", - "protocol": "TCP", - "port": 80, - "targetPort": 8080 - } - ], - "selector": { - "component": "AppLibrary", - "provider": "fabric8" - }, - "portalIP": "172.30.17.111", - "sessionAffinity": "None" - }, - "status": {} - }, - { - "metadata": { - "name": "app-library-jolokia", - "namespace": "default", - "selfLink": "/api/v1beta3/namespaces/default/services/app-library-jolokia", - "uid": "d2a01536-02e4-11e5-8091-08002719a237", - "resourceVersion": "81", - "creationTimestamp": "2015-05-25T13:49:11Z" - }, - "spec": { - "ports": [ - { - "name": "", - "protocol": "TCP", - "port": 8778, - "targetPort": 8778 - } - ], - "selector": { - "component": "AppLibrary", - "provider": "fabric8" - }, - "portalIP": "172.30.17.8", - "sessionAffinity": "None" - }, - "status": {} - }, - { - "metadata": { - "name": "docker-registry", - "namespace": "default", - "selfLink": "/api/v1beta3/namespaces/default/services/docker-registry", - "uid": "d1058b17-02e4-11e5-8091-08002719a237", - "resourceVersion": "58", - "creationTimestamp": "2015-05-25T13:49:08Z", - "labels": { - "docker-registry": "default" - } - }, - "spec": { - "ports": [ - { - "name": "", - "protocol": "TCP", - "port": 5000, - "targetPort": 5000 - } - ], - "selector": { - "docker-registry": "default" - }, - "portalIP": "172.30.17.117", - "sessionAffinity": "None" - }, - "status": {} - }, - { - "metadata": { - "name": "fabric8-console-service", - "namespace": "default", - "selfLink": "/api/v1beta3/namespaces/default/services/fabric8-console-service", - "uid": "d3ec3762-02e4-11e5-8091-08002719a237", - "resourceVersion": "93", - "creationTimestamp": "2015-05-25T13:49:13Z" - }, - "spec": { - "ports": [ - { - "name": "", - "protocol": "TCP", - "port": 80, - "targetPort": 9090 - } - ], - "selector": { - "component": "fabric8Console" - }, - "portalIP": "172.30.17.249", - "sessionAffinity": "None" - }, - "status": {} - }, - { - "metadata": { - "name": "fabric8-forge", - "namespace": "default", - "selfLink": "/api/v1beta3/namespaces/default/services/fabric8-forge", - "uid": "d3615083-02e4-11e5-8091-08002719a237", - "resourceVersion": "88", - "creationTimestamp": "2015-05-25T13:49:12Z", - "labels": { - "component": "fabric8Forge", - "provider": "fabric8" - } - }, - "spec": { - "ports": [ - { - "name": "", - "protocol": "TCP", - "port": 80, - "targetPort": 8080 - } - ], - "selector": { - "component": "fabric8Forge", - "provider": "fabric8" - }, - "portalIP": "172.30.17.159", - "sessionAffinity": "None" - }, - "status": {} - }, - { - "metadata": { - "name": "kubernetes", - "namespace": "default", - "selfLink": "/api/v1beta3/namespaces/default/services/kubernetes", - "uid": "bc84b6f4-02e4-11e5-8091-08002719a237", - "resourceVersion": "5", - "creationTimestamp": "2015-05-25T13:48:34Z", - "labels": { - "component": "apiserver", - "provider": "kubernetes" - } - }, - "spec": { - "ports": [ - { - "name": "", - "protocol": "TCP", - "port": 443, - "targetPort": 443 - } - ], - "selector": null, - "portalIP": "172.30.17.2", - "sessionAffinity": "None" - }, - "status": {} - }, - { - "metadata": { - "name": "kubernetes-ro", - "namespace": "default", - "selfLink": "/api/v1beta3/namespaces/default/services/kubernetes-ro", - "uid": "bc85c655-02e4-11e5-8091-08002719a237", - "resourceVersion": "4", - "creationTimestamp": "2015-05-25T13:48:34Z", - "labels": { - "component": "apiserver", - "provider": "kubernetes" - } - }, - "spec": { - "ports": [ - { - "name": "", - "protocol": "TCP", - "port": 80, - "targetPort": 80 - } - ], - "selector": null, - "portalIP": "172.30.17.1", - "sessionAffinity": "None" - }, - "status": {} - }, - { - "metadata": { - "name": "router", - "namespace": "default", - "selfLink": "/api/v1beta3/namespaces/default/services/router", - "uid": "d0391be9-02e4-11e5-8091-08002719a237", - "resourceVersion": "52", - "creationTimestamp": "2015-05-25T13:49:07Z", - "labels": { - "router": "router" - } - }, - "spec": { - "ports": [ - { - "name": "", - "protocol": "TCP", - "port": 80, - "targetPort": 80 - } - ], - "selector": { - "router": "router" - }, - "portalIP": "172.30.17.219", - "sessionAffinity": "None" - }, - "status": {} - } - ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/12c0ea00/dependencies/fabric8/kubernetes-model/src/test/resources/simple-list.json ---------------------------------------------------------------------- diff --git a/dependencies/fabric8/kubernetes-model/src/test/resources/simple-list.json b/dependencies/fabric8/kubernetes-model/src/test/resources/simple-list.json deleted file mode 100644 index 7d0ac22..0000000 --- a/dependencies/fabric8/kubernetes-model/src/test/resources/simple-list.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1beta3", - "items": [ - { - "apiVersion": "v1beta3", - "kind": "Pod", - "metadata": { - "name": "simple-pod" - }, - "labels": { - "name": "simple-pod" - }, - "spec": { - "containers": [ - { - "name": "simple-container", - "image": "simple-image", - "resources": { - "limits": { - "cpu": "1", - "memory": "5Mi" - } - } - } - ] - } - }, - { - "apiVersion": "v1beta3", - "kind": "Service", - "metadata": { - "annotations": {}, - "labels": { - "component": "simple", - "provider": "simple", - "group": "simple" - }, - "name": "simple-service" - }, - "spec": { - "ports": [ - { - "port": 8080, - "protocol": "TCP", - "targetPort": 8181 - } - ], - "publicIPs": [], - "selector": { - "component": "simple", - "provider": "simple", - "group": "simple" - } - } - } - ] -} - - - - - - http://git-wip-us.apache.org/repos/asf/stratos/blob/12c0ea00/dependencies/fabric8/kubernetes-model/src/test/resources/simple-template.json ---------------------------------------------------------------------- diff --git a/dependencies/fabric8/kubernetes-model/src/test/resources/simple-template.json b/dependencies/fabric8/kubernetes-model/src/test/resources/simple-template.json deleted file mode 100644 index d10f517..0000000 --- a/dependencies/fabric8/kubernetes-model/src/test/resources/simple-template.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "apiVersion": "v1beta3", - "kind": "Template", - "labels": {}, - "metadata": { - "annotations": {}, - "labels": {}, - "name": "console" - }, - "objects": [ - { - "apiVersion": "v1beta3", - "kind": "Service", - "metadata": { - "annotations": {}, - "labels": { - "component": "console", - "provider": "simple" - }, - "name": "simple" - }, - "spec": { - "ports": [ - { - "port": 80, - "protocol": "TCP", - "targetPort": 9090 - } - ], - "publicIPs": ["${DOMAIN}"], - "selector": { - "component": "console", - "provider": "simple" - } - } - } - ], - "parameters": [ - { - "description": "The target port", - "name": "DOMAIN", - "value": "my.domain.org" - } - ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/12c0ea00/dependencies/fabric8/kubernetes-model/src/test/resources/valid-pod.json ---------------------------------------------------------------------- diff --git a/dependencies/fabric8/kubernetes-model/src/test/resources/valid-pod.json b/dependencies/fabric8/kubernetes-model/src/test/resources/valid-pod.json deleted file mode 100644 index 2802a24..0000000 --- a/dependencies/fabric8/kubernetes-model/src/test/resources/valid-pod.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "apiVersion":"v1beta3", - "kind": "Pod", - "metadata": { - "name": "valid-pod" - }, - "labels": { - "name": "valid-pod" - }, - "spec": { - "containers": [{ - "name": "kubernetes-serve-hostname", - "image": "gcr.io/google_containers/serve_hostname", - "resources": { - "limits": { - "cpu": "1", - "memory": "5Mi" - } - } - }] - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/12c0ea00/dependencies/fabric8/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/fabric8/pom.xml b/dependencies/fabric8/pom.xml index 1421ddf..a67c452 100644 --- a/dependencies/fabric8/pom.xml +++ b/dependencies/fabric8/pom.xml @@ -34,7 +34,6 @@ <description>Fabric8 fork</description> <modules> - <module>kubernetes-model</module> <module>kubernetes-api</module> </modules> http://git-wip-us.apache.org/repos/asf/stratos/blob/12c0ea00/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml index 838dfb3..6fde34e 100644 --- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml +++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml @@ -254,12 +254,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>kubernetes-api</artifactId> - <version>2.1.11-stratosv1</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>kubernetes-model</artifactId> - <version>2.1.11-stratosv1</version> + <version>${kubernetes.api.stratos.version}</version> </dependency> </dependencies> @@ -365,8 +360,7 @@ <bundleDef>org.apache.jclouds.api:sts:${jclouds.version}</bundleDef> <bundleDef>javax.ws.rs:jsr311-api:1.1.1</bundleDef> <bundleDef>org.apache.stratos:org.apache.stratos.messaging:${project.version}</bundleDef> - <bundleDef>org.apache.stratos:kubernetes-api:2.1.11-stratosv1</bundleDef> - <bundleDef>org.apache.stratos:kubernetes-model:2.1.11-stratosv1</bundleDef> + <bundleDef>org.apache.stratos:kubernetes-api:${kubernetes.api.stratos.version}</bundleDef> </bundles> <importBundles> </importBundles> http://git-wip-us.apache.org/repos/asf/stratos/blob/12c0ea00/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index eeffb26..8ba74d3 100644 --- a/pom.xml +++ b/pom.xml @@ -554,5 +554,7 @@ <axis2.osgi.version>1.6.1.wso2v10</axis2.osgi.version> <jclouds.version>1.8.1</jclouds.version> <project.jclouds.stratos.version>1.8.1-stratos</project.jclouds.stratos.version> + <kubernetes.api.version>2.2.16</kubernetes.api.version> + <kubernetes.api.stratos.version>2.2.16-stratosv1</kubernetes.api.stratos.version> </properties> </project>
