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/07/06 10:44:11 UTC

[38/41] stratos git commit: update validation of application policy against application

update validation of application policy against application


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

Branch: refs/heads/tenantisolation
Commit: 52380b1a64910de4c18dce5cfde503bb354da367
Parents: 3d167d4
Author: Dinithi <di...@wso2.com>
Authored: Thu Jul 2 15:00:16 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Thu Jul 2 15:00:16 2015 +0530

----------------------------------------------------------------------
 .../autoscaler/applications/parser/DefaultApplicationParser.java | 2 +-
 .../java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/52380b1a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index d0f8514..a3ac423 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -167,7 +167,7 @@ public class DefaultApplicationParser implements ApplicationParser {
                     "[cartridge-type] %s [alias] %s", applicationId, cartridgeType, alias));
         }
 
-        AutoscalePolicy autoscalingPolicy = PolicyManager.getInstance().getAutoscalePolicy(autoscalingPolicyId);
+        AutoscalePolicy autoscalingPolicy = PolicyManager.getInstance().getAutoscalePolicyById(autoscalingPolicyId);
         if (autoscalingPolicy == null) {
             handleError(String.format("Autoscaling policy is not found: [application-id] %s " +
                             "[cartridge-type] %s [alias] %s [autoscaling-policy] %s", applicationId, cartridgeType,

http://git-wip-us.apache.org/repos/asf/stratos/blob/52380b1a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index 40d9a95..c5ba3b9 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -727,7 +727,7 @@ public class AutoscalerUtil {
     public static void validateApplicationPolicyAgainstApplication(String applicationId, String applicationPolicyId)
             throws ApplicatioinPolicyNotExistsException, InvalidApplicationPolicyException {
 
-        ApplicationPolicy applicationPolicy = PolicyManager.getInstance().getApplicationPolicy(applicationPolicyId);
+        ApplicationPolicy applicationPolicy = PolicyManager.getInstance().getApplicationPolicyById(applicationPolicyId);
         if (applicationPolicy == null) {
             String msg = String.format("Application Policy not exists for [application-policy-id] %s", applicationPolicyId);
             log.error(msg);
@@ -766,7 +766,7 @@ public class AutoscalerUtil {
         int referencesOfNetworkPartition = 0;
         for (String deploymentPolicyIDReferredInApp : deploymentPolicyIdsReferredInApplication) {
             try {
-                DeploymentPolicy deploymentPolicyInApp = PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyIDReferredInApp);
+                DeploymentPolicy deploymentPolicyInApp = PolicyManager.getInstance().getDeploymentPolicyById(deploymentPolicyIDReferredInApp);
                 if (deploymentPolicyInApp != null) {
                     for (NetworkPartitionRef networkPartitionOfDeploymentPolicy : deploymentPolicyInApp.getNetworkPartitionRefs()) {
                         if (networkPartitionOfDeploymentPolicy != null) {