Depoloyment policy added to application section
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/97295ac9 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/97295ac9 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/97295ac9 Branch: refs/heads/4.1.0-test Commit: 97295ac9913e68baf7fba275898163c9a156e8d6 Parents: e1c536b Author: Dakshika Jayathilaka <[email protected]> Authored: Thu Dec 11 10:40:21 2014 +0530 Committer: Dakshika Jayathilaka <[email protected]> Committed: Thu Dec 11 10:40:21 2014 +0530 ---------------------------------------------------------------------- .../console/applications_form.jag | 15 +++ .../applications/application_requests.jag | 3 + .../forms/default/applications/deployments.json | 17 +++ .../forms/default/configure/deployments.json | 17 --- .../forms/schema/applications/deployments.json | 103 +++++++++++++++++++ .../forms/schema/configure/deployments.json | 103 ------------------- 6 files changed, 138 insertions(+), 120 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/97295ac9/components/org.apache.stratos.manager.console/console/applications_form.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/applications_form.jag b/components/org.apache.stratos.manager.console/console/applications_form.jag index cd24ef1..6402620 100644 --- a/components/org.apache.stratos.manager.console/console/applications_form.jag +++ b/components/org.apache.stratos.manager.console/console/applications_form.jag @@ -85,6 +85,21 @@ switch (formtype) { list_data = null; } break; + case "deployments": + list_data = util.RESTCalls.getPolicyDeployment(); + if(list_data == null) { + list_data = null; + }else{ + formDataEdit = list_data.deploymentPolicy; + for (specNumber in list_data.deploymentPolicy) { + if (list_data.deploymentPolicy[specNumber].id == elements.action) { + formDataEdit = list_data.deploymentPolicy[specNumber]; + } + + } + //TODO need to add listing with corrected JSON + } + break; default: error.push({"errorMessage":"Incorrect resource path found"}); } http://git-wip-us.apache.org/repos/asf/stratos/blob/97295ac9/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag index bde0b9e..6d583b0 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag @@ -36,6 +36,9 @@ try { case "applications": formSubmit = util.RESTCalls.deployApplicationDefinition(formPayload); break; + case "deployments": + formSubmit = util.RESTCalls.deployDeploymentPolicyDefinition(formPayload); + break; default: session.put("deploy-status", { "message": "Sorry Endpoint Error", "status": "error" }); http://git-wip-us.apache.org/repos/asf/stratos/blob/97295ac9/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/deployments.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/deployments.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/deployments.json new file mode 100644 index 0000000..feb94cb --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/deployments.json @@ -0,0 +1,17 @@ +{ + "id":"dakshika-ec2", + "description":"Deployment policy description", + "isPublic":false, + "partitionGroup":{ + "id":"ec2", + "partitionAlgo":"one-after-another", + "partition":[ + { + "id":"P1", + "description":"description", + "partitionMax":"3", + "partitionMin":"1" + } + ] + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/97295ac9/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deployments.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deployments.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deployments.json deleted file mode 100644 index feb94cb..0000000 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deployments.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id":"dakshika-ec2", - "description":"Deployment policy description", - "isPublic":false, - "partitionGroup":{ - "id":"ec2", - "partitionAlgo":"one-after-another", - "partition":[ - { - "id":"P1", - "description":"description", - "partitionMax":"3", - "partitionMin":"1" - } - ] - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/97295ac9/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/deployments.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/deployments.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/deployments.json new file mode 100644 index 0000000..c73b81f --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/deployments.json @@ -0,0 +1,103 @@ +{ + "type":"object", + "$schema": "http://json-schema.org/draft-04/schema";, + "id": "root", + "title": "Deployment Definition", + "name": "Deployment Policy", + "options": { + "disable_properties": true, + "disable_collapse": true + }, + "required":["id","partitionGroup"], + "properties":{ + "id": { + "type":"string", + "id": "root/id", + "title": "Deployment Policy ID", + "name": "Deployment Policy ID", + "default": "isuruh-ec2", + "maxItems":1 + }, + "description": { + "type":"string", + "id": "root/description", + "title": "Description", + "name": "Description", + "maxItems":1 + }, + "isPublic": { + "type":"boolean", + "id": "root/isPublic", + "title": "Is Public", + "name": "Is Public", + "default": false, + "maxItems":1 + }, + "partitionGroup": { + "type":"object", + "id": "root/partitionGroup", + "title": "Partition Group", + "name": "Partition Group", + "required":["id","partitionAlgo","partition"], + "properties":{ + "id": { + "type":"string", + "id": "root/partitionGroup/id", + "title": "Partition Group ID", + "name": "Partition Group ID", + "default": "ec2", + "maxItems":1 + }, + "partitionAlgo": { + "type":"string", + "id": "root/partitionGroup/partitionAlgo", + "title": "Partition Algorithm", + "name": "Partition Algorithm", + "default": "one-after-another", + "enum": ["round-robin", "one-after-another"], + "maxItems":1 + }, + "partition": { + "type":"array", + "id": "root/partitionGroup/partition", + "title": "Partition", + "name": "Partition", + "minItems":1, + "items": + { + "type":"object", + "id": "root/partitionGroup/partition/0", + "required":["id","partitionMin","partitionMax"], + "format": "grid", + "properties":{ + "id": { + "type":"string", + "id": "root/partitionGroup/partition/0/id", + "default": "P1", + + }, + "partitionMax": { + "type":"string", + "id": "root/partitionGroup/partition/0/partitionMax", + "default": "3", + }, + "partitionMin": { + "type":"string", + "id": "root/partitionGroup/partition/0/partitionMin", + "default": "1", + }, + "description": { + "type": "string", + "id": "root/partitionGroup/partition/0/description", + "default": "description", + + } + } + } + + + } + } + } + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/97295ac9/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployments.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployments.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployments.json deleted file mode 100644 index c73b81f..0000000 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployments.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "type":"object", - "$schema": "http://json-schema.org/draft-04/schema";, - "id": "root", - "title": "Deployment Definition", - "name": "Deployment Policy", - "options": { - "disable_properties": true, - "disable_collapse": true - }, - "required":["id","partitionGroup"], - "properties":{ - "id": { - "type":"string", - "id": "root/id", - "title": "Deployment Policy ID", - "name": "Deployment Policy ID", - "default": "isuruh-ec2", - "maxItems":1 - }, - "description": { - "type":"string", - "id": "root/description", - "title": "Description", - "name": "Description", - "maxItems":1 - }, - "isPublic": { - "type":"boolean", - "id": "root/isPublic", - "title": "Is Public", - "name": "Is Public", - "default": false, - "maxItems":1 - }, - "partitionGroup": { - "type":"object", - "id": "root/partitionGroup", - "title": "Partition Group", - "name": "Partition Group", - "required":["id","partitionAlgo","partition"], - "properties":{ - "id": { - "type":"string", - "id": "root/partitionGroup/id", - "title": "Partition Group ID", - "name": "Partition Group ID", - "default": "ec2", - "maxItems":1 - }, - "partitionAlgo": { - "type":"string", - "id": "root/partitionGroup/partitionAlgo", - "title": "Partition Algorithm", - "name": "Partition Algorithm", - "default": "one-after-another", - "enum": ["round-robin", "one-after-another"], - "maxItems":1 - }, - "partition": { - "type":"array", - "id": "root/partitionGroup/partition", - "title": "Partition", - "name": "Partition", - "minItems":1, - "items": - { - "type":"object", - "id": "root/partitionGroup/partition/0", - "required":["id","partitionMin","partitionMax"], - "format": "grid", - "properties":{ - "id": { - "type":"string", - "id": "root/partitionGroup/partition/0/id", - "default": "P1", - - }, - "partitionMax": { - "type":"string", - "id": "root/partitionGroup/partition/0/partitionMax", - "default": "3", - }, - "partitionMin": { - "type":"string", - "id": "root/partitionGroup/partition/0/partitionMin", - "default": "1", - }, - "description": { - "type": "string", - "id": "root/partitionGroup/partition/0/description", - "default": "description", - - } - } - } - - - } - } - } - } -}
