From feb342ad2364a6237298e200d7eb9866cf004a2a Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 4 Dec 2012 11:30:37 -0800 Subject: [PATCH] api_refactor: refactor autoscale apis Signed-off-by: Rohit Yadav --- .../cloud/network/as/AutoScaleService.java | 20 +++++------ .../command}/CreateAutoScalePolicyCmd.java | 2 +- .../command}/CreateAutoScaleVmGroupCmd.java | 2 +- .../command}/CreateAutoScaleVmProfileCmd.java | 2 +- .../command}/CreateConditionCmd.java | 2 +- .../command}/DeleteAutoScalePolicyCmd.java | 2 +- .../command}/DeleteAutoScaleVmGroupCmd.java | 2 +- .../command}/DeleteAutoScaleVmProfileCmd.java | 2 +- .../command}/DeleteConditionCmd.java | 2 +- .../command}/DisableAutoScaleVmGroupCmd.java | 2 +- .../command}/EnableAutoScaleVmGroupCmd.java | 2 +- .../command}/ListAutoScalePoliciesCmd.java | 2 +- .../command}/ListAutoScaleVmGroupsCmd.java | 2 +- .../command}/ListAutoScaleVmProfilesCmd.java | 2 +- .../autoscale/command}/ListConditionsCmd.java | 2 +- .../autoscale/command}/ListCountersCmd.java | 2 +- .../command}/UpdateAutoScalePolicyCmd.java | 2 +- .../command}/UpdateAutoScaleVmGroupCmd.java | 2 +- .../command}/UpdateAutoScaleVmProfileCmd.java | 2 +- client/tomcatconf/commands.properties.in | 36 +++++++++---------- .../network/as/AutoScaleManagerImpl.java | 23 ++++++------ 21 files changed, 55 insertions(+), 60 deletions(-) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/CreateAutoScalePolicyCmd.java (99%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/CreateAutoScaleVmGroupCmd.java (99%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/CreateAutoScaleVmProfileCmd.java (99%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/CreateConditionCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/DeleteAutoScalePolicyCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/DeleteAutoScaleVmGroupCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/DeleteAutoScaleVmProfileCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/DeleteConditionCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/DisableAutoScaleVmGroupCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/EnableAutoScaleVmGroupCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/ListAutoScalePoliciesCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/ListAutoScaleVmGroupsCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/ListAutoScaleVmProfilesCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/ListConditionsCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/ListCountersCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/UpdateAutoScalePolicyCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/UpdateAutoScaleVmGroupCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/autoscale/command}/UpdateAutoScaleVmProfileCmd.java (98%) diff --git a/api/src/com/cloud/network/as/AutoScaleService.java b/api/src/com/cloud/network/as/AutoScaleService.java index f62a4d65b0a..30848687b50 100644 --- a/api/src/com/cloud/network/as/AutoScaleService.java +++ b/api/src/com/cloud/network/as/AutoScaleService.java @@ -18,19 +18,15 @@ package com.cloud.network.as; import java.util.List; -import com.cloud.api.commands.CreateAutoScalePolicyCmd; -import com.cloud.api.commands.CreateAutoScaleVmGroupCmd; -import com.cloud.api.commands.CreateAutoScaleVmProfileCmd; -import com.cloud.api.commands.CreateConditionCmd; +import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScalePolicyCmd; +import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmGroupCmd; +import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmProfileCmd; +import org.apache.cloudstack.api.user.autoscale.command.*; import com.cloud.api.commands.CreateCounterCmd; -import com.cloud.api.commands.ListAutoScalePoliciesCmd; -import com.cloud.api.commands.ListAutoScaleVmGroupsCmd; -import com.cloud.api.commands.ListAutoScaleVmProfilesCmd; -import com.cloud.api.commands.ListConditionsCmd; -import com.cloud.api.commands.ListCountersCmd; -import com.cloud.api.commands.UpdateAutoScalePolicyCmd; -import com.cloud.api.commands.UpdateAutoScaleVmGroupCmd; -import com.cloud.api.commands.UpdateAutoScaleVmProfileCmd; +import org.apache.cloudstack.api.user.autoscale.command.ListAutoScalePoliciesCmd; +import org.apache.cloudstack.api.user.autoscale.command.ListConditionsCmd; +import org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmGroupCmd; +import org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmProfileCmd; import com.cloud.exception.ResourceInUseException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/com/cloud/api/commands/CreateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScalePolicyCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/CreateAutoScalePolicyCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScalePolicyCmd.java index a921a9b2439..75cead97a3d 100644 --- a/api/src/com/cloud/api/commands/CreateAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScalePolicyCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import java.util.List; diff --git a/api/src/com/cloud/api/commands/CreateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScaleVmGroupCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/CreateAutoScaleVmGroupCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScaleVmGroupCmd.java index 30a7d01eb3b..34042075bca 100644 --- a/api/src/com/cloud/api/commands/CreateAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScaleVmGroupCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import java.util.List; diff --git a/api/src/com/cloud/api/commands/CreateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScaleVmProfileCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/CreateAutoScaleVmProfileCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScaleVmProfileCmd.java index 7d16973fee1..74c08dfd9f9 100644 --- a/api/src/com/cloud/api/commands/CreateAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScaleVmProfileCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import java.util.HashMap; import java.util.Map; diff --git a/api/src/com/cloud/api/commands/CreateConditionCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateConditionCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/CreateConditionCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/CreateConditionCmd.java index 3c0cf299cf5..2884f8e3a90 100644 --- a/api/src/com/cloud/api/commands/CreateConditionCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateConditionCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScalePolicyCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteAutoScalePolicyCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScalePolicyCmd.java index 6cf22c55074..a6228b4be76 100644 --- a/api/src/com/cloud/api/commands/DeleteAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScalePolicyCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScaleVmGroupCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteAutoScaleVmGroupCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScaleVmGroupCmd.java index 852b351c70b..b1198c94c35 100644 --- a/api/src/com/cloud/api/commands/DeleteAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScaleVmGroupCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScaleVmProfileCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteAutoScaleVmProfileCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScaleVmProfileCmd.java index f48112b8a51..a8565dc8097 100644 --- a/api/src/com/cloud/api/commands/DeleteAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScaleVmProfileCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteConditionCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteConditionCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteConditionCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteConditionCmd.java index d09ed6dfeb0..26c23a5ef83 100644 --- a/api/src/com/cloud/api/commands/DeleteConditionCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteConditionCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DisableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/DisableAutoScaleVmGroupCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DisableAutoScaleVmGroupCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/DisableAutoScaleVmGroupCmd.java index 3ca52ed23fd..ba87c586572 100644 --- a/api/src/com/cloud/api/commands/DisableAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/DisableAutoScaleVmGroupCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/EnableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/EnableAutoScaleVmGroupCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/EnableAutoScaleVmGroupCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/EnableAutoScaleVmGroupCmd.java index 329998ac074..93039b0b204 100644 --- a/api/src/com/cloud/api/commands/EnableAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/EnableAutoScaleVmGroupCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/ListAutoScalePoliciesCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScalePoliciesCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListAutoScalePoliciesCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScalePoliciesCmd.java index 06424d07799..57db5be3933 100644 --- a/api/src/com/cloud/api/commands/ListAutoScalePoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScalePoliciesCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/ListAutoScaleVmGroupsCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScaleVmGroupsCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListAutoScaleVmGroupsCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScaleVmGroupsCmd.java index 6cb3d567ea4..adea921c696 100644 --- a/api/src/com/cloud/api/commands/ListAutoScaleVmGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScaleVmGroupsCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/ListAutoScaleVmProfilesCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScaleVmProfilesCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListAutoScaleVmProfilesCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScaleVmProfilesCmd.java index 987c18c8bc4..aae7376eeb1 100644 --- a/api/src/com/cloud/api/commands/ListAutoScaleVmProfilesCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScaleVmProfilesCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/ListConditionsCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/ListConditionsCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListConditionsCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/ListConditionsCmd.java index c99d627ae6a..d5dd067ba5d 100644 --- a/api/src/com/cloud/api/commands/ListConditionsCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/ListConditionsCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/ListCountersCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/ListCountersCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListCountersCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/ListCountersCmd.java index b70a03fc481..b55aeb5d964 100644 --- a/api/src/com/cloud/api/commands/ListCountersCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/ListCountersCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/UpdateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScalePolicyCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateAutoScalePolicyCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScalePolicyCmd.java index 00781261a0c..01945f243a0 100644 --- a/api/src/com/cloud/api/commands/UpdateAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScalePolicyCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import java.util.List; diff --git a/api/src/com/cloud/api/commands/UpdateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScaleVmGroupCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateAutoScaleVmGroupCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScaleVmGroupCmd.java index 600f9c88b03..1d7911e6d70 100644 --- a/api/src/com/cloud/api/commands/UpdateAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScaleVmGroupCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import java.util.List; diff --git a/api/src/com/cloud/api/commands/UpdateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScaleVmProfileCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateAutoScaleVmProfileCmd.java rename to api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScaleVmProfileCmd.java index ff2135ab5c2..08e0667575c 100644 --- a/api/src/com/cloud/api/commands/UpdateAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScaleVmProfileCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.user.autoscale.command; import java.util.Map; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 489387722b6..5632fe61b63 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -155,25 +155,25 @@ updateLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.UpdateLoadBalan #### autoscale commands createCounter = com.cloud.api.commands.CreateCounterCmd;1 -createCondition = com.cloud.api.commands.CreateConditionCmd;15 -createAutoScalePolicy=com.cloud.api.commands.CreateAutoScalePolicyCmd;15 -createAutoScaleVmProfile=com.cloud.api.commands.CreateAutoScaleVmProfileCmd;15 -createAutoScaleVmGroup=com.cloud.api.commands.CreateAutoScaleVmGroupCmd;15 +createCondition = org.apache.cloudstack.api.user.autoscale.command.CreateConditionCmd;15 +createAutoScalePolicy=org.apache.cloudstack.api.user.autoscale.command.CreateAutoScalePolicyCmd;15 +createAutoScaleVmProfile=org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmProfileCmd;15 +createAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmGroupCmd;15 deleteCounter = com.cloud.api.commands.DeleteCounterCmd;1 -deleteCondition = com.cloud.api.commands.DeleteConditionCmd;15 -deleteAutoScalePolicy=com.cloud.api.commands.DeleteAutoScalePolicyCmd;15 -deleteAutoScaleVmProfile=com.cloud.api.commands.DeleteAutoScaleVmProfileCmd;15 -deleteAutoScaleVmGroup=com.cloud.api.commands.DeleteAutoScaleVmGroupCmd;15 -listCounters = com.cloud.api.commands.ListCountersCmd;15 -listConditions = com.cloud.api.commands.ListConditionsCmd;15 -listAutoScalePolicies=com.cloud.api.commands.ListAutoScalePoliciesCmd;15 -listAutoScaleVmProfiles=com.cloud.api.commands.ListAutoScaleVmProfilesCmd;15 -listAutoScaleVmGroups=com.cloud.api.commands.ListAutoScaleVmGroupsCmd;15 -enableAutoScaleVmGroup=com.cloud.api.commands.EnableAutoScaleVmGroupCmd;15 -disableAutoScaleVmGroup=com.cloud.api.commands.DisableAutoScaleVmGroupCmd;15 -updateAutoScalePolicy=com.cloud.api.commands.UpdateAutoScalePolicyCmd;15 -updateAutoScaleVmProfile=com.cloud.api.commands.UpdateAutoScaleVmProfileCmd;15 -updateAutoScaleVmGroup=com.cloud.api.commands.UpdateAutoScaleVmGroupCmd;15 +deleteCondition = org.apache.cloudstack.api.user.autoscale.command.DeleteConditionCmd;15 +deleteAutoScalePolicy=org.apache.cloudstack.api.user.autoscale.command.DeleteAutoScalePolicyCmd;15 +deleteAutoScaleVmProfile=org.apache.cloudstack.api.user.autoscale.command.DeleteAutoScaleVmProfileCmd;15 +deleteAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.DeleteAutoScaleVmGroupCmd;15 +listCounters = org.apache.cloudstack.api.user.autoscale.command.ListCountersCmd;15 +listConditions = org.apache.cloudstack.api.user.autoscale.command.ListConditionsCmd;15 +listAutoScalePolicies=org.apache.cloudstack.api.user.autoscale.command.ListAutoScalePoliciesCmd;15 +listAutoScaleVmProfiles=org.apache.cloudstack.api.user.autoscale.command.ListAutoScaleVmProfilesCmd;15 +listAutoScaleVmGroups=org.apache.cloudstack.api.user.autoscale.command.ListAutoScaleVmGroupsCmd;15 +enableAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.EnableAutoScaleVmGroupCmd;15 +disableAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.DisableAutoScaleVmGroupCmd;15 +updateAutoScalePolicy=org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScalePolicyCmd;15 +updateAutoScaleVmProfile=org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmProfileCmd;15 +updateAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmGroupCmd;15 #### router commands startRouter=com.cloud.api.commands.StartRouterCmd;7 diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java index 651625b594f..7917922d450 100644 --- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java +++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java @@ -25,6 +25,7 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.user.autoscale.command.*; import org.apache.log4j.Logger; import com.cloud.acl.ControlledEntity; @@ -32,20 +33,18 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiDispatcher; import org.apache.cloudstack.api.BaseListAccountResourcesCmd; -import com.cloud.api.commands.CreateAutoScalePolicyCmd; -import com.cloud.api.commands.CreateAutoScaleVmGroupCmd; -import com.cloud.api.commands.CreateAutoScaleVmProfileCmd; -import com.cloud.api.commands.CreateConditionCmd; +import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScalePolicyCmd; +import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmGroupCmd; +import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmProfileCmd; +import org.apache.cloudstack.api.user.autoscale.command.CreateConditionCmd; import com.cloud.api.commands.CreateCounterCmd; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; -import com.cloud.api.commands.ListAutoScalePoliciesCmd; -import com.cloud.api.commands.ListAutoScaleVmGroupsCmd; -import com.cloud.api.commands.ListAutoScaleVmProfilesCmd; -import com.cloud.api.commands.ListConditionsCmd; -import com.cloud.api.commands.ListCountersCmd; -import com.cloud.api.commands.UpdateAutoScalePolicyCmd; -import com.cloud.api.commands.UpdateAutoScaleVmGroupCmd; -import com.cloud.api.commands.UpdateAutoScaleVmProfileCmd; +import org.apache.cloudstack.api.user.autoscale.command.ListAutoScalePoliciesCmd; +import org.apache.cloudstack.api.user.autoscale.command.ListAutoScaleVmGroupsCmd; +import org.apache.cloudstack.api.user.autoscale.command.ListConditionsCmd; +import org.apache.cloudstack.api.user.autoscale.command.ListCountersCmd; +import org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScalePolicyCmd; +import org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmProfileCmd; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.dao.ConfigurationDao;