You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by di...@apache.org on 2015/09/16 13:44:16 UTC
[1/7] stratos git commit: Custom helper to check super tenant
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x 8ff6a2ab0 -> d0bc92795
Custom helper to check super tenant
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1ca22f3a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1ca22f3a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1ca22f3a
Branch: refs/heads/stratos-4.1.x
Commit: 1ca22f3a3d4002509d576cfddff4ab2c60cb5fe5
Parents: 42c388b
Author: Dinithi <di...@wso2.com>
Authored: Tue Sep 15 22:17:03 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Tue Sep 15 22:17:03 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/theme.js | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1ca22f3a/components/org.apache.stratos.manager.console/console/themes/theme0/theme.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/theme.js b/components/org.apache.stratos.manager.console/console/themes/theme0/theme.js
index 5df0122..42deb6c 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/theme.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/theme.js
@@ -106,6 +106,14 @@ var engine = require('caramel').engine('handlebars', (function () {
return "";
});
+ Handlebars.registerHelper('isSuperTenant', function (action, options) {
+ if (caramel.meta().session.get("TENANT_ID") != undefined) {
+ if (caramel.meta().session.get("TENANT_ID") == -1234) {
+ return true;
+ }
+ }
+ return "";
+ });
}
}
}()));
[5/7] stratos git commit: Merge branch 'stratos-4.1.x' of
https://git-wip-us.apache.org/repos/asf/stratos into stratos-4.1.x
Posted by di...@apache.org.
Merge branch 'stratos-4.1.x' of https://git-wip-us.apache.org/repos/asf/stratos into stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f7deea30
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f7deea30
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f7deea30
Branch: refs/heads/stratos-4.1.x
Commit: f7deea30ee0e4521f05df90f07ff692907489d6c
Parents: 1101002 8ff6a2a
Author: Dinithi <di...@wso2.com>
Authored: Wed Sep 16 16:59:51 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed Sep 16 16:59:51 2015 +0530
----------------------------------------------------------------------
.../topic/ApplicationsEventPublisher.java | 20 ++
.../stratos/autoscaler/monitor/Monitor.java | 3 +-
.../monitor/component/ApplicationMonitor.java | 45 ++---
.../monitor/component/GroupMonitor.java | 69 +++----
.../component/ParentComponentMonitor.java | 4 +
.../services/impl/AutoscalerServiceImpl.java | 186 +++++++++++--------
.../stratos/autoscaler/util/AutoscalerUtil.java | 38 ++++
.../application/ApplicationUpdatedEvent.java | 43 +++++
.../ApplicationUpdatedEventListener.java | 27 +++
.../ApplicationUpdatedMessageProcessor.java | 152 +++++++++++++++
.../ApplicationsMessageProcessorChain.java | 6 +
.../integration/common/ThriftTestServer.java | 38 ++--
.../tests/ADCMTAppTenantUserTestCase.java | 4 +-
.../integration/tests/ADCMTAppTestCase.java | 4 +-
.../agent/integration/tests/ADCTestCase.java | 4 +-
.../integration/tests/AgentStartupTestCase.java | 35 +++-
.../tests/PythonAgentIntegrationTest.java | 2 +-
.../src/test/resources/test-suite-smoke.xml | 2 +-
.../application/ApplicationUpdateTest.java | 32 +++-
19 files changed, 550 insertions(+), 164 deletions(-)
----------------------------------------------------------------------
[6/7] stratos git commit: Resolving alignment issues in the UI
Posted by di...@apache.org.
Resolving alignment issues 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/82f6aadc
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/82f6aadc
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/82f6aadc
Branch: refs/heads/stratos-4.1.x
Commit: 82f6aadc07e63e6655904d4cb277c1b0cf6edf2f
Parents: f7deea3
Author: Dinithi <di...@wso2.com>
Authored: Wed Sep 16 17:00:42 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed Sep 16 17:00:42 2015 +0530
----------------------------------------------------------------------
.../theme0/partials/applications_form.hbs | 79 +++++++++++---------
1 file changed, 43 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/82f6aadc/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
index 03c4bae..83a40be 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
@@ -116,7 +116,7 @@
<div class="toggle-menu-description">{{description}} {{status}}</div>
{{#ifCond status "!=" "Created"}}
{{#ifCond status "==" "Deployed"}}
- <div class="list-button" style="display: none;">
+ <div class="list-button" style="display: none;">
<button class="btn btn-danger btn-lg hover-undeploy"
type="button"
id="{{applicationId}}"> Undeploy
@@ -169,6 +169,7 @@
{{/if}}
{{/if}}
</div>
+ </div>
{{else}}
{{#ifCond status "==" "Active"}}
<div class="list-button" style="display: none;">
@@ -199,36 +200,38 @@
{{/if}}
</div>
<div class="bottom-bar-wrapper">
- <div class="bottom-bar">
+ <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details" type="button"
- id="details_{{applicationId}}"
- data-url="{{url ""}}/applications/{{applicationId}}/">
- View
- </button>
- {{#if multiTenant}}
- {{#if isSuperTenant}}
- <button class="btn btn-danger btn-lg hover-undeploy"
- type="button"
- id="{{applicationId}}"> Undeploy
+ <button class="btn btn-info btn-lg hover-details" type="button"
+ id="details_{{applicationId}}"
+ data-url="{{url ""}}/applications/{{applicationId}}/">
+ View
</button>
- {{/if}}
-
- {{#if signUpsExist}}
- <button class="btn btn-warning btn-lg hover-remove-signup"
- type="button"
- id="{{applicationId}}"
- data-appid='{{applicationName}}'>Remove Signup
- </button>
- {{else}}
- <button class="btn btn-warning btn-lg hover-signup"
+ {{#if multiTenant}}
+ {{#if isSuperTenant}}
+ <button class="btn btn-danger btn-lg hover-undeploy"
type="button"
- id="signup_{{applicationId}}"
- data-url="{{url ""}}/applications/{{applicationId}}/signup">
- Signup
+ id="{{applicationId}}"> Undeploy
</button>
+ {{/if}}
+
+ {{#if signUpsExist}}
+ <button class="btn btn-warning btn-lg hover-remove-signup"
+ type="button"
+ id="{{applicationId}}"
+ data-appid='{{applicationName}}'>Remove Signup
+ </button>
+ {{else}}
+ <button class="btn btn-warning btn-lg hover-signup"
+ type="button"
+ id="signup_{{applicationId}}"
+ data-url="{{url ""}}/applications/{{applicationId}}/signup">
+ Signup
+ </button>
+ {{/if}}
{{/if}}
- {{/if}}
+ </div>
+ </div>
{{else}}
<div class="list-button" style="display: none;">
<button class="btn btn-info btn-lg hover-details" type="button"
@@ -241,17 +244,18 @@
</button>
</div>
<div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details"
- type="button"
- id="details_{{applicationId}}"
- data-url="{{url ""}}/applications/{{applicationId}}/">
- View
- </button>
+ <div class="bottom-bar">
+ <button class="btn btn-info btn-lg hover-details"
+ type="button"
+ id="details_{{applicationId}}"
+ data-url="{{url ""}}/applications/{{applicationId}}/">
+ View
+ </button>
+ </div>
</div>
{{/ifCond}}
{{/ifCond}}
- </div>
+
{{else}}
<div class="list-button" style="display: none;">
<button class="btn btn-danger btn-lg hover-delete" type="button"
@@ -288,12 +292,15 @@
</div>
</div>
{{/ifCond}}
- </div>
+
+ </div>
{{/each}}
{{/ifCond}}
+
</div>
- </div>
</div>
+ </div>
+ </div>
{{/if}}
<script>
[7/7] stratos git commit: Show Undeploy button to tenants for single
tenant applications
Posted by di...@apache.org.
Show Undeploy button to tenants for single tenant applications
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d0bc9279
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d0bc9279
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d0bc9279
Branch: refs/heads/stratos-4.1.x
Commit: d0bc92795638251c7c85f409764e4447f6b3b96e
Parents: 82f6aad
Author: Dinithi <di...@wso2.com>
Authored: Wed Sep 16 17:09:10 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed Sep 16 17:09:10 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/partials/applications_form.hbs | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d0bc9279/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
index 83a40be..9ee6a05 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
@@ -229,6 +229,11 @@
Signup
</button>
{{/if}}
+ {{else}}
+ <button class="btn btn-danger btn-lg hover-undeploy"
+ type="button"
+ id="{{applicationId}}"> Undeploy
+ </button>
{{/if}}
</div>
</div>
[4/7] stratos git commit: Merge branch 'stratos-4.1.x' of
https://github.com/apache/stratos into stratos-4.1.x
Posted by di...@apache.org.
Merge branch 'stratos-4.1.x' of https://github.com/apache/stratos into stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1101002b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1101002b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1101002b
Branch: refs/heads/stratos-4.1.x
Commit: 1101002befafa7c96fad91e104bcff45f3febbb0
Parents: c5bbeaa b5d1020
Author: Dinithi <di...@wso2.com>
Authored: Wed Sep 16 10:48:52 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed Sep 16 10:48:52 2015 +0530
----------------------------------------------------------------------
.../org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/7] stratos git commit: Removing Undeploy button for the tenants
for multitenant application
Posted by di...@apache.org.
Removing Undeploy button for the tenants for multitenant application
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c5bbeaa3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c5bbeaa3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c5bbeaa3
Branch: refs/heads/stratos-4.1.x
Commit: c5bbeaa30bd0526ba80816d0df92e4ab27539b7b
Parents: cedd128
Author: Dinithi <di...@wso2.com>
Authored: Wed Sep 16 10:47:24 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed Sep 16 10:47:24 2015 +0530
----------------------------------------------------------------------
.../themes/theme0/partials/applications_form.hbs | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c5bbeaa3/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
index 43d7c20..03c4bae 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
@@ -200,16 +200,20 @@
</div>
<div class="bottom-bar-wrapper">
<div class="bottom-bar">
- <button class="btn btn-danger btn-lg hover-undeploy"
- type="button"
- id="{{applicationId}}"> Undeploy
- </button>
+
<button class="btn btn-info btn-lg hover-details" type="button"
id="details_{{applicationId}}"
data-url="{{url ""}}/applications/{{applicationId}}/">
View
</button>
{{#if multiTenant}}
+ {{#if isSuperTenant}}
+ <button class="btn btn-danger btn-lg hover-undeploy"
+ type="button"
+ id="{{applicationId}}"> Undeploy
+ </button>
+ {{/if}}
+
{{#if signUpsExist}}
<button class="btn btn-warning btn-lg hover-remove-signup"
type="button"
@@ -231,6 +235,10 @@
id="details_list_{{applicationId}}"
data-url="{{url ""}}/applications/{{applicationId}}/" > View
</button>
+ <button class="btn btn-danger btn-lg hover-undeploy"
+ type="button"
+ id="{{applicationId}}"> Undeploy
+ </button>
</div>
<div class="bottom-bar-wrapper">
<div class="bottom-bar">
[2/7] stratos git commit: Merge branch 'stratos-4.1.x' of
https://github.com/apache/stratos into stratos-4.1.x
Posted by di...@apache.org.
Merge branch 'stratos-4.1.x' of https://github.com/apache/stratos into stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/cedd128d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/cedd128d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/cedd128d
Branch: refs/heads/stratos-4.1.x
Commit: cedd128dde17e0e718fc671be34e4b6a88c1fe88
Parents: 1ca22f3 0b913eb
Author: Dinithi <di...@wso2.com>
Authored: Wed Sep 16 09:19:06 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed Sep 16 09:19:06 2015 +0530
----------------------------------------------------------------------
.../autoscaler/registry/RegistryManager.java | 5 +-
.../controller/registry/RegistryManager.java | 17 ++---
.../manager/registry/RegistryManager.java | 17 ++---
.../service/registry/MetadataApiRegistry.java | 68 ++++++++++++--------
.../mock/iaas/persistence/RegistryManager.java | 16 +++--
.../cartridge.agent/cartridge.agent/agent.py | 5 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 14 ++--
dependencies/org.wso2.carbon.ui/pom.xml | 4 +-
.../tests/ADCMTAppTenantUserTestCase.java | 2 +-
.../integration/tests/ADCMTAppTestCase.java | 2 +-
.../agent/integration/tests/ADCTestCase.java | 2 +-
.../integration/tests/AgentStartupTestCase.java | 32 +++++++--
.../tests/PythonAgentIntegrationTest.java | 15 +++++
.../extensions/py/startup-test-handler.py | 60 +++++++++++++++++
.../py/startup-test-handler.yapsy-plugin | 27 ++++++++
.../modules/distribution/src/assembly/bin.xml | 4 ++
.../application/ApplicationBurstingTest.java | 2 +-
.../application/GroupStartupOrderTest.java | 2 +-
.../PartitionOneAfterAnotherClusterTest.java | 2 +-
.../PartitionRoundRobinClusterTest.java | 2 +-
.../SampleApplicationStartupTestCase.java | 2 +-
.../application/SingleClusterScalingTest.java | 2 +-
22 files changed, 228 insertions(+), 74 deletions(-)
----------------------------------------------------------------------