diff options
author | spisarski <s.pisarski@cablelabs.com> | 2017-07-10 09:51:28 -0600 |
---|---|---|
committer | spisarski <s.pisarski@cablelabs.com> | 2017-07-10 09:51:28 -0600 |
commit | 552e9c7a67ad4f07579385c2fada52f52cf5c532 (patch) | |
tree | c2eefacfa947c4c467627e2e3f0ad38f285a375a | |
parent | 56ad05c9ed980a5e4c71d18bb4067519ae7efa49 (diff) |
Changed validation logic to check for DHCP lease before SSH connection.
Change-Id: Ifa5c481963d0a9607107465915eb7ab12501e21d
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
-rw-r--r-- | snaps/provisioning/tests/ansible_utils_tests.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/snaps/provisioning/tests/ansible_utils_tests.py b/snaps/provisioning/tests/ansible_utils_tests.py index 83e34ca..1cab8a6 100644 --- a/snaps/provisioning/tests/ansible_utils_tests.py +++ b/snaps/provisioning/tests/ansible_utils_tests.py @@ -27,7 +27,8 @@ from snaps.openstack import create_router from snaps.openstack.create_security_group import ( SecurityGroupRuleSettings, Direction, Protocol, OpenStackSecurityGroup, SecurityGroupSettings) -from snaps.openstack.tests import openstack_tests, create_instance_tests +from snaps.openstack.tests import openstack_tests +from snaps.openstack.tests.create_instance_tests import check_dhcp_lease from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase from snaps.openstack.utils import nova_utils from snaps.provisioning import ansible_utils @@ -226,13 +227,12 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): """ vm = self.inst_creator.create(block=True) + priv_ip = self.inst_creator.get_port_ip(self.port_1_name) + self.assertTrue(check_dhcp_lease(self.nova, vm, priv_ip)) + # Block until VM's ssh port has been opened self.assertTrue(self.inst_creator.vm_ssh_active(block=True)) - priv_ip = self.inst_creator.get_port_ip(self.port_1_name) - self.assertTrue(create_instance_tests.check_dhcp_lease( - self.nova, vm, priv_ip)) - # Apply Security Group self.inst_creator.add_security_group( self.sec_grp_creator.get_security_group()) @@ -279,13 +279,12 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): """ vm = self.inst_creator.create(block=True) + priv_ip = self.inst_creator.get_port_ip(self.port_1_name) + self.assertTrue(check_dhcp_lease(self.nova, vm, priv_ip)) + # Block until VM's ssh port has been opened self.assertTrue(self.inst_creator.vm_ssh_active(block=True)) - priv_ip = self.inst_creator.get_port_ip(self.port_1_name) - self.assertTrue(create_instance_tests.check_dhcp_lease( - self.nova, vm, priv_ip)) - # Apply Security Group self.inst_creator.add_security_group( self.sec_grp_creator.get_security_group()) |