You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/08/09 15:19:35 UTC
[3/4] stratos git commit: Merge with pr 421
Merge with pr 421
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d2137f4e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d2137f4e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d2137f4e
Branch: refs/heads/tenant-isolation
Commit: d2137f4e03e9e8ebc5d4b65e6b44a14a30f63f90
Parents: 4676e74 d04e3e9
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Sun Aug 9 18:26:05 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Sun Aug 9 18:26:05 2015 +0530
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 4 +-
.../impl/CloudControllerServiceImpl.java | 2 -
.../beans/application/ApplicationBean.java | 18 ---
.../beans/kubernetes/KubernetesClusterBean.java | 18 ---
.../rest/endpoint/api/StratosApiV41.java | 70 +++++----
.../rest/endpoint/api/StratosApiV41Utils.java | 141 +++++++++----------
.../util/converter/ObjectConverter.java | 26 ++--
.../tests/SampleApplicationsTest.java | 89 ++++++------
8 files changed, 169 insertions(+), 199 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d2137f4e/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d2137f4e/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d2137f4e/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
----------------------------------------------------------------------
diff --cc products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
index 9ba0e84,ecd91fc..747ba80
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
@@@ -165,14 -165,14 +165,14 @@@ public class SampleApplicationsTest ext
restClient);
assertEquals(bean.getName(), "G1");
- boolean updated = cartridgeGroupTest.updateCartridgeGroup("cartrdige-nested.json",
- /* boolean updated = cartridgeGroupTest.updateCartridgeGroup("cartrdige-nested.json",
++ boolean updated = cartridgeGroupTest.updateCartridgeGroup("cartrdige-nested.json",
endpoint, restClient);
assertEquals(updated, true);
CartridgeGroupBean updatedBean = cartridgeGroupTest.getCartridgeGroup("G1", endpoint,
restClient);
- assertEquals(updatedBean.getName(), "G1"); */
-
+ assertEquals(updatedBean.getName(), "G1");
-
- /* boolean removedC1 = cartridgeTest.removeCartridge("c1", endpoint,
++ /*
+ boolean removedC1 = cartridgeTest.removeCartridge("c1", endpoint,
restClient);
assertEquals(removedC1, false);
@@@ -279,7 -279,7 +279,8 @@@
assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getType(), "c3");
assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 1);
assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 2);
- /*
+
++
boolean updated = applicationTest.updateApplication("g-sc-G123-1.json",
endpoint, restClient);
assertEquals(updated, true);
@@@ -442,16 -442,16 +443,17 @@@
assertEquals(deployed, true);
//Application active handling
- assertApplicationActivation(bean.getApplicationUuid());
+ assertApplicationActivation("g-sc-G123-1", -1234);
//Group active handling
- assertGroupActivation(bean.getApplicationUuid());
+ assertGroupActivation("g-sc-G123-1", -1234);
//Cluster active handling
- assertClusterActivation(bean.getApplicationUuid());
+ assertClusterActivation("g-sc-G123-1", -1234);
+
+
//Updating application
- /* boolean updated = applicationTest.updateApplication("g-sc-G123-1.json",
+ boolean updated = applicationTest.updateApplication("g-sc-G123-1.json",
endpoint, restClient);
assertEquals(updated, true);
@@@ -459,8 -459,8 +461,8 @@@
ApplicationBean updatedBean = applicationTest.getApplication("g-sc-G123-1", endpoint,
restClient);
assertEquals(updatedBean.getApplicationId(), "g-sc-G123-1");
- /*
- boolean removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint,
+
- boolean removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint,
++ /* boolean removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint,
restClient);
assertEquals(removedGroup, false);
@@@ -974,7 -973,7 +975,7 @@@
*/
private void assertGroupInstanceCount(String applicationName, String groupAlias, int count) {
long startTime = System.currentTimeMillis();
-- Application application = ApplicationManager.getApplications().getApplication(applicationName);
++ Application application = ApplicationManager.getApplications().getApplicationByTenant(applicationName,-1234);
if (application != null) {
Group group = application.getGroupRecursively(groupAlias);
while (group.getInstanceContextCount() != count) {