Merge "Added PublicDnsName verification in unit tests"
This commit is contained in:
commit
274bc4b2e1
|
@ -150,7 +150,7 @@ class InstancesTest(HeatTestCase):
|
||||||
expected_ip = return_server.networks['public'][0]
|
expected_ip = return_server.networks['public'][0]
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PublicIp'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PublicIp'))
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateIp'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateIp'))
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PublicDnsName'))
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
|
||||||
|
|
||||||
self.m.VerifyAll()
|
self.m.VerifyAll()
|
||||||
|
@ -165,7 +165,7 @@ class InstancesTest(HeatTestCase):
|
||||||
expected_ip = return_server.networks['public'][0]
|
expected_ip = return_server.networks['public'][0]
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PublicIp'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PublicIp'))
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateIp'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateIp'))
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PublicDnsName'))
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
|
||||||
|
|
||||||
self.m.VerifyAll()
|
self.m.VerifyAll()
|
||||||
|
|
|
@ -173,7 +173,7 @@ class instancesTest(HeatTestCase):
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PublicIp'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PublicIp'))
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateIp'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateIp'))
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PublicDnsName'))
|
||||||
|
|
||||||
d1 = {'server': self.fc.client.get_servers_detail()[1]['servers'][0]}
|
d1 = {'server': self.fc.client.get_servers_detail()[1]['servers'][0]}
|
||||||
d1['server']['status'] = vm_status
|
d1['server']['status'] = vm_status
|
||||||
|
@ -328,6 +328,6 @@ class instancesTest(HeatTestCase):
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PublicIp'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PublicIp'))
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateIp'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateIp'))
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
|
||||||
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
|
self.assertEqual(expected_ip, instance.FnGetAtt('PublicDnsName'))
|
||||||
|
|
||||||
self.m.VerifyAll()
|
self.m.VerifyAll()
|
||||||
|
|
Loading…
Reference in New Issue