stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject [3/4] stratos git commit: Update the add application method
Date Thu, 06 Aug 2015 05:27:48 GMT
Update the add application method


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5add5dc4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5add5dc4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5add5dc4

Branch: refs/heads/tenant-isolation
Commit: 5add5dc44192b4df3356580cac74280cb5f26b77
Parents: e0f8594
Author: Gayan Gunarathne <gayang@wso2.com>
Authored: Thu Aug 6 00:14:25 2015 +0530
Committer: Gayan Gunarathne <gayang@wso2.com>
Committed: Thu Aug 6 00:14:25 2015 +0530

----------------------------------------------------------------------
 .../org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java   | 2 +-
 .../apache/stratos/integration/tests/SampleApplicationsTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/5add5dc4/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index a98d3c7..056c41b 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -1095,7 +1095,7 @@ public class StratosApiV41Utils {
             asServiceClient.addServiceGroup(serviceGroup);
             // Add cartridge group elements to SM cache - done after service group has been
added
             StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient();
-            smServiceClient.addUsedCartridgesInCartridgeGroups(serviceGroupDefinition.getUuid(),
cartridgeUuids);
+            smServiceClient.addUsedCartridgesInCartridgeGroups(serviceGroup.getUuid(), cartridgeUuids);
         } catch (RemoteException e) {
 
             String message = String.format("Could not add the cartridge group: [cartridge-group-id]
%s " +

http://git-wip-us.apache.org/repos/asf/stratos/blob/5add5dc4/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
----------------------------------------------------------------------
diff --git 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
index c9aed92..8f72d47 100644
--- 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
@@ -210,7 +210,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
         }
     }
 
-
+    @Test
     public void testApplication() {
         try {
             boolean addedScalingPolicy = autoscalingPolicyTest.addAutoscalingPolicy("autoscaling-policy-1.json",


Mime
View raw message