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

CLOUDSTACK-4840: Automation test cases for LB for secondaruy IP

This commit is contained in:
Ashutosh K 2014-07-14 21:45:19 +05:30 committed by sanjeev
parent 598e9b1cbc
commit 134a868013
3 changed files with 1847 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1822
test/integration/component/test_lb_secondary_ip.py Normal file
View File

File diff suppressed because it is too large Load Diff

2
tools/marvin/marvin/config/test_data.py
View File

@ -715,7 +715,7 @@ test_data = {
"name": "SSH",
"alg": "roundrobin",
"privateport": 22,
"publicport": 2222,
"publicport": 22,
"protocol": 'TCP'
},
"icmprule": {

35
tools/marvin/marvin/lib/base.py
View File

@ -1403,7 +1403,7 @@ class PublicIPAddress:
if accountid:
cmd.account = accountid
elif "account" in services:
elif services and "account" in services:
cmd.account = services["account"]
if zoneid:
@ -1413,7 +1413,7 @@ class PublicIPAddress:
if domainid:
cmd.domainid = domainid
elif "domainid" in services:
elif services and "domainid" in services:
cmd.domainid = services["domainid"]
if isportable:
@ -2165,19 +2165,25 @@ class LoadBalancerRule:
apiclient.deleteLoadBalancerRule(cmd)
return
def assign(self, apiclient, vms):
def assign(self, apiclient, vms=None, vmidipmap=None):
"""Assign virtual machines to load balancing rule"""
cmd = assignToLoadBalancerRule.assignToLoadBalancerRuleCmd()
cmd.id = self.id
cmd.virtualmachineids = [str(vm.id) for vm in vms]
if vmidipmap:
cmd.vmidipmap = vmidipmap
if vms:
cmd.virtualmachineids = [str(vm.id) for vm in vms]
apiclient.assignToLoadBalancerRule(cmd)
return
def remove(self, apiclient, vms):
def remove(self, apiclient, vms=None, vmidipmap=None):
"""Remove virtual machines from load balancing rule"""
cmd = removeFromLoadBalancerRule.removeFromLoadBalancerRuleCmd()
cmd.id = self.id
cmd.virtualmachineids = [str(vm.id) for vm in vms]
if vms:
cmd.virtualmachineids = [str(vm.id) for vm in vms]
if vmidipmap:
cmd.vmidipmap = vmidipmap
apiclient.removeFromLoadBalancerRule(cmd)
return
@ -2241,13 +2247,14 @@ class LoadBalancerRule:
return(apiclient.listLoadBalancerRules(cmd))
@classmethod
def listLoadBalancerRuleInstances(cls, apiclient, id, applied=None, **kwargs):
def listLoadBalancerRuleInstances(cls, apiclient, id, lbvmips=False, applied=None, **kwargs):
"""Lists load balancing rule Instances"""
cmd = listLoadBalancerRuleInstances.listLoadBalancerRuleInstancesCmd()
cmd.id = id
if applied:
cmd.applied = applied
cmd.lbvmips = lbvmips
[setattr(cmd, k, v) for k, v in kwargs.items()]
return apiclient.listLoadBalancerRuleInstances(cmd)
@ -4404,19 +4411,25 @@ class ApplicationLoadBalancer:
apiclient.deleteLoadBalancerRule(cmd)
return
def assign(self, apiclient, vms):
def assign(self, apiclient, vms=None, vmidipmap=None):
"""Assign virtual machines to load balancing rule"""
cmd = assignToLoadBalancerRule.assignToLoadBalancerRuleCmd()
cmd.id = self.id
cmd.virtualmachineids = [str(vm.id) for vm in vms]
if vmidipmap:
cmd.vmidipmap = vmidipmap
if vms:
cmd.virtualmachineids = [str(vm.id) for vm in vms]
apiclient.assignToLoadBalancerRule(cmd)
return
def remove(self, apiclient, vms):
def remove(self, apiclient, vms=None, vmidipmap=None):
"""Remove virtual machines from load balancing rule"""
cmd = removeFromLoadBalancerRule.removeFromLoadBalancerRuleCmd()
cmd.id = self.id
cmd.virtualmachineids = [str(vm.id) for vm in vms]
if vms:
cmd.virtualmachineids = [str(vm.id) for vm in vms]
if vmidipmap:
cmd.vmidipmap = vmidipmap
apiclient.removeFromLoadBalancerRule(cmd)
return