From dd5a36fcd2ebb373d627d061e67f16c304f4ae5b Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 4 Dec 2012 11:42:07 -0800 Subject: [PATCH] api_refactor: refactor for autoscale apis Signed-off-by: Rohit Yadav --- api/src/com/cloud/network/as/AutoScaleService.java | 2 +- .../api/admin/autoscale/command}/CreateCounterCmd.java | 2 +- .../api/admin/autoscale/command}/DeleteCounterCmd.java | 2 +- client/tomcatconf/commands.properties.in | 4 ++-- server/src/com/cloud/network/as/AutoScaleManagerImpl.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/autoscale/command}/CreateCounterCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/autoscale/command}/DeleteCounterCmd.java (98%) diff --git a/api/src/com/cloud/network/as/AutoScaleService.java b/api/src/com/cloud/network/as/AutoScaleService.java index 30848687b50..a6b2f487768 100644 --- a/api/src/com/cloud/network/as/AutoScaleService.java +++ b/api/src/com/cloud/network/as/AutoScaleService.java @@ -18,11 +18,11 @@ package com.cloud.network.as; import java.util.List; +import org.apache.cloudstack.api.admin.autoscale.command.CreateCounterCmd; 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 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; diff --git a/api/src/com/cloud/api/commands/CreateCounterCmd.java b/api/src/org/apache/cloudstack/api/admin/autoscale/command/CreateCounterCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/CreateCounterCmd.java rename to api/src/org/apache/cloudstack/api/admin/autoscale/command/CreateCounterCmd.java index f446519e2b8..1fb712ee7aa 100644 --- a/api/src/com/cloud/api/commands/CreateCounterCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/autoscale/command/CreateCounterCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.autoscale.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteCounterCmd.java b/api/src/org/apache/cloudstack/api/admin/autoscale/command/DeleteCounterCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteCounterCmd.java rename to api/src/org/apache/cloudstack/api/admin/autoscale/command/DeleteCounterCmd.java index 2b2d7b24e15..161c60c23d0 100644 --- a/api/src/com/cloud/api/commands/DeleteCounterCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/autoscale/command/DeleteCounterCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.autoscale.command; import org.apache.log4j.Logger; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index efa5cd928ec..c1ddf39993f 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -154,12 +154,12 @@ listLoadBalancerRuleInstances=org.apache.cloudstack.api.user.lb.command.ListLoad updateLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.UpdateLoadBalancerRuleCmd;15 #### autoscale commands -createCounter = com.cloud.api.commands.CreateCounterCmd;1 +createCounter = org.apache.cloudstack.api.admin.autoscale.command.CreateCounterCmd;1 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 +deleteCounter = org.apache.cloudstack.api.admin.autoscale.command.DeleteCounterCmd;1 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 diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java index 7917922d450..5673c37bba3 100644 --- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java +++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java @@ -37,7 +37,7 @@ 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.admin.autoscale.command.CreateCounterCmd; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; import org.apache.cloudstack.api.user.autoscale.command.ListAutoScalePoliciesCmd; import org.apache.cloudstack.api.user.autoscale.command.ListAutoScaleVmGroupsCmd;