apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing incorrect ipaddress references

Browse Source 
test_network: references to ipaddress are ipaddress.ipaddress
Added more logging to volume tests

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-05-24 11:12:39 +05:30
parent 3b48299a03
commit b2be0dbf6b
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
test/integration/smoke/test_network.py
View File

@ -971,12 +971,12 @@ class TestLoadBalancingRule(cloudstackTestCase):
try: try:
self.debug("SSHing into IP address: %s after adding VMs (ID: %s , %s)" % self.debug("SSHing into IP address: %s after adding VMs (ID: %s , %s)" %
( (
self.non_src_nat_ip.ipaddress, self.non_src_nat_ip.ipaddress.ipaddress,
self.vm_1.id, self.vm_1.id,
self.vm_2.id self.vm_2.id
)) ))
ssh_1 = remoteSSHClient( ssh_1 = remoteSSHClient(
self.non_src_nat_ip.ipaddress, self.non_src_nat_ip.ipaddress.ipaddress,
self.services['lbrule']["publicport"], self.services['lbrule']["publicport"],
self.vm_1.username, self.vm_1.username,
self.vm_1.password self.vm_1.password
@ -990,12 +990,12 @@ class TestLoadBalancingRule(cloudstackTestCase):
self.debug("SSHing again into IP address: %s with VMs (ID: %s , %s) added to LB rule" % self.debug("SSHing again into IP address: %s with VMs (ID: %s , %s) added to LB rule" %
( (
self.non_src_nat_ip.ipaddress, self.non_src_nat_ip.ipaddress.ipaddress,
self.vm_1.id, self.vm_1.id,
self.vm_2.id self.vm_2.id
)) ))
ssh_2 = remoteSSHClient( ssh_2 = remoteSSHClient(
self.non_src_nat_ip.ipaddress, self.non_src_nat_ip.ipaddress.ipaddress,
self.services['lbrule']["publicport"], self.services['lbrule']["publicport"],
self.vm_1.username, self.vm_1.username,
self.vm_1.password self.vm_1.password
@ -1019,11 +1019,11 @@ class TestLoadBalancingRule(cloudstackTestCase):
self.debug("SSHing into IP address: %s after removing VM (ID: %s) from LB rule" % self.debug("SSHing into IP address: %s after removing VM (ID: %s) from LB rule" %
( (
self.non_src_nat_ip.ipaddress, self.non_src_nat_ip.ipaddress.ipaddress,
self.vm_2.id self.vm_2.id
)) ))
ssh_1 = remoteSSHClient( ssh_1 = remoteSSHClient(
self.non_src_nat_ip.ipaddress, self.non_src_nat_ip.ipaddress.ipaddress,
self.services['lbrule']["publicport"], self.services['lbrule']["publicport"],
self.vm_1.username, self.vm_1.username,
self.vm_1.password self.vm_1.password
@ -1033,7 +1033,7 @@ class TestLoadBalancingRule(cloudstackTestCase):
self.debug("Hostnames after removing VM2: %s" % str(hostnames)) self.debug("Hostnames after removing VM2: %s" % str(hostnames))
except Exception as e: except Exception as e:
self.fail("%s: SSH failed for VM with IP Address: %s" % self.fail("%s: SSH failed for VM with IP Address: %s" %
(e, self.non_src_nat_ip.ipaddress)) (e, self.non_src_nat_ip.ipaddress.ipaddress))
self.assertIn( self.assertIn(
self.vm_1.name, self.vm_1.name,
@ -1045,11 +1045,11 @@ class TestLoadBalancingRule(cloudstackTestCase):
with self.assertRaises(Exception): with self.assertRaises(Exception):
self.fail("SSHing into IP address: %s after removing VM (ID: %s) from LB rule" % self.fail("SSHing into IP address: %s after removing VM (ID: %s) from LB rule" %
( (
self.non_src_nat_ip.ipaddress, self.non_src_nat_ip.ipaddress.ipaddress,
self.vm_1.id self.vm_1.id
)) ))
ssh_1 = remoteSSHClient( ssh_1 = remoteSSHClient(
self.non_src_nat_ip.ipaddress, self.non_src_nat_ip.ipaddress.ipaddress,
self.services['lbrule']["publicport"], self.services['lbrule']["publicport"],
self.vm_1.username, self.vm_1.username,
self.vm_1.password self.vm_1.password
@ -1203,7 +1203,7 @@ class TestRebootRouter(cloudstackTestCase):
self.debug("SSH into VM (ID : %s ) after reboot" % self.vm_1.id) self.debug("SSH into VM (ID : %s ) after reboot" % self.vm_1.id)
remoteSSHClient( remoteSSHClient(
self.nat_rule.ipaddress, self.nat_rule.ipaddress.ipaddress,
self.services["natrule"]["publicport"], self.services["natrule"]["publicport"],
self.vm_1.username, self.vm_1.username,
self.vm_1.password self.vm_1.password
@ -1211,8 +1211,7 @@ class TestRebootRouter(cloudstackTestCase):
except Exception as e: except Exception as e:
self.fail( self.fail(
"SSH Access failed for %s: %s" % \ "SSH Access failed for %s: %s" % \
(self.vm_1.ipaddress, e) (self.vm_1.ipaddress, e))
)
return return
def tearDown(self): def tearDown(self):
@ -1579,7 +1578,6 @@ class TestReleaseIP(cloudstackTestCase):
"Check if disassociated IP Address is no longer available" "Check if disassociated IP Address is no longer available"
) )
self.debug("List NAT Rule response" + str(list_nat_rule))
# ListPortForwardingRules should not list # ListPortForwardingRules should not list
# associated rules with Public IP address # associated rules with Public IP address
try: try:
@ -1587,18 +1585,18 @@ class TestReleaseIP(cloudstackTestCase):
self.apiclient, self.apiclient,
id=self.nat_rule.id id=self.nat_rule.id
) )
self.debug("List NAT Rule response" + str(list_nat_rule))
except cloudstackAPIException: except cloudstackAPIException:
self.debug("Port Forwarding Rule is deleted") self.debug("Port Forwarding Rule is deleted")
# listLoadBalancerRules should not list # listLoadBalancerRules should not list
# associated rules with Public IP address # associated rules with Public IP address
self.debug("List LB Rule response" + str(list_lb_rule))
try: try:
list_lb_rule = list_lb_rules( list_lb_rule = list_lb_rules(
self.apiclient, self.apiclient,
id=self.lb_rule.id id=self.lb_rule.id
) )
self.debug("List LB Rule response" + str(list_lb_rule))
except cloudstackAPIException: except cloudstackAPIException:
self.debug("Port Forwarding Rule is deleted") self.debug("Port Forwarding Rule is deleted")
@ -1658,7 +1656,6 @@ class TestDeleteAccount(cloudstackTestCase):
try: try:
src_nat_ip_addr = src_nat_ip_addrs[0] src_nat_ip_addr = src_nat_ip_addrs[0]
except Exception as e: except Exception as e:
self.fail("SSH failed for VM with IP: %s" % self.fail("SSH failed for VM with IP: %s" %
src_nat_ip_addr.ipaddress) src_nat_ip_addr.ipaddress)
@ -1740,10 +1737,9 @@ class TestDeleteAccount(cloudstackTestCase):
"Check routers are properly deleted." "Check routers are properly deleted."
) )
except Exception as e: except Exception as e:
raise Exception( raise Exception(
"Exception raised while fetching routers for account: %s" % "Encountered %s raised while fetching routers for account: %s" % (e,
self.account.name) self.account.name))
return return
def tearDown(self): def tearDown(self):

2
test/integration/smoke/test_volumes.py
View File

@ -209,8 +209,8 @@ class TestCreateVolume(cloudstackTestCase):
) )
try: try:
ssh = self.virtual_machine.get_ssh_client() ssh = self.virtual_machine.get_ssh_client()
self.debug("Rebooting VM %s" % self.virtual_machine.id)
ssh.execute("reboot") ssh.execute("reboot")
except Exception as e: except Exception as e:
self.fail("SSH access failed for VM %s - %s" % self.fail("SSH access failed for VM %s - %s" %
(self.virtual_machine.ipaddress, e)) (self.virtual_machine.ipaddress, e))