summaryrefslogtreecommitdiffstats
path: root/snaps/openstack/create_instance.py
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2017-05-12 13:59:04 -0600
committerspisarski <s.pisarski@cablelabs.com>2017-05-16 14:21:56 -0600
commit10c665d7c831cf198ac9e675654693860e602bf9 (patch)
treeb30f75115e80ddc983b9e3555b165992cef234c1 /snaps/openstack/create_instance.py
parent6fd1af82cd7bf41274c4e1620006004b79628759 (diff)
Added support for offline testing
Expanded the image_metadata used by the tests for overriding default images for not only supporting 3part images but also to support offline testing as required by Functest. JIRA: SNAPS-67 Change-Id: I6975e7b51fa879fe984af64402939c465df95184 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/create_instance.py')
-rw-r--r--snaps/openstack/create_instance.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/snaps/openstack/create_instance.py b/snaps/openstack/create_instance.py
index e1e38a1..bb101ba 100644
--- a/snaps/openstack/create_instance.py
+++ b/snaps/openstack/create_instance.py
@@ -426,7 +426,7 @@ class OpenStackVmInstance:
variables, self.__os_creds.proxy_settings)
else:
logger.warning('VM ' + self.instance_settings.name + ' cannot self configure NICs eth1++. ' +
- 'No playbook or keypairs found.')
+ 'No playbook or keypairs found.')
def get_image_user(self):
"""
@@ -496,6 +496,9 @@ class OpenStackVmInstance:
:param expected_status_code: instance status evaluated with this string value
:return: T/F
"""
+ if not self.__vm:
+ return False
+
instance = self.__nova.servers.get(self.__vm.id)
if not instance:
logger.warning('Cannot find instance with id - ' + self.__vm.id)