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/01/23 14:01:44 UTC
[1/5] stratos git commit: KubernetesCluster delete option added
Repository: stratos
Updated Branches:
refs/heads/master 78fff3fc6 -> 26fe2e680
KubernetesCluster delete option added
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a19b4349
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a19b4349
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a19b4349
Branch: refs/heads/master
Commit: a19b4349f0575a7f648c2db59946b434c641d450
Parents: 564ca21
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Fri Jan 23 17:58:54 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Jan 23 18:31:33 2015 +0530
----------------------------------------------------------------------
.../console/controllers/configure/configure_requests.jag | 3 +++
.../console/controllers/rest/rest_calls.jag | 4 ++++
.../console/themes/theme0/partials/configure_form.hbs | 10 +++++++---
3 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a19b4349/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 a690ac1..284b870 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
@@ -45,6 +45,9 @@ try {
case "delete-autoscalingpolicy":
formSubmit = util.RESTCalls.deleteAutoscalePolicyDefinition(formPayload);
break;
+ case "delete-kubernetes-cluster":
+ formSubmit = util.RESTCalls.deleteKubernetesClusterDefinition(formPayload);
+ break;
default:
session.put("deploy-status", { "message": "Sorry Endpoint Error", "status": "error" });
http://git-wip-us.apache.org/repos/asf/stratos/blob/a19b4349/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 17ae53b..731ce8c 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
@@ -71,6 +71,10 @@ RESTCalls = new function(){
return this.send("POST","/kubernetesClusters",clusterDefinition);
};
+ this.deleteKubernetesClusterDefinition = function(kubernetesClusterId){
+ return this.send("DELETE","/kubernetesClusters/" + kubernetesClusterId , {});
+ };
+
this.deployGroupDefinition = function(groupDefinition){
return this.send("POST","/cartridgeGroups", groupDefinition);
};
http://git-wip-us.apache.org/repos/asf/stratos/blob/a19b4349/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 e8e9faa..6cbd005 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
@@ -101,12 +101,16 @@
<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="{{clusterId}}" data-formtype="delete-kubernetes-cluster"> Delete</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
data-url="{{url ""}}/configure/docker/{{clusterId}}/" > Details
</button>
</div>
<div class="bottom-bar-wrapper">
<div class="bottom-bar">
+ <button class="btn btn-danger btn-lg hover-delete" type="button"
+ id="{{clusterId}}" data-formtype="delete-kubernetes-cluster"> Delete</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
data-url="{{url ""}}/configure/docker/{{clusterId}}/" > Details
</button>
@@ -371,10 +375,10 @@
var n = noty({text: data.message, layout: 'bottomRight', type: 'warning'});
} else {
var n = noty({text: data.message, layout: 'bottomRight', type: 'success'});
+ window.setTimeout(function(){
+ location.reload();
+ }, 1000);
}
- window.setTimeout(function(){
- location.reload();
- }, 1000);
}
}).always(function () {
[4/5] stratos git commit: add user and tenant success redirection to
listing page
Posted by im...@apache.org.
add user and tenant success redirection to listing page
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5b4be266
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5b4be266
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5b4be266
Branch: refs/heads/master
Commit: 5b4be266d4acab9c53fb1addb4adec91b430c622
Parents: 6eea13a
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Tue Jan 20 13:11:58 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Jan 23 18:31:33 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/partials/users_form.hbs | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b4be266/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
index 07457ac..7ec038e 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
@@ -200,10 +200,11 @@
var n = noty({text: data.message, layout: 'bottomRight', type: 'warning'});
} else {
var n = noty({text: data.message, layout: 'bottomRight', type: 'success'});
+ window.setTimeout(function(){
+ location.reload();
+ }, 1500);
}
- window.setTimeout(function(){
- location.reload();
- }, 1000);
+
}
}).always(function () {
@@ -239,6 +240,9 @@
var n = noty({text: data.message, layout: 'bottomRight', type: 'warning'});
} else {
var n = noty({text: data.message, layout: 'bottomRight', type: 'success'});
+ window.setTimeout(function(){
+ window.location.href = '../';
+ }, 1500);
}
}
})
[2/5] stratos git commit: Auto-scaling policy delete option added
Posted by im...@apache.org.
Auto-scaling policy delete option added
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/564ca218
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/564ca218
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/564ca218
Branch: refs/heads/master
Commit: 564ca218cfff19b5ed0b75f7891b9b9e6a79d76f
Parents: 5b4be26
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Fri Jan 23 17:38:11 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Jan 23 18:31:33 2015 +0530
----------------------------------------------------------------------
.../console/controllers/configure/configure_requests.jag | 3 +++
.../console/controllers/rest/rest_calls.jag | 4 ++++
.../console/themes/theme0/partials/configure_form.hbs | 4 ++++
3 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/564ca218/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 48003d8..a690ac1 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
@@ -42,6 +42,9 @@ try {
case "delete-cartridge":
formSubmit = util.RESTCalls.deleteCartridgeDefinition(formPayload);
break;
+ case "delete-autoscalingpolicy":
+ formSubmit = util.RESTCalls.deleteAutoscalePolicyDefinition(formPayload);
+ break;
default:
session.put("deploy-status", { "message": "Sorry Endpoint Error", "status": "error" });
http://git-wip-us.apache.org/repos/asf/stratos/blob/564ca218/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 54974ee..17ae53b 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
@@ -63,6 +63,10 @@ RESTCalls = new function(){
return this.send("POST","/autoscalingPolicies",policyDefinition);
};
+ this.deleteAutoscalePolicyDefinition = function(autoscalePolicyId){
+ return this.send("DELETE","/autoscalingPolicies/" + autoscalePolicyId,{});
+ };
+
this.deployKubernetesClusterDefinition = function(clusterDefinition){
return this.send("POST","/kubernetesClusters",clusterDefinition);
};
http://git-wip-us.apache.org/repos/asf/stratos/blob/564ca218/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 a5d3bde..e8e9faa 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
@@ -155,12 +155,16 @@
<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>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
data-url="{{url ""}}/configure/autoscalingpolicies/{{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>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/" > Details
</button>
[3/5] stratos git commit: Remove extra filed from user JSON Schema
Posted by im...@apache.org.
Remove extra filed from user JSON Schema
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6eea13a6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6eea13a6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6eea13a6
Branch: refs/heads/master
Commit: 6eea13a63d7593ef81711df42f3a0baaba17d79b
Parents: 78fff3f
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Tue Jan 20 12:37:13 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Jan 23 18:31:33 2015 +0530
----------------------------------------------------------------------
.../console/controllers/forms/default/users/users.json | 3 +--
.../console/controllers/forms/schema/users/users.json | 8 --------
2 files changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6eea13a6/components/org.apache.stratos.manager.console/console/controllers/forms/default/users/users.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/users/users.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/users/users.json
index df28139..c4113ae 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/users/users.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/users/users.json
@@ -4,6 +4,5 @@
"role":"Internal/user",
"firstName":"FirstName",
"lastName":"LastName",
- "email":"user@apache.org",
- "profileName":"profilename"
+ "email":"user@apache.org"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/6eea13a6/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/users.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/users.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/users.json
index 93fa6f3..731439e 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/users.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/users.json
@@ -59,14 +59,6 @@
"name": "Last Name",
"default": "",
"required":false
- },
- "profileName": {
- "type":"string",
- "id": "root/profileName",
- "title": "Profile Name",
- "name": "Profile Name",
- "default": "",
- "required":false
}
}
}
[5/5] stratos git commit: Change Docker to Kubernetes on frontned
Posted by im...@apache.org.
Change Docker to Kubernetes on frontned
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/26fe2e68
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/26fe2e68
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/26fe2e68
Branch: refs/heads/master
Commit: 26fe2e680693813bf1813ccc5bc633d4f4af0287
Parents: a19b434
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Fri Jan 23 18:14:16 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Jan 23 18:31:34 2015 +0530
----------------------------------------------------------------------
.../console/configure_form.jag | 4 ++--
.../console/controllers/forms/schema/configure/docker.json | 4 ++--
.../console/controllers/menu/menu.json | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/26fe2e68/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 ed99962..296992f 100644
--- a/components/org.apache.stratos.manager.console/console/configure_form.jag
+++ b/components/org.apache.stratos.manager.console/console/configure_form.jag
@@ -87,8 +87,8 @@ if(isEdit == false && elements.action != 'new') {
break;
case "docker":
- formTitle = "Docker Cluster",
- buttonText = "Docker Cluster";
+ formTitle = "Kubernetes Cluster",
+ buttonText = "Kubernetes Cluster";
list_data = util.RESTCalls.getKubernetesClusters();
if (list_data == null) {
list_data = null; //TODO endpoint doesn't return correct info
http://git-wip-us.apache.org/repos/asf/stratos/blob/26fe2e68/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
index 2f23e59..7dc15d5 100644
--- 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
@@ -2,8 +2,8 @@
"type":"object",
"$schema": "http://json-schema.org/draft-04/schema",
"id": "root",
- "title": "Docker Definition",
- "name": "Docker",
+ "title": "Kubernetes Definition",
+ "name": "Kubernetes",
"properties":{
"description": {
"type":"string",
http://git-wip-us.apache.org/repos/asf/stratos/blob/26fe2e68/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 9c5d016..96a4325 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
@@ -31,7 +31,7 @@
"link": "configure/docker/",
"linkexternal": false,
"context": "/configure",
- "title": "Docker Clusters",
+ "title": "Kubernetes Clusters",
"icon": "fa-sitemap",
"permissionPaths": ["/permission", "/permission/admin"],
"description": "Define and manage docker clusters."