From 456b852c0cd4d8fbd2d5dcd02181bcb7828df84e Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 4 Dec 2012 11:25:20 -0800 Subject: [PATCH] api_refactor: refactor loadbalancer apis Signed-off-by: Rohit Yadav --- .../network/lb/LoadBalancingRulesService.java | 10 ++++------ .../command}/AssignToLoadBalancerRuleCmd.java | 2 +- .../command}/CreateLBStickinessPolicyCmd.java | 2 +- .../command}/CreateLoadBalancerRuleCmd.java | 2 +- .../command}/DeleteLBStickinessPolicyCmd.java | 2 +- .../command}/DeleteLoadBalancerRuleCmd.java | 2 +- .../command}/ListLBStickinessPoliciesCmd.java | 2 +- .../ListLoadBalancerRuleInstancesCmd.java | 2 +- .../lb/command}/ListLoadBalancerRulesCmd.java | 2 +- .../RemoveFromLoadBalancerRuleCmd.java | 2 +- .../command}/UpdateLoadBalancerRuleCmd.java | 2 +- client/tomcatconf/commands.properties.in | 20 +++++++++---------- .../lb/ElasticLoadBalancerManager.java | 2 +- .../lb/ElasticLoadBalancerManagerImpl.java | 2 +- .../network/lb/LoadBalancingRulesManager.java | 2 +- .../lb/LoadBalancingRulesManagerImpl.java | 10 ++++------ 16 files changed, 31 insertions(+), 35 deletions(-) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/lb/command}/AssignToLoadBalancerRuleCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/lb/command}/CreateLBStickinessPolicyCmd.java (99%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/lb/command}/CreateLoadBalancerRuleCmd.java (99%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/lb/command}/DeleteLBStickinessPolicyCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/lb/command}/DeleteLoadBalancerRuleCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/lb/command}/ListLBStickinessPoliciesCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/lb/command}/ListLoadBalancerRuleInstancesCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/lb/command}/ListLoadBalancerRulesCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/lb/command}/RemoveFromLoadBalancerRuleCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/lb/command}/UpdateLoadBalancerRuleCmd.java (98%) diff --git a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java b/api/src/com/cloud/network/lb/LoadBalancingRulesService.java index c5e6b5c3f40..3aec8324486 100644 --- a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java +++ b/api/src/com/cloud/network/lb/LoadBalancingRulesService.java @@ -18,12 +18,9 @@ package com.cloud.network.lb; import java.util.List; -import com.cloud.api.commands.CreateLBStickinessPolicyCmd; -import com.cloud.api.commands.CreateLoadBalancerRuleCmd; -import com.cloud.api.commands.ListLBStickinessPoliciesCmd; -import com.cloud.api.commands.ListLoadBalancerRuleInstancesCmd; -import com.cloud.api.commands.ListLoadBalancerRulesCmd; -import com.cloud.api.commands.UpdateLoadBalancerRuleCmd; +import org.apache.cloudstack.api.user.lb.command.*; +import org.apache.cloudstack.api.user.lb.command.CreateLBStickinessPolicyCmd; +import org.apache.cloudstack.api.user.lb.command.UpdateLoadBalancerRuleCmd; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; @@ -31,6 +28,7 @@ import com.cloud.network.rules.LoadBalancer; import com.cloud.network.rules.StickinessPolicy; import com.cloud.uservm.UserVm; import com.cloud.utils.Pair; +import org.apache.cloudstack.api.user.lb.command.ListLoadBalancerRulesCmd; public interface LoadBalancingRulesService { diff --git a/api/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/user/lb/command/AssignToLoadBalancerRuleCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java rename to api/src/org/apache/cloudstack/api/user/lb/command/AssignToLoadBalancerRuleCmd.java index fc99113ca45..fae88a65c26 100644 --- a/api/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/user/lb/command/AssignToLoadBalancerRuleCmd.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.lb.command; import java.util.List; diff --git a/api/src/com/cloud/api/commands/CreateLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/user/lb/command/CreateLBStickinessPolicyCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/CreateLBStickinessPolicyCmd.java rename to api/src/org/apache/cloudstack/api/user/lb/command/CreateLBStickinessPolicyCmd.java index 2ea726e8837..866422a4e0b 100644 --- a/api/src/com/cloud/api/commands/CreateLBStickinessPolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/user/lb/command/CreateLBStickinessPolicyCmd.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.lb.command; import java.util.Map; diff --git a/api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/user/lb/command/CreateLoadBalancerRuleCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java rename to api/src/org/apache/cloudstack/api/user/lb/command/CreateLoadBalancerRuleCmd.java index 0402709a300..bacf54de5e0 100644 --- a/api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/user/lb/command/CreateLoadBalancerRuleCmd.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.lb.command; import java.util.List; diff --git a/api/src/com/cloud/api/commands/DeleteLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/user/lb/command/DeleteLBStickinessPolicyCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteLBStickinessPolicyCmd.java rename to api/src/org/apache/cloudstack/api/user/lb/command/DeleteLBStickinessPolicyCmd.java index dd7933000ea..f68ab8c0f82 100644 --- a/api/src/com/cloud/api/commands/DeleteLBStickinessPolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/user/lb/command/DeleteLBStickinessPolicyCmd.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.lb.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/user/lb/command/DeleteLoadBalancerRuleCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java rename to api/src/org/apache/cloudstack/api/user/lb/command/DeleteLoadBalancerRuleCmd.java index 5a00b2246c1..2bff86b9e83 100644 --- a/api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/user/lb/command/DeleteLoadBalancerRuleCmd.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.lb.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/ListLBStickinessPoliciesCmd.java b/api/src/org/apache/cloudstack/api/user/lb/command/ListLBStickinessPoliciesCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListLBStickinessPoliciesCmd.java rename to api/src/org/apache/cloudstack/api/user/lb/command/ListLBStickinessPoliciesCmd.java index 92a27bc12ba..b4a351cbc6d 100644 --- a/api/src/com/cloud/api/commands/ListLBStickinessPoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/user/lb/command/ListLBStickinessPoliciesCmd.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.lb.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java b/api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRuleInstancesCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java rename to api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRuleInstancesCmd.java index 49f066bc277..1b6577ebd5a 100644 --- a/api/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java +++ b/api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRuleInstancesCmd.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.lb.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java b/api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRulesCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java rename to api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRulesCmd.java index c7f5e1869ad..0c1b9b0f223 100644 --- a/api/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRulesCmd.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.lb.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/user/lb/command/RemoveFromLoadBalancerRuleCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java rename to api/src/org/apache/cloudstack/api/user/lb/command/RemoveFromLoadBalancerRuleCmd.java index 5d5d7007eb1..9aeca0281d2 100644 --- a/api/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/user/lb/command/RemoveFromLoadBalancerRuleCmd.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.lb.command; import java.util.List; diff --git a/api/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/user/lb/command/UpdateLoadBalancerRuleCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java rename to api/src/org/apache/cloudstack/api/user/lb/command/UpdateLoadBalancerRuleCmd.java index 91ed7d386ff..a738c65f9b4 100644 --- a/api/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/user/lb/command/UpdateLoadBalancerRuleCmd.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.lb.command; import org.apache.log4j.Logger; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 14c79db7e16..489387722b6 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -142,16 +142,16 @@ listIpForwardingRules=org.apache.cloudstack.api.user.nat.command.ListIpForwardin disableStaticNat=org.apache.cloudstack.api.user.nat.command.DisableStaticNatCmd;15 #### load balancer commands -createLoadBalancerRule=com.cloud.api.commands.CreateLoadBalancerRuleCmd;15 -deleteLoadBalancerRule=com.cloud.api.commands.DeleteLoadBalancerRuleCmd;15 -removeFromLoadBalancerRule=com.cloud.api.commands.RemoveFromLoadBalancerRuleCmd;15 -assignToLoadBalancerRule=com.cloud.api.commands.AssignToLoadBalancerRuleCmd;15 -createLBStickinessPolicy=com.cloud.api.commands.CreateLBStickinessPolicyCmd;15 -deleteLBStickinessPolicy=com.cloud.api.commands.DeleteLBStickinessPolicyCmd;15 -listLoadBalancerRules=com.cloud.api.commands.ListLoadBalancerRulesCmd;15 -listLBStickinessPolicies=com.cloud.api.commands.ListLBStickinessPoliciesCmd;15 -listLoadBalancerRuleInstances=com.cloud.api.commands.ListLoadBalancerRuleInstancesCmd;15 -updateLoadBalancerRule=com.cloud.api.commands.UpdateLoadBalancerRuleCmd;15 +createLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.CreateLoadBalancerRuleCmd;15 +deleteLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.DeleteLoadBalancerRuleCmd;15 +removeFromLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.RemoveFromLoadBalancerRuleCmd;15 +assignToLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.AssignToLoadBalancerRuleCmd;15 +createLBStickinessPolicy=org.apache.cloudstack.api.user.lb.command.CreateLBStickinessPolicyCmd;15 +deleteLBStickinessPolicy=org.apache.cloudstack.api.user.lb.command.DeleteLBStickinessPolicyCmd;15 +listLoadBalancerRules=org.apache.cloudstack.api.user.lb.command.ListLoadBalancerRulesCmd;15 +listLBStickinessPolicies=org.apache.cloudstack.api.user.lb.command.ListLBStickinessPoliciesCmd;15 +listLoadBalancerRuleInstances=org.apache.cloudstack.api.user.lb.command.ListLoadBalancerRuleInstancesCmd;15 +updateLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.UpdateLoadBalancerRuleCmd;15 #### autoscale commands createCounter = com.cloud.api.commands.CreateCounterCmd;1 diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java index 0dc5b14a1a5..d4cedf647f1 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java @@ -18,7 +18,7 @@ package com.cloud.network.lb; import java.util.List; -import com.cloud.api.commands.CreateLoadBalancerRuleCmd; +import org.apache.cloudstack.api.user.lb.command.CreateLoadBalancerRuleCmd; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java index 366070af21f..3ce2717e936 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java @@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.user.lb.command.CreateLoadBalancerRuleCmd; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; @@ -46,7 +47,6 @@ import com.cloud.agent.api.to.LoadBalancerTO; import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.manager.Commands; -import com.cloud.api.commands.CreateLoadBalancerRuleCmd; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.DataCenter; diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManager.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManager.java index 47f1b18fdcb..c6aba418556 100644 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManager.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManager.java @@ -18,7 +18,7 @@ package com.cloud.network.lb; import java.util.List; -import com.cloud.api.commands.CreateLoadBalancerRuleCmd; +import org.apache.cloudstack.api.user.lb.command.CreateLoadBalancerRuleCmd; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.lb.LoadBalancingRule.LbDestination; diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index 6d1041a659d..7d0acfa3e2b 100755 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -30,14 +30,12 @@ import java.util.Set; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.user.lb.command.*; import org.apache.log4j.Logger; -import com.cloud.api.commands.CreateLBStickinessPolicyCmd; -import com.cloud.api.commands.CreateLoadBalancerRuleCmd; -import com.cloud.api.commands.ListLBStickinessPoliciesCmd; -import com.cloud.api.commands.ListLoadBalancerRuleInstancesCmd; -import com.cloud.api.commands.ListLoadBalancerRulesCmd; -import com.cloud.api.commands.UpdateLoadBalancerRuleCmd; +import org.apache.cloudstack.api.user.lb.command.CreateLBStickinessPolicyCmd; +import org.apache.cloudstack.api.user.lb.command.ListLoadBalancerRuleInstancesCmd; +import org.apache.cloudstack.api.user.lb.command.ListLoadBalancerRulesCmd; import com.cloud.api.response.ServiceResponse; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager;