etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

api_refactor: refactor loadbalancer apis 

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2012-12-04 11:25:20 -08:00
parent 8773fc2a55
commit 456b852c0c
16 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/src/com/cloud/network/lb/LoadBalancingRulesService.java
View File

@ -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 {

2
api/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java → api/src/org/apache/cloudstack/api/user/lb/command/AssignToLoadBalancerRuleCmd.java
View File

@ -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;

2
api/src/com/cloud/api/commands/CreateLBStickinessPolicyCmd.java → api/src/org/apache/cloudstack/api/user/lb/command/CreateLBStickinessPolicyCmd.java
View File

@ -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;

2
api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java → api/src/org/apache/cloudstack/api/user/lb/command/CreateLoadBalancerRuleCmd.java
View File

@ -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;

2
api/src/com/cloud/api/commands/DeleteLBStickinessPolicyCmd.java → api/src/org/apache/cloudstack/api/user/lb/command/DeleteLBStickinessPolicyCmd.java
View File

@ -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;

2
api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java → api/src/org/apache/cloudstack/api/user/lb/command/DeleteLoadBalancerRuleCmd.java
View File

@ -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;

2
api/src/com/cloud/api/commands/ListLBStickinessPoliciesCmd.java → api/src/org/apache/cloudstack/api/user/lb/command/ListLBStickinessPoliciesCmd.java
View File

@ -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;

2
api/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java → api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRuleInstancesCmd.java
View File

@ -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;

2
api/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java → api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRulesCmd.java
View File

@ -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;

2
api/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java → api/src/org/apache/cloudstack/api/user/lb/command/RemoveFromLoadBalancerRuleCmd.java
View File

@ -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;

2
api/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java → api/src/org/apache/cloudstack/api/user/lb/command/UpdateLoadBalancerRuleCmd.java
View File

@ -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;

20
client/tomcatconf/commands.properties.in
View File

@ -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

2
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java
View File

@ -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;

2
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
View File

@ -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;

2
server/src/com/cloud/network/lb/LoadBalancingRulesManager.java
View File

@ -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;

10
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
View File

@ -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;