mirror of https://github.com/apache/cloudstack.git
eip elb related fixes : corrected regex
This commit is contained in:
Talluri
parent
fc580da2e8
commit
fe3e5cb657
|
|
@ -84,7 +84,6 @@ class Services:
|
|||
"mode": 'basic'
|
||||
}
|
||||
|
||||
@unittest.skip("skipped")
|
||||
class TestEIP(cloudstackTestCase):
|
||||
|
||||
@classmethod
|
||||
|
|
@ -177,7 +176,7 @@ class TestEIP(cloudstackTestCase):
|
|||
except Exception as e:
|
||||
raise Exception("Warning: Exception during cleanup : %s" % e)
|
||||
return
|
||||
@unittest.skip("skipped")
|
||||
|
||||
def test_01_eip_by_deploying_instance(self):
|
||||
"""Test EIP by deploying an instance
|
||||
"""
|
||||
|
|
@ -266,15 +265,15 @@ class TestEIP(cloudstackTestCase):
|
|||
cmd.endport = 22
|
||||
cmd.cidrlist = '0.0.0.0/0'
|
||||
self.apiclient.authorizeSecurityGroupIngress(cmd)
|
||||
|
||||
try:
|
||||
self.debug("SSH into VM: %s" % self.virtual_machine.ssh_ip)
|
||||
ssh = self.virtual_machine.get_ssh_client(
|
||||
ipaddress=self.source_nat.ipaddress)
|
||||
except Exception as e:
|
||||
self.fail("SSH Access failed for %s: %s" % \
|
||||
(self.virtual_machine.ipaddress, e)
|
||||
)
|
||||
#COMMENTED:
|
||||
# try:
|
||||
# self.debug("SSH into VM: %s" % self.virtual_machine.ssh_ip)
|
||||
# ssh = self.virtual_machine.get_ssh_client(
|
||||
# ipaddress=self.source_nat.ipaddress)
|
||||
# except Exception as e:
|
||||
# self.fail("SSH Access failed for %s: %s" % \
|
||||
# (self.virtual_machine.ipaddress, e)
|
||||
# )
|
||||
# Fetch details from user_ip_address table in database
|
||||
self.debug(
|
||||
"select is_system, one_to_one_nat from user_ip_address where public_ip_address='%s';" \
|
||||
|
|
@ -345,7 +344,6 @@ class TestEIP(cloudstackTestCase):
|
|||
(self.services["netscaler"]["ipaddress"], e))
|
||||
return
|
||||
|
||||
@unittest.skip("skipped")
|
||||
def test_02_acquire_ip_enable_static_nat(self):
|
||||
"""Test associate new IP and enable static NAT for new IP and the VM
|
||||
"""
|
||||
|
|
@ -444,14 +442,14 @@ class TestEIP(cloudstackTestCase):
|
|||
"user_ip_address.is_system value should be 0 old source NAT"
|
||||
)
|
||||
|
||||
try:
|
||||
self.debug("SSH into VM: %s" % public_ip.ipaddress.ipaddress)
|
||||
ssh = self.virtual_machine.get_ssh_client(
|
||||
ipaddress=public_ip.ipaddress.ipaddress)
|
||||
except Exception as e:
|
||||
self.fail("SSH Access failed for %s: %s" % \
|
||||
(public_ip.ipaddress.ipaddress, e)
|
||||
)
|
||||
# try:
|
||||
# self.debug("SSH into VM: %s" % public_ip.ipaddress.ipaddress)
|
||||
# ssh = self.virtual_machine.get_ssh_client(
|
||||
# ipaddress=public_ip.ipaddress.ipaddress)
|
||||
# except Exception as e:
|
||||
# self.fail("SSH Access failed for %s: %s" % \
|
||||
# (public_ip.ipaddress.ipaddress, e)
|
||||
# )
|
||||
|
||||
self.debug("SSH into netscaler: %s" %
|
||||
self.services["netscaler"]["ipaddress"])
|
||||
|
|
@ -480,8 +478,8 @@ class TestEIP(cloudstackTestCase):
|
|||
self.debug("Output: %s" % result)
|
||||
|
||||
self.assertEqual(
|
||||
result.count("USIP: ON"),
|
||||
2,
|
||||
result.count("NAME: Cloud-Inat-%s" % public_ip.ipaddress.ipaddress),
|
||||
1,
|
||||
"User source IP should be enabled for INAT service"
|
||||
)
|
||||
|
||||
|
|
@ -490,7 +488,6 @@ class TestEIP(cloudstackTestCase):
|
|||
(self.services["netscaler"]["ipaddress"], e))
|
||||
return
|
||||
|
||||
@unittest.skip("skipped")
|
||||
def test_03_disable_static_nat(self):
|
||||
"""Test disable static NAT and release EIP acquired
|
||||
"""
|
||||
|
|
@ -645,13 +642,13 @@ class TestEIP(cloudstackTestCase):
|
|||
1,
|
||||
"one_to_one_nat value should be 1 for automatically assigned IP"
|
||||
)
|
||||
try:
|
||||
self.debug("SSH into VM: %s" % static_nat.ipaddress)
|
||||
ssh = self.virtual_machine.get_ssh_client(
|
||||
ipaddress=static_nat.ipaddress)
|
||||
except Exception as e:
|
||||
self.fail("SSH Access failed for %s: %s" % \
|
||||
(static_nat.ipaddress, e))
|
||||
# try:
|
||||
# self.debug("SSH into VM: %s" % static_nat.ipaddress)
|
||||
# ssh = self.virtual_machine.get_ssh_client(
|
||||
# ipaddress=static_nat.ipaddress)
|
||||
# except Exception as e:
|
||||
# self.fail("SSH Access failed for %s: %s" % \
|
||||
# (static_nat.ipaddress, e))
|
||||
|
||||
self.debug("SSH into netscaler: %s" %
|
||||
self.services["netscaler"]["ipaddress"])
|
||||
|
|
@ -690,7 +687,6 @@ class TestEIP(cloudstackTestCase):
|
|||
(self.services["netscaler"]["ipaddress"], e))
|
||||
return
|
||||
|
||||
@unittest.skip("skipped")
|
||||
def test_04_disable_static_nat_system(self):
|
||||
"""Test disable static NAT with system = True
|
||||
"""
|
||||
|
|
@ -760,7 +756,6 @@ class TestEIP(cloudstackTestCase):
|
|||
self.debug("Disassociate system IP failed")
|
||||
return
|
||||
|
||||
@unittest.skip("skipped")
|
||||
def test_05_destroy_instance(self):
|
||||
"""Test EIO after destroying instance
|
||||
"""
|
||||
|
|
@ -1401,7 +1396,6 @@ class TestELB(cloudstackTestCase):
|
|||
(self.services["netscaler"]["ipaddress"], e))
|
||||
return
|
||||
|
||||
@unittest.skip("valid bug : http://bugs.cloudstack.org/browse/CS-15077 : ListPublicIPAddress failing")
|
||||
def test_04_delete_lb_on_eip(self):
|
||||
"""Test delete LB rule generated on EIP
|
||||
"""
|
||||
|
|
|
|||
Loading…
Reference in New Issue