fix docker(kubernetes) definition with REST API changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8220c67f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8220c67f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8220c67f Branch: refs/heads/4.1.0-test Commit: 8220c67f9553f73ed2661e028e2992dd6b1410a7 Parents: 915b3e3 Author: Dakshika Jayathilaka <[email protected]> Authored: Wed Dec 10 17:10:38 2014 +0530 Committer: Dakshika Jayathilaka <[email protected]> Committed: Wed Dec 10 17:10:38 2014 +0530 ---------------------------------------------------------------------- .../console/configure_form.jag | 4 ++-- .../console/controllers/menu/menu.json | 2 +- .../console/controllers/rest/rest_calls.jag | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/8220c67f/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 d545d2d..495b4af 100644 --- a/components/org.apache.stratos.manager.console/console/configure_form.jag +++ b/components/org.apache.stratos.manager.console/console/configure_form.jag @@ -107,8 +107,8 @@ switch (formtype) { case "docker": list_data = util.RESTCalls.getKubernetesGroups(); - if(list_data.kubernetesGroup && list_data.kubernetesGroup.length === 0){ - list_data = null; + if(list_data == null){ + list_data = null; //TODO endpoint doesn't return correct info }else{ formDataEdit = list_data.kubernetesGroup; for (specNumber in list_data.kubernetesGroup) { http://git-wip-us.apache.org/repos/asf/stratos/blob/8220c67f/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 e900040..7e9fdfd 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 @@ -34,7 +34,7 @@ "title": "Docker Clusters", "icon": "fa-sitemap", "permissionPaths": ["/permission", "/permission/admin"], - "description": "Define and manage multitenant services." + "description": "Define and manage docker clusters." } ] }, http://git-wip-us.apache.org/repos/asf/stratos/blob/8220c67f/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag index b8a3176..9b3fca4 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag @@ -56,7 +56,7 @@ RESTCalls = new function(){ }; this.deployKubernetesGroupDefinition = function(groupDefinition){ - return this.send("POST","/kubernetes/deploy/group",groupDefinition); + return this.send("POST","/kubernetesClusters",groupDefinition); }; this.deployGroupDefinition = function(groupDefinition){ @@ -93,7 +93,7 @@ RESTCalls = new function(){ }; this.getKubernetesGroups = function(){ - return this.sendReceive("GET","/kubernetes/group",{}); + return this.sendReceive("GET","/kubernetesClusters",{}); }; this.getApplicableDeploymentPolicies = function(cartridgeType){
