You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/05/20 11:29:44 UTC
[1/2] stratos git commit: Renaming docker to kubernetes-clusters and
other configuration URLs with dash separator in the UI
Repository: stratos
Updated Branches:
refs/heads/master 1e7e30065 -> 11bc6bb33
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/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
new file mode 100644
index 0000000..865a0e6
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json
@@ -0,0 +1,411 @@
+{
+ "type":"object",
+ "$schema": "http://json-schema.org/draft-04/schema",
+ "id": "root",
+ "title": "Kubernetes Definition",
+ "name": "Kubernetes",
+ "properties":{
+ "clusterId": {
+ "type":"string",
+ "id": "root/clusterId",
+ "default": "KubGrp1",
+ "required":false,
+ "title": "Kubernetes Cluster Id",
+ "name": "Kubernetes Cluster Id",
+ },
+ "description": {
+ "type":"string",
+ "id": "root/description",
+ "default": "Kubernetes CoreOS cluster on EC2 ",
+ "required":false,
+ "title": "Description",
+ "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",
+ "required":false,
+ "title": "Kubernetes Master",
+ "name": "Kubernetes Master",
+ "properties":{
+ "hostId": {
+ "type":"string",
+ "id": "root/kubernetesMaster/hostId",
+ "default": "KubHostMaster1",
+ "required":false,
+ "title": "Host Id",
+ "name": "Host Id"
+ },
+ "privateIPAddress": {
+ "type":"string",
+ "id": "root/kubernetesMaster/privateIPAddress",
+ "default": "172.17.8.100",
+ "required":true,
+ "title": "Private IP Address",
+ "name": "Private IP Address"
+ },
+ "publicIPAddress": {
+ "type":"string",
+ "id": "root/kubernetesMaster/publicIPAddress",
+ "default": "172.17.8.100",
+ "required":false,
+ "title": "Public IP Address",
+ "name": "Public IP Address"
+ },
+ "hostname": {
+ "type":"string",
+ "id": "root/kubernetesMaster/hostname",
+ "default": "master.dev.kubernetes.example.org",
+ "required":false,
+ "title": "Hostname",
+ "name": "Hostname"
+ },
+ "property": {
+ "type":"array",
+ "id": "root/kubernetesMaster/property",
+ "required":false,
+ "title": "Property",
+ "name": "Property",
+ "format":"tabs",
+ "items":[
+ {
+ "type":"object",
+ "id": "root/kubernetesMaster/property/0",
+ "required":false,
+ "title": "Property",
+ "name": "Property",
+ "properties":{
+ "name": {
+ "type":"string",
+ "id": "root/kubernetesMaster/property/0/name",
+ "default": "prop1",
+ "required":false
+ },
+ "value": {
+ "type":"string",
+ "id": "root/kubernetesMaster/property/0/value",
+ "default": "val1",
+ "required":false
+ }
+ }
+ },
+ {
+ "type":"object",
+ "id": "root/kubernetesMaster/property/1",
+ "required":false,
+ "title": "Property",
+ "name": "Property",
+ "properties":{
+ "name": {
+ "type":"string",
+ "id": "root/kubernetesMaster/property/1/name",
+ "default": "prop2",
+ "required":false
+ },
+ "value": {
+ "type":"string",
+ "id": "root/kubernetesMaster/property/1/value",
+ "default": "val2",
+ "required":false
+ }
+ }
+ }
+ ]
+ }
+ }
+ },
+ "portRange": {
+ "type":"object",
+ "id": "root/portRange",
+ "required":false,
+ "title": "Port Range",
+ "name": "Port Range",
+ "format":"grid",
+ "properties":{
+ "lower": {
+ "type":"string",
+ "id": "root/portRange/lower",
+ "default": "4500",
+ "title": "Lower",
+ "name": "Lower",
+ "required":false
+ },
+ "upper": {
+ "type":"string",
+ "id": "root/portRange/upper",
+ "default": "5000",
+ "title": "Upper",
+ "name": "Upper",
+ "required":false
+ }
+ }
+ },
+ "property": {
+ "type":"array",
+ "id": "root/property",
+ "required":false,
+ "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
+ }
+ }
+ }
+ ]
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json
new file mode 100644
index 0000000..22d781a
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json
@@ -0,0 +1,94 @@
+{
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "id": "root",
+ "type": "object",
+ "title": "Network Partition Definition",
+ "name": "Network Partition Policy",
+ "options": {
+ "disable_properties": true,
+ "disable_collapse": true
+ },
+ "properties": {
+ "id": {
+ "id": "root/id",
+ "type": "string",
+ "title": "Network Partition Id"
+ },
+ "provider": {
+ "id": "root/provider",
+ "type": "string",
+ "title": "Network Partition provider",
+ "enum": ["mock", "ec2", "openstack", "kubernetes", "gce"]
+ },
+ "partitions": {
+ "id": "root/partitions",
+ "type": "array",
+ "format": "tabs",
+ "title": "Partitions",
+ "items": {
+ "id": "root/partitions/0",
+ "type": "object",
+ "title": "Partition",
+ "properties": {
+ "id": {
+ "id": "root/partitions/0/id",
+ "type": "string",
+ "title": "Partition Id"
+ },
+ "property": {
+ "id": "root/partitions/0/property",
+ "type": "array",
+ "title": "Property",
+ "format": "tabs",
+ "items": {
+ "id": "root/partitions/0/property/0",
+ "type": "object",
+ "title": "Property",
+ "properties": {
+ "name": {
+ "id": "root/partitions/0/property/0/name",
+ "title": "Name",
+ "type": "string"
+ },
+ "value": {
+ "id": "root/partitions/0/property/0/value",
+ "title": "Value",
+ "type": "string"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "properties": {
+ "id": "root/properties",
+ "type": "array",
+ "title": "Properties",
+ "format": "tabs",
+ "items": {
+ "id": "root/properties/0",
+ "type": "object",
+ "title": "Property",
+ "properties": {
+ "name": {
+ "id": "root/properties/0/name",
+ "title": "Name",
+ "type": "string"
+ },
+ "value": {
+ "id": "root/properties/0/value",
+ "title": "Value",
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
+
+ "required": [
+ "id",
+ "partitions",
+ "provider"
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/networkpartitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/networkpartitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/networkpartitions.json
deleted file mode 100644
index 22d781a..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/networkpartitions.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "id": "root",
- "type": "object",
- "title": "Network Partition Definition",
- "name": "Network Partition Policy",
- "options": {
- "disable_properties": true,
- "disable_collapse": true
- },
- "properties": {
- "id": {
- "id": "root/id",
- "type": "string",
- "title": "Network Partition Id"
- },
- "provider": {
- "id": "root/provider",
- "type": "string",
- "title": "Network Partition provider",
- "enum": ["mock", "ec2", "openstack", "kubernetes", "gce"]
- },
- "partitions": {
- "id": "root/partitions",
- "type": "array",
- "format": "tabs",
- "title": "Partitions",
- "items": {
- "id": "root/partitions/0",
- "type": "object",
- "title": "Partition",
- "properties": {
- "id": {
- "id": "root/partitions/0/id",
- "type": "string",
- "title": "Partition Id"
- },
- "property": {
- "id": "root/partitions/0/property",
- "type": "array",
- "title": "Property",
- "format": "tabs",
- "items": {
- "id": "root/partitions/0/property/0",
- "type": "object",
- "title": "Property",
- "properties": {
- "name": {
- "id": "root/partitions/0/property/0/name",
- "title": "Name",
- "type": "string"
- },
- "value": {
- "id": "root/partitions/0/property/0/value",
- "title": "Value",
- "type": "string"
- }
- }
- }
- }
- }
- }
- },
- "properties": {
- "id": "root/properties",
- "type": "array",
- "title": "Properties",
- "format": "tabs",
- "items": {
- "id": "root/properties/0",
- "type": "object",
- "title": "Property",
- "properties": {
- "name": {
- "id": "root/properties/0/name",
- "title": "Name",
- "type": "string"
- },
- "value": {
- "id": "root/properties/0/value",
- "title": "Value",
- "type": "string"
- }
- }
- }
- }
- },
-
- "required": [
- "id",
- "partitions",
- "provider"
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json
index c7dff7d..511890f 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json
@@ -7,10 +7,10 @@
"title": "Configurations",
"icon": "fa-gears",
"permissionPaths": ["/permission", "/permission/admin"],
- "description": "Configure Auto-scaling policies, cartridges and manage docker groups",
+ "description": "Configure network partitions, policies, cartridges, cartridge groups and kubernetes clusters",
"sub-menu": [
{
- "link": "configure/networkpartitions/",
+ "link": "configure/network-partitions/",
"linkexternal": false,
"context": "/configure",
"title": "Network Partitions",
@@ -19,7 +19,7 @@
"description": "Manage network partitions."
},
{
- "link": "configure/autoscalingpolicies/",
+ "link": "configure/autoscaling-policies/",
"linkexternal": false,
"context": "/configure",
"title": "Autoscaling Policies",
@@ -28,7 +28,7 @@
"description": "Manage policies which specify autoscaling threshold values."
},
{
- "link": "configure/deploymentpolicies/",
+ "link": "configure/deployment-policies/",
"linkexternal": false,
"context": "/configure",
"title": "Deployment Policies",
@@ -37,7 +37,7 @@
"description": "Manage policies which specify cartridge deployment in partitions."
},
{
- "link": "configure/applicationpolicies/",
+ "link": "configure/application-policies/",
"linkexternal": false,
"context": "/configure",
"title": "Application Policies",
@@ -55,7 +55,7 @@
"description": "Manage single-tenant & multi-tenant cartridges."
},
{
- "link": "configure/cartridgegroups/",
+ "link": "configure/cartridge-groups/",
"linkexternal": false,
"context": "/configure",
"title": "Cartridge Groups",
@@ -64,7 +64,7 @@
"description": "Manage cartridge groups"
},
{
- "link": "configure/kubernetesClusters/",
+ "link": "configure/kubernetes-clusters/",
"linkexternal": false,
"context": "/configure",
"title": "Kubernetes Clusters",
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag
index 1ba0997..1be2708 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag
@@ -29,9 +29,9 @@ var log = new Log("apachestratos.configure_request"),
include('/controllers/login/validator.jag');
try {
- if(formtype == 'networkpartitions'){
+ if(formtype == 'network-partitions'){
formSubmit = util.RESTCalls.deployPartitionDefinition(formPayload);
- }else if(formtype == 'autoscalingpolicies'){
+ }else if(formtype == 'autoscaling-policies'){
formSubmit = util.RESTCalls.deployAutoscalePolicyDefinition(formPayload);
}else if(formtype == 'deployments'){
formSubmit = util.RESTCalls.deployDeploymentPolicyDefinition(formPayload);
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
index 5e85795..bd3ebce 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
@@ -916,7 +916,7 @@ $(document).ready(function(){
}
cartridgeBlockTemplate['properties']['subscribableInfo']['properties']['autoscalingPolicy']['enum']
=policiesEnum;
- //get list of deploymentpolicies
+ //get list of deployment-policies
var dpolicies = editorDeploymentPolicies;
var dpoliciesEnum = [];
for(var i=0; i<dpolicies.length; i++){
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js
index 4f3712d..c7898e1 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js
@@ -424,7 +424,7 @@ $(document).ready(function(){
$('#deploy').on('click', function(){
var payload = genGroupJSON({}, jsPlumb.getConnections());
var btn = $(this);
- var formtype = 'cartridgegroups';
+ var formtype = 'cartridge-groups';
btn.html("<i class='fa fa-spinner fa-spin'></i> Adding...");
$.ajax({
type: "POST",
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
index 9cbdea5..4c44222 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
@@ -142,7 +142,7 @@
{{/if}}
<div class="row general-table row-overide">
- {{#ifCond formtype "==" "docker"}}
+ {{#ifCond formtype "==" "kubernetes-clusters"}}
{{#each content_body.sections}}
<div class="block col-md-4 grid-group-item border-right">
<div class="toggle-menu-icon">
@@ -155,10 +155,10 @@
<button class="btn btn-danger btn-lg hover-delete" type="button"
id="{{clusterId}}" data-formtype="delete-kubernetes-cluster"> Delete</button>
<button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/docker/{{clusterId}}/edit" > Edit
+ data-url="{{url ""}}/configure/kubernetes-clusters/{{clusterId}}/edit" > Edit
</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/docker/{{clusterId}}/" > Details
+ data-url="{{url ""}}/configure/kubernetes-clusters/{{clusterId}}/" > Details
</button>
</div>
<div class="bottom-bar-wrapper">
@@ -166,10 +166,10 @@
<button class="btn btn-danger btn-lg hover-delete" type="button"
id="{{clusterId}}" data-formtype="delete-kubernetes-cluster"> Delete</button>
<button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/docker/{{clusterId}}/edit" > Edit
+ data-url="{{url ""}}/configure/kubernetes-clusters/{{clusterId}}/edit" > Edit
</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
- data-url="{{url ""}}/configure/docker/{{clusterId}}/" > Details
+ data-url="{{url ""}}/configure/kubernetes-clusters/{{clusterId}}/" > Details
</button>
</div>
</div>
@@ -212,7 +212,7 @@
</div>
{{/each}}
{{/ifCond}}
- {{#ifCond formtype "==" "autoscalingpolicies"}}
+ {{#ifCond formtype "==" "autoscaling-policies"}}
{{#each content_body.sections}}
<div class="block col-md-4 col-xs-4 grid-group-item border-right">
<div class="toggle-menu-icon">
@@ -223,30 +223,30 @@
<div class="toggle-menu-description">{{description}}</div>
<div class="list-button" style="display: none;">
<button class="btn btn-danger btn-lg hover-delete" type="button"
- id="{{id}}" data-formtype="delete-autoscalingpolicy"> Delete</button>
+ id="{{id}}" data-formtype="delete-autoscaling-policy"> Delete</button>
<button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/edit" > Edit
+ data-url="{{url ""}}/configure/autoscaling-policies/{{id}}/edit" > Edit
</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/" > Details
+ data-url="{{url ""}}/configure/autoscaling-policies/{{id}}/" > Details
</button>
</div>
<div class="bottom-bar-wrapper">
<div class="bottom-bar">
<button class="btn btn-danger btn-lg hover-delete" type="button"
- id="{{id}}" data-formtype="delete-autoscalingpolicy"> Delete</button>
+ id="{{id}}" data-formtype="delete-autoscaling-policy"> Delete</button>
<button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/edit" > Edit
+ data-url="{{url ""}}/configure/autoscaling-policies/{{id}}/edit" > Edit
</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
- data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/" > Details
+ data-url="{{url ""}}/configure/autoscaling-policies/{{id}}/" > Details
</button>
</div>
</div>
</div>
{{/each}}
{{/ifCond}}
- {{#ifCond formtype "==" "networkpartitions"}}
+ {{#ifCond formtype "==" "network-partitions"}}
{{#each content_body.sections}}
<div class="block col-md-4 col-xs-4 grid-group-item border-right">
<div class="toggle-menu-icon">
@@ -257,30 +257,30 @@
<div class="toggle-menu-description">{{description}}</div>
<div class="list-button" style="display: none;">
<button class="btn btn-danger btn-lg hover-delete" type="button"
- id="{{id}}" data-formtype="delete-networkpartitions"> Delete</button>
+ id="{{id}}" data-formtype="delete-network-partitions"> Delete</button>
<button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/networkpartitions/{{id}}/edit" > Edit
+ data-url="{{url ""}}/configure/network-partitions/{{id}}/edit" > Edit
</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/networkpartitions/{{id}}/" > Details
+ data-url="{{url ""}}/configure/network-partitions/{{id}}/" > Details
</button>
</div>
<div class="bottom-bar-wrapper">
<div class="bottom-bar">
<button class="btn btn-danger btn-lg hover-delete" type="button"
- id="{{id}}" data-formtype="delete-networkpartitions"> Delete</button>
+ id="{{id}}" data-formtype="delete-network-partitions"> Delete</button>
<button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/networkpartitions/{{id}}/edit" > Edit
+ data-url="{{url ""}}/configure/network-partitions/{{id}}/edit" > Edit
</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
- data-url="{{url ""}}/configure/networkpartitions/{{id}}/" > Details
+ data-url="{{url ""}}/configure/network-partitions/{{id}}/" > Details
</button>
</div>
</div>
</div>
{{/each}}
{{/ifCond}}
- {{#ifCond formtype "==" "deploymentpolicies"}}
+ {{#ifCond formtype "==" "deployment-policies"}}
{{#each content_body.sections}}
<div class="block col-md-4 col-xs-4 grid-group-item border-right">
<div class="toggle-menu-icon">
@@ -291,30 +291,30 @@
<div class="toggle-menu-description">{{description}}</div>
<div class="list-button" style="display: none;">
<button class="btn btn-danger btn-lg hover-delete" type="button"
- id="{{id}}" data-formtype="delete-deploymentpolicy"> Delete</button>
+ id="{{id}}" data-formtype="delete-deployment-policy"> Delete</button>
<button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/deploymentpolicies/{{id}}/edit" > Edit
+ data-url="{{url ""}}/configure/deployment-policies/{{id}}/edit" > Edit
</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/deploymentpolicies/{{id}}/" > Details
+ data-url="{{url ""}}/configure/deployment-policies/{{id}}/" > Details
</button>
</div>
<div class="bottom-bar-wrapper">
<div class="bottom-bar">
<button class="btn btn-danger btn-lg hover-delete" type="button"
- id="{{id}}" data-formtype="delete-deploymentpolicy"> Delete</button>
+ id="{{id}}" data-formtype="delete-deployment-policy"> Delete</button>
<button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/deploymentpolicies/{{id}}/edit" > Edit
+ data-url="{{url ""}}/configure/deployment-policies/{{id}}/edit" > Edit
</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
- data-url="{{url ""}}/configure/deploymentpolicies/{{id}}/" > Details
+ data-url="{{url ""}}/configure/deployment-policies/{{id}}/" > Details
</button>
</div>
</div>
</div>
{{/each}}
{{/ifCond}}
- {{#ifCond formtype "==" "applicationpolicies"}}
+ {{#ifCond formtype "==" "application-policies"}}
{{#each content_body.sections}}
<div class="block col-md-4 grid-group-item border-right">
<div class="toggle-menu-icon">
@@ -325,30 +325,30 @@
<div class="toggle-menu-description">{{description}} </div>
<div class="list-button" style="display: none;">
<button class="btn btn-danger btn-lg hover-delete" type="button"
- id="{{id}}" data-formtype="delete-applicationpolicies"> Delete</button>
+ id="{{id}}" data-formtype="delete-application-policies"> Delete</button>
<button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/applicationpolicies/{{id}}/edit" > Edit
+ data-url="{{url ""}}/configure/application-policies/{{id}}/edit" > Edit
</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/applicationpolicies/{{id}}/" > Details
+ data-url="{{url ""}}/configure/application-policies/{{id}}/" > Details
</button>
</div>
<div class="bottom-bar-wrapper">
<div class="bottom-bar">
<button class="btn btn-danger btn-lg hover-delete" type="button"
- id="{{id}}" data-formtype="delete-applicationpolicies"> Delete</button>
+ id="{{id}}" data-formtype="delete-application-policies"> Delete</button>
<button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/applicationpolicies/{{id}}/edit" > Edit
+ data-url="{{url ""}}/configure/application-policies/{{id}}/edit" > Edit
</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
- data-url="{{url ""}}/configure/applicationpolicies/{{id}}/" > Details
+ data-url="{{url ""}}/configure/application-policies/{{id}}/" > Details
</button>
</div>
</div>
</div>
{{/each}}
{{/ifCond}}
- {{#ifCond formtype "==" "cartridgegroups"}}
+ {{#ifCond formtype "==" "cartridge-groups"}}
{{#each content_body.sections}}
<div class="block col-md-4 grid-group-item border-right">
<div class="toggle-menu-icon">
@@ -359,17 +359,17 @@
<div class="toggle-menu-description">{{description}} </div>
<div class="list-button" style="display: none;">
<button class="btn btn-danger btn-lg hover-delete" type="button"
- id="{{name}}" data-formtype="delete-cartridgegroups"> Delete</button>
+ id="{{name}}" data-formtype="delete-cartridge-groups"> Delete</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{name}}"
- data-url="{{url ""}}/configure/cartridgegroups/{{name}}/" > Details
+ data-url="{{url ""}}/configure/cartridge-groups/{{name}}/" > Details
</button>
</div>
<div class="bottom-bar-wrapper">
<div class="bottom-bar">
<button class="btn btn-danger btn-lg hover-delete" type="button"
- id="{{name}}" data-formtype="delete-cartridgegroups"> Delete</button>
+ id="{{name}}" data-formtype="delete-cartridge-groups"> Delete</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_{{name}}"
- data-url="{{url ""}}/configure/cartridgegroups/{{name}}/" > Details
+ data-url="{{url ""}}/configure/cartridge-groups/{{name}}/" > Details
</button>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/themes/theme0/partials/wizard.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/wizard.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/wizard.hbs
index 540bfd8..366f7cb 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/wizard.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/wizard.hbs
@@ -32,7 +32,7 @@
<div class="row title">
<a type="button" class="btn btn-primary btn-lg" href="{{url ""}}/wizard/vm/">Virtual Machine</a>
<span>Or</span>
- <a type="button" class="btn btn-primary btn-lg" href="{{url ""}}/wizard/docker/">Docker</a>
+ <a type="button" class="btn btn-primary btn-lg" href="{{url ""}}/wizard/kubernetes-clusters/">Kubernetes Cluster</a>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/wizard.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/wizard.jag b/components/org.apache.stratos.manager.console/console/wizard.jag
index 4db2b76..6ccc06f 100644
--- a/components/org.apache.stratos.manager.console/console/wizard.jag
+++ b/components/org.apache.stratos.manager.console/console/wizard.jag
@@ -43,15 +43,15 @@ if(elements==null){
}
var vm = {
- '1':'networkpartitions',
- '2':'autoscalingpolicies',
+ '1':'network-partitions',
+ '2':'autoscaling-policies',
'3':'deployments',
'4':'loadbalancer',
'5':'cartridges' ,
'6':'multitenant'
};
-var docker = [
- 'autoscalingpolicies',
+var kubernetesClusters = [
+ 'autoscaling-policies',
'deployments',
'loadbalancer',
'cartridges' ,
[2/2] stratos git commit: Renaming docker to kubernetes-clusters and
other configuration URLs with dash separator in the UI
Posted by im...@apache.org.
Renaming docker to kubernetes-clusters and other configuration URLs with dash separator in the UI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/11bc6bb3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/11bc6bb3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/11bc6bb3
Branch: refs/heads/master
Commit: 11bc6bb33d8c6c4c4cbe46c69acaae51864da072
Parents: 1e7e300
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed May 20 14:59:33 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed May 20 14:59:33 2015 +0530
----------------------------------------------------------------------
.../console/configure_form.jag | 34 +-
.../configure/configure_requests.jag | 32 +-
.../default/configure/application-policies.json | 17 +
.../default/configure/applicationpolicies.json | 17 -
.../default/configure/autoscaling-policies.json | 15 +
.../default/configure/autoscalingpolicies.json | 15 -
.../default/configure/cartridge-groups.json | 9 +
.../default/configure/cartridgegroups.json | 9 -
.../default/configure/deployment-policies.json | 15 +
.../default/configure/deploymentpolicies.json | 15 -
.../forms/default/configure/docker.json | 68 ---
.../default/configure/kubernetes-clusters.json | 68 +++
.../default/configure/network-partitions.json | 17 +
.../default/configure/networkpartitions.json | 17 -
.../schema/configure/application-policies.json | 86 ++++
.../schema/configure/applicationpolicies.json | 86 ----
.../schema/configure/autoscaling-policies.json | 118 ++++++
.../schema/configure/autoscalingpolicies.json | 118 ------
.../schema/configure/cartridge-groups.json | 46 +++
.../forms/schema/configure/cartridgegroups.json | 46 ---
.../schema/configure/deployment-policies.json | 71 ++++
.../schema/configure/deploymentpolicies.json | 71 ----
.../forms/schema/configure/docker.json | 411 -------------------
.../schema/configure/kubernetes-clusters.json | 411 +++++++++++++++++++
.../schema/configure/network-partitions.json | 94 +++++
.../schema/configure/networkpartitions.json | 94 -----
.../console/controllers/menu/menu.json | 14 +-
.../controllers/wizard/wizard_requests.jag | 4 +-
.../theme0/js/custom/applications-editor.js | 2 +-
.../js/custom/applications_group_editor.js | 2 +-
.../themes/theme0/partials/configure_form.hbs | 76 ++--
.../console/themes/theme0/partials/wizard.hbs | 2 +-
.../console/wizard.jag | 8 +-
33 files changed, 1054 insertions(+), 1054 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/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 00a760e..bf0e34f 100644
--- a/components/org.apache.stratos.manager.console/console/configure_form.jag
+++ b/components/org.apache.stratos.manager.console/console/configure_form.jag
@@ -71,7 +71,7 @@ if (!elements) {
error.push({"errorMessage": e.message});
}
- if (elements.formtype == 'cartridgegroups' && elements.action == 'new') {
+ if (elements.formtype == 'cartridge-groups' && elements.action == 'new') {
applicationHbs = 'applicationsGroupEditor';
editorCartridges = util.RESTCalls.getCartridges();
}
@@ -84,7 +84,7 @@ if(isEdit == false && elements.action != 'new') {
switch (formtype) {
- case "networkpartitions":
+ case "network-partitions":
formTitle = "Network Partition",
buttonText = "Network Partition";
list_data = util.RESTCalls.getPartitions();
@@ -93,7 +93,7 @@ if(isEdit == false && elements.action != 'new') {
}
break;
- case "autoscalingpolicies":
+ case "autoscaling-policies":
formTitle = "Auto-scaling Policie",
buttonText = "Auto-scaling Policy";
list_data = util.RESTCalls.getPolicyAutoScales();
@@ -102,7 +102,7 @@ if(isEdit == false && elements.action != 'new') {
}
break;
- case "deploymentpolicies":
+ case "deployment-policies":
formTitle = "Deployment Policie",
buttonText = "Deployment Policy";
list_data = util.RESTCalls.getPolicyDeployments();
@@ -120,7 +120,7 @@ if(isEdit == false && elements.action != 'new') {
}
break;
- case "cartridgegroups":
+ case "cartridge-groups":
formTitle = "Cartridge Group Definition",
buttonText = "Cartridge Group Definition";
list_data = util.RESTCalls.getGroups();
@@ -129,7 +129,7 @@ if(isEdit == false && elements.action != 'new') {
}
break;
- case "docker":
+ case "kubernetes-clusters":
formTitle = "Kubernetes Cluster",
buttonText = "Kubernetes Cluster";
list_data = util.RESTCalls.getKubernetesClusters();
@@ -138,7 +138,7 @@ if(isEdit == false && elements.action != 'new') {
}
break;
- case "applicationpolicies":
+ case "application-policies":
formTitle = "Application Policy Definition",
buttonText = "Application Policy Definition";
list_data = util.RESTCalls.getApplicationPolicies();
@@ -167,14 +167,14 @@ if (elements.action != 'new' && isEdit) {
id = escape(elements.action);
switch (formtype) {
- case "autoscalingpolicies":
+ case "autoscaling-policies":
formDataEdit = util.RESTCalls.getPolicyAutoScale(id);
break;
- case "deploymentpolicies":
+ case "deployment-policies":
formDataEdit = util.RESTCalls.getPolicyDeployment(id);
break;
- case "networkpartitions":
+ case "network-partitions":
formDataEdit = util.RESTCalls.getPartition(id);
break;
@@ -182,15 +182,15 @@ if (elements.action != 'new' && isEdit) {
formDataEdit = util.RESTCalls.getCartridge(id);
break;
- case "cartridgegroups":
+ case "cartridge-groups":
formDataEdit = util.RESTCalls.getPolicyCartridgeGroup(id);
break;
- case "docker":
+ case "kubernetes-clusters":
formDataEdit = util.RESTCalls.getKubernetesCluster(id);
break;
- case "applicationpolicies":
+ case "application-policies":
formDataEdit = util.RESTCalls.getPolicyApplication(id);
break;
}
@@ -205,16 +205,16 @@ if(elements.action != 'new' && isUpdate){
id = escape(elements.action);
switch (formtype) {
- case "networkpartitions":
+ case "network-partitions":
formDataUpdate = util.RESTCalls.getPartition(id);
break;
- case "autoscalingpolicies":
+ case "autoscaling-policies":
formDataUpdate = util.RESTCalls.getPolicyAutoScale(id);
break;
- case "deploymentpolicies":
+ case "deployment-policies":
formDataUpdate = util.RESTCalls.getPolicyDeployment(id);
break;
- case "applicationpolicies":
+ case "application-policies":
formDataUpdate = util.RESTCalls.getPolicyApplication(id);
break;
case "cartridges":
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
index 5756ecc..0444a01 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
@@ -30,46 +30,46 @@ include('/controllers/login/validator.jag');
try {
switch (formtype) {
- case "networkpartitions":
+ case "network-partitions":
formSubmit = util.RESTCalls.deployPartitionDefinition(formPayload);
break;
- case "autoscalingpolicies":
+ case "autoscaling-policies":
formSubmit = util.RESTCalls.deployAutoscalePolicyDefinition(formPayload);
break;
- case "deploymentpolicies":
+ case "deployment-policies":
formSubmit = util.RESTCalls.deployDeploymentPolicyDefinition(formPayload);
break;
case "cartridges":
formSubmit = util.RESTCalls.deployCartridgeDefinition(formPayload);
break;
- case "cartridgegroups":
+ case "cartridge-groups":
formSubmit = util.RESTCalls.deployGroupDefinition(formPayload);
break;
- case "docker":
+ case "kubernetes-clusters":
formSubmit = util.RESTCalls.deployKubernetesClusterDefinition(formPayload);
break;
- case "applicationpolicies":
+ case "application-policies":
formSubmit = util.RESTCalls.deployApplicationPolicyDefinition(formPayload);
break;
- case "update-cartridgegroups":
+ case "update-cartridge-groups":
formSubmit = util.RESTCalls.updateGroupDefinition(formPayload);
break;
- case "delete-cartridgegroups":
+ case "delete-cartridge-groups":
formSubmit = util.RESTCalls.deleteGroup(formPayload);
break;
- case "delete-applicationpolicies":
+ case "delete-application-policies":
formSubmit = util.RESTCalls.deleteApplicationPolicyDefinition(formPayload);
break;
- case "delete-networkpartitions":
+ case "delete-network-partitions":
formSubmit = util.RESTCalls.deletePartiions(formPayload);
break;
case "delete-cartridge":
formSubmit = util.RESTCalls.deleteCartridgeDefinition(formPayload);
break;
- case "delete-autoscalingpolicy":
+ case "delete-autoscaling-policy":
formSubmit = util.RESTCalls.deleteAutoscalePolicyDefinition(formPayload);
break;
- case "delete-deploymentpolicy":
+ case "delete-deployment-policy":
formSubmit = util.RESTCalls.deleteDeploymentPolicyDefinition(formPayload);
break;
case "update-kubernetes-cluster":
@@ -78,16 +78,16 @@ try {
case "delete-kubernetes-cluster":
formSubmit = util.RESTCalls.deleteKubernetesClusterDefinition(formPayload);
break;
- case "update-networkpartitions":
+ case "update-network-partitions":
formSubmit = util.RESTCalls.updatePartitionDefinition(formPayload);
break;
- case "update-autoscalingpolicies":
+ case "update-autoscaling-policies":
formSubmit = util.RESTCalls.updateAutoscalePolicyDefinition(formPayload);
break;
- case "update-deploymentpolicies":
+ case "update-deployment-policies":
formSubmit = util.RESTCalls.updateDeploymentPolicyDefinition(formPayload);
break;
- case "update-applicationpolicies":
+ case "update-application-policies":
formSubmit = util.RESTCalls.updateApplicationPolicyDefinition(formPayload);
break;
case "update-cartridges":
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json
new file mode 100644
index 0000000..a0c18ee
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json
@@ -0,0 +1,17 @@
+{
+ "id": "application-policy-1",
+ "algorithm":"one-after-another",
+ "networkPartitions":[
+ "network-partition-1"
+ ],
+ "properties":[
+ {
+ "name": "key-1",
+ "value": "value-1"
+ },
+ {
+ "name": "key-2",
+ "value": "value-2"
+ }
+ ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/applicationpolicies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/applicationpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/applicationpolicies.json
deleted file mode 100644
index a0c18ee..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/applicationpolicies.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "id": "application-policy-1",
- "algorithm":"one-after-another",
- "networkPartitions":[
- "network-partition-1"
- ],
- "properties":[
- {
- "name": "key-1",
- "value": "value-1"
- },
- {
- "name": "key-2",
- "value": "value-2"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscaling-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscaling-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscaling-policies.json
new file mode 100644
index 0000000..29c755f
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscaling-policies.json
@@ -0,0 +1,15 @@
+{
+ "id": "economy",
+ "description":"autoscale policy description",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "threshold": 30
+ },
+ "memoryConsumption": {
+ "threshold": 80
+ },
+ "loadAverage": {
+ "threshold": 100
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscalingpolicies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscalingpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscalingpolicies.json
deleted file mode 100644
index 29c755f..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscalingpolicies.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "economy",
- "description":"autoscale policy description",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 30
- },
- "memoryConsumption": {
- "threshold": 80
- },
- "loadAverage": {
- "threshold": 100
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridge-groups.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridge-groups.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridge-groups.json
new file mode 100644
index 0000000..4156f39
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridge-groups.json
@@ -0,0 +1,9 @@
+{
+ "name": "group1",
+ "cartridges": [
+ "tomcat"
+ ],
+ "dependencies": {
+ "terminationBehaviour": "terminate-none"
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridgegroups.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridgegroups.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridgegroups.json
deleted file mode 100644
index 4156f39..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridgegroups.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "name": "group1",
- "cartridges": [
- "tomcat"
- ],
- "dependencies": {
- "terminationBehaviour": "terminate-none"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deployment-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deployment-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deployment-policies.json
new file mode 100644
index 0000000..f749ab4
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deployment-policies.json
@@ -0,0 +1,15 @@
+{
+ "id": "deployment-policy-1",
+ "networkPartitions": [
+ {
+ "id": "network-partition-1",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "partitionMax": 5
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deploymentpolicies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deploymentpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deploymentpolicies.json
deleted file mode 100644
index f749ab4..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deploymentpolicies.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "deployment-policy-1",
- "networkPartitions": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "partitionMax": 5
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/docker.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/docker.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/docker.json
deleted file mode 100644
index 6d06ce7..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/docker.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- "clusterId": "KubGrp1",
- "description": "Kubernetes CoreOS cluster on EC2 ",
- "kubernetesMaster": {
- "hostId": "KubHostMaster1",
- "hostname": "master.dev.kubernetes.example.org",
- "privateIPAddress": "172.17.8.100",
- "publicIPAddress": "172.17.8.100",
- "property": [
- {
- "name": "prop1",
- "value": "val1"
- },
- {
- "name": "prop2",
- "value": "val2"
- }
- ]
- },
- "portRange": {
- "upper": "5000",
- "lower": "4500"
- },
- "kubernetesHosts": [
- {
- "hostId": "KubHostSlave1",
- "hostname": "slave1.dev.kubernetes.example.org",
- "privateIPAddress": "172.17.8.101",
- "publicIPAddress": "172.17.8.101",
- "property": [
- {
- "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"
- }
- ]
- }
- ],
- "property": [
- {
- "name": "prop1",
- "value": "val1"
- },
- {
- "name": "prop2",
- "value": "val2"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/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
new file mode 100644
index 0000000..6d06ce7
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/kubernetes-clusters.json
@@ -0,0 +1,68 @@
+{
+ "clusterId": "KubGrp1",
+ "description": "Kubernetes CoreOS cluster on EC2 ",
+ "kubernetesMaster": {
+ "hostId": "KubHostMaster1",
+ "hostname": "master.dev.kubernetes.example.org",
+ "privateIPAddress": "172.17.8.100",
+ "publicIPAddress": "172.17.8.100",
+ "property": [
+ {
+ "name": "prop1",
+ "value": "val1"
+ },
+ {
+ "name": "prop2",
+ "value": "val2"
+ }
+ ]
+ },
+ "portRange": {
+ "upper": "5000",
+ "lower": "4500"
+ },
+ "kubernetesHosts": [
+ {
+ "hostId": "KubHostSlave1",
+ "hostname": "slave1.dev.kubernetes.example.org",
+ "privateIPAddress": "172.17.8.101",
+ "publicIPAddress": "172.17.8.101",
+ "property": [
+ {
+ "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"
+ }
+ ]
+ }
+ ],
+ "property": [
+ {
+ "name": "prop1",
+ "value": "val1"
+ },
+ {
+ "name": "prop2",
+ "value": "val2"
+ }
+ ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/network-partitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/network-partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/network-partitions.json
new file mode 100644
index 0000000..0ad6424
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/network-partitions.json
@@ -0,0 +1,17 @@
+{
+ "id": "network-partition-1",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ],
+ "properties": [
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/networkpartitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/networkpartitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/networkpartitions.json
deleted file mode 100644
index 0ad6424..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/networkpartitions.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "id": "network-partition-1",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ],
- "properties": [
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json
new file mode 100644
index 0000000..b5297e0
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json
@@ -0,0 +1,86 @@
+{
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "id": "root",
+ "type": "object",
+ "title": "Application Policy Definition",
+ "name": "Application Policy",
+ "options": {
+ "disable_properties": true,
+ "disable_collapse": true
+ },
+ "properties": {
+ "id": {
+ "id": "root/id",
+ "type": "string",
+ "title": "Application Policy Id ",
+ "name": "Application Policy Id",
+ },
+ "algorithm": {
+ "id": "root/algorithm",
+ "type": "string",
+ "title": "Application Policy Algorithm ",
+ "name": "Application Policy Algorithm",
+ "enum": ["one-after-another","all-at-once","weighted-one-after-another"],
+ },
+ "networkPartitions": {
+ "id": "root/networkPartitions",
+ "type": "array",
+ "title": "Network Partitions ",
+ "name": "Network Partitions",
+ "format":"tabs",
+ "items": {
+ "id": "root/networkPartitions/0",
+ "type": "string",
+ "title": "Network Partitions ",
+ "name": "Network Partitions"
+ }
+ },
+ "properties": {
+ "id": "root/properties",
+ "type": "array",
+ "title": "Properties ",
+ "name": "Properties",
+ "format":"tabs",
+ "items": [
+ {
+ "id": "root/properties/0",
+ "type": "object",
+ "title": "Properties ",
+ "name": "Properties",
+ "properties": {
+ "name": {
+ "id": "root/properties/0/name",
+ "type": "string"
+ },
+ "value": {
+ "id": "root/properties/0/value",
+ "type": "string"
+ }
+ }
+ },
+ {
+ "id": "root/properties/1",
+ "type": "object",
+ "title": "Properties ",
+ "name": "Properties",
+ "properties": {
+ "name": {
+ "id": "root/properties/1/name",
+ "type": "string"
+ },
+ "value": {
+ "id": "root/properties/1/value",
+ "type": "string"
+ }
+ }
+ }
+ ]
+ }
+ },
+ "required": [
+ "id",
+ "algorithm",
+ "networkPartitions",
+ "properties"
+ ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/applicationpolicies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/applicationpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/applicationpolicies.json
deleted file mode 100644
index b5297e0..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/applicationpolicies.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "id": "root",
- "type": "object",
- "title": "Application Policy Definition",
- "name": "Application Policy",
- "options": {
- "disable_properties": true,
- "disable_collapse": true
- },
- "properties": {
- "id": {
- "id": "root/id",
- "type": "string",
- "title": "Application Policy Id ",
- "name": "Application Policy Id",
- },
- "algorithm": {
- "id": "root/algorithm",
- "type": "string",
- "title": "Application Policy Algorithm ",
- "name": "Application Policy Algorithm",
- "enum": ["one-after-another","all-at-once","weighted-one-after-another"],
- },
- "networkPartitions": {
- "id": "root/networkPartitions",
- "type": "array",
- "title": "Network Partitions ",
- "name": "Network Partitions",
- "format":"tabs",
- "items": {
- "id": "root/networkPartitions/0",
- "type": "string",
- "title": "Network Partitions ",
- "name": "Network Partitions"
- }
- },
- "properties": {
- "id": "root/properties",
- "type": "array",
- "title": "Properties ",
- "name": "Properties",
- "format":"tabs",
- "items": [
- {
- "id": "root/properties/0",
- "type": "object",
- "title": "Properties ",
- "name": "Properties",
- "properties": {
- "name": {
- "id": "root/properties/0/name",
- "type": "string"
- },
- "value": {
- "id": "root/properties/0/value",
- "type": "string"
- }
- }
- },
- {
- "id": "root/properties/1",
- "type": "object",
- "title": "Properties ",
- "name": "Properties",
- "properties": {
- "name": {
- "id": "root/properties/1/name",
- "type": "string"
- },
- "value": {
- "id": "root/properties/1/value",
- "type": "string"
- }
- }
- }
- ]
- }
- },
- "required": [
- "id",
- "algorithm",
- "networkPartitions",
- "properties"
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json
new file mode 100644
index 0000000..d880c9f
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json
@@ -0,0 +1,118 @@
+{
+ "type":"object",
+ "$schema": "http://json-schema.org/draft-04/schema",
+ "id": "root",
+ "title":"Auto-scaling Policy Definition",
+ "name": "Auto-scaling Policy",
+ "options": {
+ "disable_properties": true,
+ "disable_collapse": true
+ },
+ "required" : ["id", "loadThresholds"],
+ "properties":{
+ "id": {
+ "type":"string",
+ "id": "root/id",
+ "title":"Auto Scale policy ID",
+ "minLength":4,
+ "default":"Policy name",
+ "maxItems":1
+ },
+ "description": {
+ "type":"string",
+ "id": "root/description",
+ "title": "Description",
+ "name": "Description",
+ "maxItems":1,
+ "format": "textarea"
+ },
+/* "instanceRoundingFactor": {
+ "type":"number",
+ "id": "root/instanceRoundingFactor",
+ "title": "Instance Rounding Factor",
+ "name": "Instance Rounding Factor",
+ "default": false,
+ "maxItems":1
+ },*/
+ "loadThresholds": {
+ "type":"object",
+ "title":"Load Thresholds",
+ "id": "root/loadThresholds",
+ "required":["loadAverage","memoryConsumption","requestsInFlight"],
+ "options": {
+ "disable_properties": true
+ },
+ "format":"grid",
+ "properties":{
+ "requestsInFlight": {
+ "type":"object",
+ "id": "root/loadThresholds/requestsInFlight",
+ "title": "Requests In Flight",
+ "name": "Requests In Flight",
+ "format": "grid",
+ "options": {
+ "disable_properties": true,
+ "collapsed": false
+ },
+ "properties":{
+ "threshold": {
+ "type":"number",
+ "id": "root/loadThresholds/requestsInFlight/threshold",
+ "title": "Threshold",
+ "name": "Threshold",
+ "default":30,
+ "format": "number",
+ "required":false
+ }
+ }
+ },
+ "memoryConsumption": {
+ "type":"object",
+ "id": "root/loadThresholds/memoryConsumption",
+ "title": "Memory Consumption",
+ "name": "Memory Consumption",
+ "format": "grid",
+ "options": {
+ "disable_properties": true,
+ "collapsed": false
+ },
+ "properties":{
+ "threshold": {
+ "type":"number",
+ "id": "root/loadThresholds/memoryConsumption/threshold",
+ "title": "Threshold",
+ "name": "Threshold",
+ "default":80,
+ "format": "number",
+ "required":false
+ }
+ }
+ },
+ "loadAverage": {
+ "type":"object",
+ "id": "root/loadThresholds/loadAverage",
+ "title": "Load Average",
+ "name": "Load Average",
+ "format": "grid",
+ "options": {
+ "disable_properties": true,
+ "collapsed": false
+ },
+ "properties":{
+ "threshold": {
+ "type":"number",
+ "id": "root/loadThresholds/loadAverage/threshold",
+ "title": "Threshold",
+ "name": "Threshold",
+ "default":100,
+ "format": "number",
+ "required":false
+ }
+ }
+ }
+
+
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json
deleted file mode 100644
index d880c9f..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
- "type":"object",
- "$schema": "http://json-schema.org/draft-04/schema",
- "id": "root",
- "title":"Auto-scaling Policy Definition",
- "name": "Auto-scaling Policy",
- "options": {
- "disable_properties": true,
- "disable_collapse": true
- },
- "required" : ["id", "loadThresholds"],
- "properties":{
- "id": {
- "type":"string",
- "id": "root/id",
- "title":"Auto Scale policy ID",
- "minLength":4,
- "default":"Policy name",
- "maxItems":1
- },
- "description": {
- "type":"string",
- "id": "root/description",
- "title": "Description",
- "name": "Description",
- "maxItems":1,
- "format": "textarea"
- },
-/* "instanceRoundingFactor": {
- "type":"number",
- "id": "root/instanceRoundingFactor",
- "title": "Instance Rounding Factor",
- "name": "Instance Rounding Factor",
- "default": false,
- "maxItems":1
- },*/
- "loadThresholds": {
- "type":"object",
- "title":"Load Thresholds",
- "id": "root/loadThresholds",
- "required":["loadAverage","memoryConsumption","requestsInFlight"],
- "options": {
- "disable_properties": true
- },
- "format":"grid",
- "properties":{
- "requestsInFlight": {
- "type":"object",
- "id": "root/loadThresholds/requestsInFlight",
- "title": "Requests In Flight",
- "name": "Requests In Flight",
- "format": "grid",
- "options": {
- "disable_properties": true,
- "collapsed": false
- },
- "properties":{
- "threshold": {
- "type":"number",
- "id": "root/loadThresholds/requestsInFlight/threshold",
- "title": "Threshold",
- "name": "Threshold",
- "default":30,
- "format": "number",
- "required":false
- }
- }
- },
- "memoryConsumption": {
- "type":"object",
- "id": "root/loadThresholds/memoryConsumption",
- "title": "Memory Consumption",
- "name": "Memory Consumption",
- "format": "grid",
- "options": {
- "disable_properties": true,
- "collapsed": false
- },
- "properties":{
- "threshold": {
- "type":"number",
- "id": "root/loadThresholds/memoryConsumption/threshold",
- "title": "Threshold",
- "name": "Threshold",
- "default":80,
- "format": "number",
- "required":false
- }
- }
- },
- "loadAverage": {
- "type":"object",
- "id": "root/loadThresholds/loadAverage",
- "title": "Load Average",
- "name": "Load Average",
- "format": "grid",
- "options": {
- "disable_properties": true,
- "collapsed": false
- },
- "properties":{
- "threshold": {
- "type":"number",
- "id": "root/loadThresholds/loadAverage/threshold",
- "title": "Threshold",
- "name": "Threshold",
- "default":100,
- "format": "number",
- "required":false
- }
- }
- }
-
-
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridge-groups.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridge-groups.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridge-groups.json
new file mode 100644
index 0000000..a97c609
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridge-groups.json
@@ -0,0 +1,46 @@
+{
+ "type":"object",
+ "$schema": "http://json-schema.org/draft-04/schema",
+ "id": "root",
+ "title": "Cartridge Group Definition",
+ "name": "Cartridge Group",
+ "options": {
+ "disable_properties": true,
+ "disable_collapse": true
+ },
+ "properties":{
+ "cartridges": {
+ "type":"array",
+ "id": "root/cartridges",
+ "required":false,
+ "items":
+ {
+ "type":"string",
+ "id": "root/cartridges/0",
+ "default": "tomcat",
+ "required":false
+ }
+
+
+ },
+ "dependencies": {
+ "type":"object",
+ "id": "root/dependencies",
+ "required":false,
+ "properties":{
+ "terminationBehaviour": {
+ "type":"string",
+ "id": "root/dependencies/terminationBehaviour",
+ "default": "terminate-none",
+ "required":false
+ }
+ }
+ },
+ "name": {
+ "type":"string",
+ "id": "root/name",
+ "default": "group1",
+ "required":false
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridgegroups.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridgegroups.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridgegroups.json
deleted file mode 100644
index a97c609..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridgegroups.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "type":"object",
- "$schema": "http://json-schema.org/draft-04/schema",
- "id": "root",
- "title": "Cartridge Group Definition",
- "name": "Cartridge Group",
- "options": {
- "disable_properties": true,
- "disable_collapse": true
- },
- "properties":{
- "cartridges": {
- "type":"array",
- "id": "root/cartridges",
- "required":false,
- "items":
- {
- "type":"string",
- "id": "root/cartridges/0",
- "default": "tomcat",
- "required":false
- }
-
-
- },
- "dependencies": {
- "type":"object",
- "id": "root/dependencies",
- "required":false,
- "properties":{
- "terminationBehaviour": {
- "type":"string",
- "id": "root/dependencies/terminationBehaviour",
- "default": "terminate-none",
- "required":false
- }
- }
- },
- "name": {
- "type":"string",
- "id": "root/name",
- "default": "group1",
- "required":false
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json
new file mode 100644
index 0000000..396a26b
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json
@@ -0,0 +1,71 @@
+{
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "id": "root",
+ "type": "object",
+ "title":"Deployment Policy Definition",
+ "name": "Deployment Policy",
+ "options": {
+ "disable_properties": true,
+ "disable_collapse": true
+ },
+ "properties": {
+ "id": {
+ "id": "root/id",
+ "type": "string",
+ "title":"Deployment Policy ID"
+ },
+ "networkPartitions": {
+ "id": "root/networkPartitions",
+ "title":"Network Partitions",
+ "type": "array",
+ "format":"tabs",
+ "items": {
+ "id": "root/networkPartitions/0",
+ "type": "object",
+ "title":"Network Partition",
+ "properties": {
+ "id": {
+ "id": "root/networkPartitions/0/id",
+ "type": "string",
+ "title":"Network Partition ID",
+ },
+ "partitionAlgo": {
+ "id": "root/networkPartitions/0/partitionAlgo",
+ "type": "string",
+ "title":"Network Partition Algorithm",
+ "enum": ["round-robin", "one-after-another"],
+ "maxItems":1
+ },
+ "partitions": {
+ "id": "root/networkPartitions/0/partitions",
+ "type": "array",
+ "title":"Partitions",
+ "format":"tabs",
+ "items": {
+ "id": "root/networkPartitions/0/partitions/0",
+ "type": "object",
+ "title":"Partition",
+ "properties": {
+ "id": {
+ "id": "root/networkPartitions/0/partitions/0/id",
+ "type": "string",
+ "title":"Partition ID",
+ },
+ "partitionMax": {
+ "id": "root/networkPartitions/0/partitions/0/partitionMax",
+ "type": "integer",
+ "title":"Partition Max",
+ "format": "number"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "required": [
+ "id",
+ "networkPartitions"
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deploymentpolicies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deploymentpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deploymentpolicies.json
deleted file mode 100644
index 396a26b..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deploymentpolicies.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "id": "root",
- "type": "object",
- "title":"Deployment Policy Definition",
- "name": "Deployment Policy",
- "options": {
- "disable_properties": true,
- "disable_collapse": true
- },
- "properties": {
- "id": {
- "id": "root/id",
- "type": "string",
- "title":"Deployment Policy ID"
- },
- "networkPartitions": {
- "id": "root/networkPartitions",
- "title":"Network Partitions",
- "type": "array",
- "format":"tabs",
- "items": {
- "id": "root/networkPartitions/0",
- "type": "object",
- "title":"Network Partition",
- "properties": {
- "id": {
- "id": "root/networkPartitions/0/id",
- "type": "string",
- "title":"Network Partition ID",
- },
- "partitionAlgo": {
- "id": "root/networkPartitions/0/partitionAlgo",
- "type": "string",
- "title":"Network Partition Algorithm",
- "enum": ["round-robin", "one-after-another"],
- "maxItems":1
- },
- "partitions": {
- "id": "root/networkPartitions/0/partitions",
- "type": "array",
- "title":"Partitions",
- "format":"tabs",
- "items": {
- "id": "root/networkPartitions/0/partitions/0",
- "type": "object",
- "title":"Partition",
- "properties": {
- "id": {
- "id": "root/networkPartitions/0/partitions/0/id",
- "type": "string",
- "title":"Partition ID",
- },
- "partitionMax": {
- "id": "root/networkPartitions/0/partitions/0/partitionMax",
- "type": "integer",
- "title":"Partition Max",
- "format": "number"
- }
- }
- }
- }
- }
- }
- }
- },
- "required": [
- "id",
- "networkPartitions"
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/docker.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/docker.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/docker.json
deleted file mode 100644
index 865a0e6..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/docker.json
+++ /dev/null
@@ -1,411 +0,0 @@
-{
- "type":"object",
- "$schema": "http://json-schema.org/draft-04/schema",
- "id": "root",
- "title": "Kubernetes Definition",
- "name": "Kubernetes",
- "properties":{
- "clusterId": {
- "type":"string",
- "id": "root/clusterId",
- "default": "KubGrp1",
- "required":false,
- "title": "Kubernetes Cluster Id",
- "name": "Kubernetes Cluster Id",
- },
- "description": {
- "type":"string",
- "id": "root/description",
- "default": "Kubernetes CoreOS cluster on EC2 ",
- "required":false,
- "title": "Description",
- "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",
- "required":false,
- "title": "Kubernetes Master",
- "name": "Kubernetes Master",
- "properties":{
- "hostId": {
- "type":"string",
- "id": "root/kubernetesMaster/hostId",
- "default": "KubHostMaster1",
- "required":false,
- "title": "Host Id",
- "name": "Host Id"
- },
- "privateIPAddress": {
- "type":"string",
- "id": "root/kubernetesMaster/privateIPAddress",
- "default": "172.17.8.100",
- "required":true,
- "title": "Private IP Address",
- "name": "Private IP Address"
- },
- "publicIPAddress": {
- "type":"string",
- "id": "root/kubernetesMaster/publicIPAddress",
- "default": "172.17.8.100",
- "required":false,
- "title": "Public IP Address",
- "name": "Public IP Address"
- },
- "hostname": {
- "type":"string",
- "id": "root/kubernetesMaster/hostname",
- "default": "master.dev.kubernetes.example.org",
- "required":false,
- "title": "Hostname",
- "name": "Hostname"
- },
- "property": {
- "type":"array",
- "id": "root/kubernetesMaster/property",
- "required":false,
- "title": "Property",
- "name": "Property",
- "format":"tabs",
- "items":[
- {
- "type":"object",
- "id": "root/kubernetesMaster/property/0",
- "required":false,
- "title": "Property",
- "name": "Property",
- "properties":{
- "name": {
- "type":"string",
- "id": "root/kubernetesMaster/property/0/name",
- "default": "prop1",
- "required":false
- },
- "value": {
- "type":"string",
- "id": "root/kubernetesMaster/property/0/value",
- "default": "val1",
- "required":false
- }
- }
- },
- {
- "type":"object",
- "id": "root/kubernetesMaster/property/1",
- "required":false,
- "title": "Property",
- "name": "Property",
- "properties":{
- "name": {
- "type":"string",
- "id": "root/kubernetesMaster/property/1/name",
- "default": "prop2",
- "required":false
- },
- "value": {
- "type":"string",
- "id": "root/kubernetesMaster/property/1/value",
- "default": "val2",
- "required":false
- }
- }
- }
- ]
- }
- }
- },
- "portRange": {
- "type":"object",
- "id": "root/portRange",
- "required":false,
- "title": "Port Range",
- "name": "Port Range",
- "format":"grid",
- "properties":{
- "lower": {
- "type":"string",
- "id": "root/portRange/lower",
- "default": "4500",
- "title": "Lower",
- "name": "Lower",
- "required":false
- },
- "upper": {
- "type":"string",
- "id": "root/portRange/upper",
- "default": "5000",
- "title": "Upper",
- "name": "Upper",
- "required":false
- }
- }
- },
- "property": {
- "type":"array",
- "id": "root/property",
- "required":false,
- "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
- }
- }
- }
- ]
- }
- }
-}