diff options
author | 2017-12-28 16:09:48 -0700 | |
---|---|---|
committer | 2017-12-28 16:09:48 -0700 | |
commit | fd6271827bbd82fca4b5b7939da404809e82ae64 (patch) | |
tree | 2ff8736aa7423e98225b322db51f5d116e62ceb7 /snaps/provisioning/tests | |
parent | 58ae4e51e160ee243e2761e5bdaf42508d6097dc (diff) |
Enhancements to the SNAPS orchestrator/launcher
Added support for more Ansible substitution values extracted
from OpenStack instances (i.e. subnet broadcast address, router
external IP for gateway configuration, CIDR IP, netmask, etc.)
Removed most try/except blocks to ensure processing does not
continue when a problem should arise
Added the ability to know when cloud-init has completed
Removed nic configuration from OpenStackVmInstance as userdata/
cloud-init/cloud-config should be performing that functionality
Fixed some logging messages
Misc launcher bug fixes
Change-Id: I73e7607ee158cce3d16f9c1c1fc7c32ef5899a1d
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/provisioning/tests')
-rw-r--r-- | snaps/provisioning/tests/ansible_utils_tests.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/snaps/provisioning/tests/ansible_utils_tests.py b/snaps/provisioning/tests/ansible_utils_tests.py index 4f1f65e..7600002 100644 --- a/snaps/provisioning/tests/ansible_utils_tests.py +++ b/snaps/provisioning/tests/ansible_utils_tests.py @@ -241,6 +241,9 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): # Block until VM's ssh port has been opened self.assertTrue(self.inst_creator.vm_ssh_active(block=True)) + # Block until cloud-init has completed + self.assertTrue(self.inst_creator.cloud_init_complete(block=True)) + ssh_client = self.inst_creator.ssh_client() self.assertIsNotNone(ssh_client) @@ -310,6 +313,9 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): # Block until VM's ssh port has been opened self.assertTrue(self.inst_creator.vm_ssh_active(block=True)) + # Block until cloud-init has completed + self.assertTrue(self.inst_creator.cloud_init_complete(block=True)) + # Apply Security Group self.inst_creator.add_security_group( self.sec_grp_creator.get_security_group()) |