Repository: stratos Updated Branches: refs/heads/master 0e2bbd6da -> 06f7c9308
fixing display issue when more than one kubernetes host and renaming it to minion Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/06f7c930 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/06f7c930 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/06f7c930 Branch: refs/heads/master Commit: 06f7c9308c245748c87e9516cd8a5f834d28e408 Parents: 0e2bbd6 Author: reka <[email protected]> Authored: Wed May 20 19:08:53 2015 +0530 Committer: reka <[email protected]> Committed: Wed May 20 19:08:53 2015 +0530 ---------------------------------------------------------------------- .../console/configure_form.jag | 6 + .../default/configure/kubernetes-clusters.json | 22 +- .../schema/configure/kubernetes-clusters.json | 347 +++++-------------- 3 files changed, 93 insertions(+), 282 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/06f7c930/components/org.apache.stratos.manager.console/console/configure_form.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag index bf0e34f..dfc37e0 100644 --- a/components/org.apache.stratos.manager.console/console/configure_form.jag +++ b/components/org.apache.stratos.manager.console/console/configure_form.jag @@ -217,9 +217,15 @@ if(elements.action != 'new' && isUpdate){ case "application-policies": formDataUpdate = util.RESTCalls.getPolicyApplication(id); break; + case "kubernetes-clusters": + formDataUpdate = util.RESTCalls.getKubernetesCluster(id); + break; case "cartridges": formDataUpdate = util.RESTCalls.getCartridge(id); break; + case "cartridge-groups": + formDataUpdate = util.RESTCalls.getPolicyCartridgeGroup(id); + break; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/06f7c930/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/kubernetes-clusters.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/kubernetes-clusters.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/kubernetes-clusters.json index 6d06ce7..4c6bea7 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/kubernetes-clusters.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/kubernetes-clusters.json @@ -31,26 +31,6 @@ { "name": "prop1", "value": "val1" - }, - { - "name": "prop2", - "value": "val2" - } - ] - }, - { - "hostId": "KubHostSlave2", - "hostname": "slave2.dev.kubernetes.example.org", - "privateIPAddress": "172.17.8.102", - "publicIPAddress": "172.17.8.102", - "property": [ - { - "name": "prop1", - "value": "val1" - }, - { - "name": "prop2", - "value": "val2" } ] } @@ -65,4 +45,4 @@ "value": "val2" } ] -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/stratos/blob/06f7c930/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json index 865a0e6..615eb8f 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json @@ -11,7 +11,7 @@ "default": "KubGrp1", "required":false, "title": "Kubernetes Cluster Id", - "name": "Kubernetes Cluster Id", + "name": "Kubernetes Cluster Id" }, "description": { "type":"string", @@ -22,220 +22,6 @@ "name": "Description", "format":"textarea" }, - "kubernetesHosts": { - "type":"array", - "id": "root/kubernetesHosts", - "required":false, - "title": "Kubernetes Hosts", - "name": "Kubernetes Hosts", - "format":"tabs", - "items":[ - { - "type":"object", - "id": "root/kubernetesHosts/0", - "required":false, - "title": "Kubernetes Host", - "name": "Kubernetes Host", - "properties":{ - "hostId": { - "type":"string", - "id": "root/kubernetesHosts/0/hostId", - "default": "KubHostSlave1", - "required":false, - "title": "Host Id", - "name": "Host Id" - }, - "privateIPAddress": { - "type":"string", - "id": "root/kubernetesHosts/0/privateIPAddress", - "default": "172.17.8.101", - "required":true, - "title": "Private IP Address", - "name": "Private IP Address" - }, - "publicIPAddress": { - "type":"string", - "id": "root/kubernetesHosts/0/publicIPAddress", - "default": "172.17.8.101", - "required":false, - "title": "Public IP Address", - "name": "Public IP Address" - }, - "hostname": { - "type":"string", - "id": "root/kubernetesHosts/0/hostname", - "default": "slave1.dev.kubernetes.example.org", - "required":false, - "title": "Hostname", - "name": "Hostname" - }, - "property": { - "type":"array", - "id": "root/kubernetesHosts/0/property", - "required":false, - "title": "Property", - "name": "Property", - "format":"tabs", - "items":[ - { - "type":"object", - "id": "root/kubernetesHosts/0/property/0", - "required":false, - "title": "Property", - "name": "Property", - "properties":{ - "name": { - "type":"string", - "id": "root/kubernetesHosts/0/property/0/name", - "default": "prop1", - "required":false, - "uniqueItems": true, - "title": "Name", - "name": "Name", - }, - "value": { - "type":"string", - "id": "root/kubernetesHosts/0/property/0/value", - "default": "val1", - "required":false, - "title": "Value", - "name": "Value", - } - } - }, - { - "type":"object", - "id": "root/kubernetesHosts/0/property/1", - "required":false, - "title": "Property", - "name": "Property", - "properties":{ - "name": { - "type":"string", - "id": "root/kubernetesHosts/0/property/1/name", - "default": "prop2", - "uniqueItems": true, - "required":false, - "title": "Name", - "name": "Name", - }, - "value": { - "type":"string", - "id": "root/kubernetesHosts/0/property/1/value", - "default": "val2", - "required":false, - "title": "Value", - "name": "Value", - } - } - } - ] - } - } - }, - { - "type":"object", - "id": "root/kubernetesHosts/1", - "required":false, - "title": "Kubernetes Host", - "name": "Kubernetes Host", - "properties":{ - "hostId": { - "type":"string", - "id": "root/kubernetesHosts/1/hostId", - "default": "KubHostSlave2", - "required":false, - "title": "Host Id", - "name": "Host Id" - }, - "privateIPAddress": { - "type":"string", - "id": "root/kubernetesHosts/1/privateIPAddress", - "default": "172.17.8.102", - "required":true, - "title": "Private IP Address", - "name": "Private IP Address" - }, - "publicIPAddress": { - "type":"string", - "id": "root/kubernetesHosts/0/publicIPAddress", - "default": "172.17.8.102", - "required":false, - "title": "Public IP Address", - "name": "Public IP Address" - }, - "hostname": { - "type":"string", - "id": "root/kubernetesHosts/1/hostname", - "default": "slave2.dev.kubernetes.example.org", - "required":false, - "title": "Hostname", - "name": "Hostname" - }, - "property": { - "type":"array", - "id": "root/kubernetesHosts/1/property", - "required":false, - "title": "Property", - "name": "Property", - "format":"tabs", - "items":[ - { - "type":"object", - "id": "root/kubernetesHosts/1/property/0", - "required":false, - "title": "Property", - "name": "Property", - "properties":{ - "name": { - "type":"string", - "id": "root/kubernetesHosts/1/property/0/name", - "default": "prop1", - "required":false, - "title": "Name", - "name": "Name" - }, - "value": { - "type":"string", - "id": "root/kubernetesHosts/1/property/0/value", - "default": "val1", - "required":false, - "title": "Value", - "name": "Value" - } - } - }, - { - "type":"object", - "id": "root/kubernetesHosts/1/property/1", - "required":false, - "title": "Property", - "name": "Property", - "properties":{ - "name": { - "type":"string", - "id": "root/kubernetesHosts/1/property/1/name", - "default": "prop2", - "required":false, - "title": "Name", - "name": "Name" - }, - "value": { - "type":"string", - "id": "root/kubernetesHosts/1/property/1/value", - "default": "val2", - "required":false, - "title": "Value", - "name": "Value" - } - } - } - ] - } - } - } - ] - }, "kubernetesMaster": { "type":"object", "id": "root/kubernetesMaster", @@ -328,6 +114,74 @@ ] } } + + }, + "kubernetesHosts": { + "id": "root/kubernetesHosts", + "type": "array", + "format": "tabs", + "title": "Minions", + "items": { + "id": "root/kubernetesHosts/0", + "type": "object", + "title": "Minion", + "properties": { + "hostId": { + "type":"string", + "id": "root/kubernetesHosts/0/hostId", + "required":false, + "default": "KubHostSlave1", + "title": "Host Id" + }, + "privateIPAddress": { + "type":"string", + "id": "root/kubernetesHosts/0/privateIPAddress", + "default": "172.17.8.101", + "required":true, + "title": "Private IP Address", + "name": "Private IP Address" + }, + "publicIPAddress": { + "type":"string", + "id": "root/kubernetesHosts/0/publicIPAddress", + "default": "172.17.8.101", + "required":false, + "title": "Public IP Address", + "name": "Public IP Address" + }, + "hostname": { + "type":"string", + "id": "root/kubernetesHosts/0/hostname", + "default": "slave1.dev.kubernetes.example.org", + "required":false, + "title": "Hostname", + "name": "Hostname" + }, + "property": { + "id": "root/kubernetesHosts/0/property", + "type": "array", + "title": "Property", + "format": "tabs", + "items": { + "id": "root/kubernetesHosts/0/property/0", + "type": "object", + "title": "Property", + "properties": { + "name": { + "id": "root/kubernetesHosts/0/property/0/name", + "title": "Name", + "type": "string" + }, + "value": { + "id": "root/kubernetesHosts/0/property/0/value", + "title": "Value", + "type": "string" + } + } + } + } + } + } }, "portRange": { "type":"object", @@ -356,56 +210,27 @@ } }, "property": { - "type":"array", "id": "root/property", - "required":false, + "type": "array", "title": "Property", - "name": "Property", - "format":"tabs", - "items":[ - { - "type":"object", - "id": "root/property/0", - "required":false, - "title": "Property", - "name": "Property", - "properties":{ - "name": { - "type":"string", - "id": "root/property/0/name", - "default": "prop1", - "required":false - }, - "value": { - "type":"string", - "id": "root/property/0/value", - "default": "val1", - "required":false - } - } - }, - { - "type":"object", - "id": "root/property/1", - "required":false, - "title": "Property", - "name": "Property", - "properties":{ - "name": { - "type":"string", - "id": "root/property/1/name", - "default": "prop2", - "required":false - }, - "value": { - "type":"string", - "id": "root/property/1/value", - "default": "val2", - "required":false - } + "format": "tabs", + "items": { + "id": "root/property/0", + "type": "object", + "title": "Property", + "properties": { + "name": { + "id": "root/property/0/name", + "title": "Name", + "type": "string" + }, + "value": { + "id": "root/property/0/value", + "title": "Value", + "type": "string" } } - ] + } } } }
