mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
CLOUDSTACK-8991 - Make sure the public IP is removed form the router before checking
- Adding proper logger to the tests - Changing message that was copied/pasted from another assert
This commit is contained in:
Wilder Rodrigues
parent
f241455a63
commit
99318caa67
@ -50,9 +50,14 @@ from nose.plugins.attrib import attr
|
||||
from ddt import ddt, data
|
||||
# Import System modules
|
||||
import time
|
||||
import logging
|
||||
|
||||
_multiprocess_shared_ = True
|
||||
|
||||
logger = logging.getLogger('TestNetworkOps')
|
||||
stream_handler = logging.StreamHandler()
|
||||
logger.setLevel(logging.DEBUG)
|
||||
logger.addHandler(stream_handler)
|
||||
|
||||
class TestPublicIP(cloudstackTestCase):
|
||||
|
||||
@ -390,7 +395,7 @@ class TestPortForwarding(cloudstackTestCase):
|
||||
)
|
||||
# SSH virtual machine to test port forwarding
|
||||
try:
|
||||
self.debug("SSHing into VM with IP address %s with NAT IP %s" %
|
||||
logger.debug("SSHing into VM with IP address %s with NAT IP %s" %
|
||||
(
|
||||
self.virtual_machine.ipaddress,
|
||||
src_nat_ip_addr.ipaddress
|
||||
@ -424,7 +429,7 @@ class TestPortForwarding(cloudstackTestCase):
|
||||
|
||||
# Check if the Public SSH port is inaccessible
|
||||
with self.assertRaises(Exception):
|
||||
self.debug(
|
||||
logger.debug(
|
||||
"SSHing into VM with IP address %s after NAT rule deletion" %
|
||||
self.virtual_machine.ipaddress)
|
||||
|
||||
@ -518,7 +523,7 @@ class TestPortForwarding(cloudstackTestCase):
|
||||
)
|
||||
|
||||
try:
|
||||
self.debug("SSHing into VM with IP address %s with NAT IP %s" %
|
||||
logger.debug("SSHing into VM with IP address %s with NAT IP %s" %
|
||||
(
|
||||
self.virtual_machine.ipaddress,
|
||||
ip_address.ipaddress.ipaddress
|
||||
@ -538,11 +543,11 @@ class TestPortForwarding(cloudstackTestCase):
|
||||
id=nat_rule.id
|
||||
)
|
||||
except CloudstackAPIException:
|
||||
self.debug("Nat Rule is deleted")
|
||||
logger.debug("Nat Rule is deleted")
|
||||
|
||||
# Check if the Public SSH port is inaccessible
|
||||
with self.assertRaises(Exception):
|
||||
self.debug(
|
||||
logger.debug(
|
||||
"SSHing into VM with IP address %s after NAT rule deletion" %
|
||||
self.virtual_machine.ipaddress)
|
||||
|
||||
@ -673,8 +678,8 @@ class TestRebootRouter(cloudstackTestCase):
|
||||
|
||||
# Retrieve router for the user account
|
||||
|
||||
self.debug("Public IP: %s" % self.vm_1.ssh_ip)
|
||||
self.debug("Public IP: %s" % self.public_ip.ipaddress.ipaddress)
|
||||
logger.debug("Public IP: %s" % self.vm_1.ssh_ip)
|
||||
logger.debug("Public IP: %s" % self.public_ip.ipaddress.ipaddress)
|
||||
routers = list_routers(
|
||||
self.apiclient,
|
||||
account=self.account.name,
|
||||
@ -688,7 +693,7 @@ class TestRebootRouter(cloudstackTestCase):
|
||||
|
||||
router = routers[0]
|
||||
|
||||
self.debug("Rebooting the router (ID: %s)" % router.id)
|
||||
logger.debug("Rebooting the router (ID: %s)" % router.id)
|
||||
|
||||
cmd = rebootRouter.rebootRouterCmd()
|
||||
cmd.id = router.id
|
||||
@ -710,7 +715,7 @@ class TestRebootRouter(cloudstackTestCase):
|
||||
|
||||
vm = list_vm_response[0]
|
||||
if vm.state == 'Running':
|
||||
self.debug("VM state: %s" % vm.state)
|
||||
logger.debug("VM state: %s" % vm.state)
|
||||
break
|
||||
|
||||
if timeout == 0:
|
||||
@ -722,7 +727,7 @@ class TestRebootRouter(cloudstackTestCase):
|
||||
|
||||
# we should be able to SSH after successful reboot
|
||||
try:
|
||||
self.debug("SSH into VM (ID : %s ) after reboot" % self.vm_1.id)
|
||||
logger.debug("SSH into VM (ID : %s ) after reboot" % self.vm_1.id)
|
||||
|
||||
SshClient(
|
||||
self.public_ip.ipaddress.ipaddress,
|
||||
@ -825,7 +830,7 @@ class TestReleaseIP(cloudstackTestCase):
|
||||
def test_releaseIP(self):
|
||||
"""Test for release public IP address"""
|
||||
|
||||
self.debug("Deleting Public IP : %s" % self.ip_addr.id)
|
||||
logger.debug("Deleting Public IP : %s" % self.ip_addr.id)
|
||||
|
||||
self.ip_address.delete(self.apiclient)
|
||||
|
||||
@ -854,9 +859,9 @@ class TestReleaseIP(cloudstackTestCase):
|
||||
self.apiclient,
|
||||
id=self.nat_rule.id
|
||||
)
|
||||
self.debug("List NAT Rule response" + str(list_nat_rule))
|
||||
logger.debug("List NAT Rule response" + str(list_nat_rule))
|
||||
except CloudstackAPIException:
|
||||
self.debug("Port Forwarding Rule is deleted")
|
||||
logger.debug("Port Forwarding Rule is deleted")
|
||||
|
||||
# listLoadBalancerRules should not list
|
||||
# associated rules with Public IP address
|
||||
@ -865,9 +870,9 @@ class TestReleaseIP(cloudstackTestCase):
|
||||
self.apiclient,
|
||||
id=self.lb_rule.id
|
||||
)
|
||||
self.debug("List LB Rule response" + str(list_lb_rule))
|
||||
logger.debug("List LB Rule response" + str(list_lb_rule))
|
||||
except CloudstackAPIException:
|
||||
self.debug("Port Forwarding Rule is deleted")
|
||||
logger.debug("Port Forwarding Rule is deleted")
|
||||
|
||||
# SSH Attempt though public IP should fail
|
||||
with self.assertRaises(Exception):
|
||||
@ -982,7 +987,7 @@ class TestDeleteAccount(cloudstackTestCase):
|
||||
domainid=self.account.domainid
|
||||
)
|
||||
except CloudstackAPIException:
|
||||
self.debug("Port Forwarding Rule is deleted")
|
||||
logger.debug("Port Forwarding Rule is deleted")
|
||||
|
||||
# ListPortForwardingRules should not
|
||||
# list associated rules with deleted account
|
||||
@ -993,7 +998,7 @@ class TestDeleteAccount(cloudstackTestCase):
|
||||
domainid=self.account.domainid
|
||||
)
|
||||
except CloudstackAPIException:
|
||||
self.debug("NATRule is deleted")
|
||||
logger.debug("NATRule is deleted")
|
||||
|
||||
# Retrieve router for the user account
|
||||
try:
|
||||
@ -1008,7 +1013,7 @@ class TestDeleteAccount(cloudstackTestCase):
|
||||
"Check routers are properly deleted."
|
||||
)
|
||||
except CloudstackAPIException:
|
||||
self.debug("Router is deleted")
|
||||
logger.debug("Router is deleted")
|
||||
|
||||
except Exception as e:
|
||||
raise Exception(
|
||||
@ -1187,6 +1192,9 @@ class TestRouterRules(cloudstackTestCase):
|
||||
self.lb_rule.delete(self.apiclient)
|
||||
else:
|
||||
self.nat_rule.delete(self.apiclient)
|
||||
|
||||
ipaddressobj.delete(self.apiclient)
|
||||
|
||||
return
|
||||
|
||||
@data(STATIC_NAT_RULE, NAT_RULE, LB_RULE)
|
||||
@ -1216,13 +1224,13 @@ class TestRouterRules(cloudstackTestCase):
|
||||
listall=True)[0]
|
||||
|
||||
response = self.getCommandResultFromRouter(router, "ip addr")
|
||||
self.debug(response)
|
||||
logger.debug(response)
|
||||
stringToMatch = "inet %s" % self.ipaddress.ipaddress.ipaddress
|
||||
self.assertTrue(stringToMatch in str(response), "IP address is\
|
||||
not removed from VR even after disabling statin NAT")
|
||||
not added to the VR!")
|
||||
|
||||
try:
|
||||
self.debug("SSHing into VM with IP address %s with NAT IP %s" %
|
||||
logger.debug("SSHing into VM with IP address %s with NAT IP %s" %
|
||||
(
|
||||
self.virtual_machine.ipaddress,
|
||||
self.ipaddress.ipaddress.ipaddress
|
||||
@ -1242,14 +1250,14 @@ class TestRouterRules(cloudstackTestCase):
|
||||
self.removeNetworkRules(rule=value, ipaddressobj=self.ipaddress)
|
||||
|
||||
response = self.getCommandResultFromRouter(router, "ip addr")
|
||||
self.debug(response)
|
||||
logger.debug(response)
|
||||
stringToMatch = "inet %s" % self.ipaddress.ipaddress.ipaddress
|
||||
self.assertFalse(stringToMatch in str(response), "IP address is\
|
||||
not removed from VR even after disabling statin NAT")
|
||||
not removed from VR even after disabling stat in NAT")
|
||||
|
||||
# Check if the Public SSH port is inaccessible
|
||||
with self.assertRaises(Exception):
|
||||
self.debug(
|
||||
logger.debug(
|
||||
"SSHing into VM with IP address %s after NAT rule deletion" %
|
||||
self.virtual_machine.ipaddress)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user