diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-09-19 15:57:01 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-09-28 17:33:27 +0000 |
| commit | 024d3bb4be9987f626bf0c843828f95d1c660535 (patch) | |
| tree | 513af246a95048a79ef7c7e51bbee022f36e85a0 /apex/virtual | |
| parent | 40eedda05c1757b3b0810ac088c1b067fa325dd1 (diff) | |
Adding python unittests for apex/virtual/*
Change-Id: I13dd395cd6270cbf0a02855b1d29794ecca06d76
Signed-off-by: Dan Radez <dradez@redhat.com>
(cherry picked from commit 9d24ddc56a76175a4b7514cea5c789e2612b2528)
Diffstat (limited to 'apex/virtual')
| -rw-r--r-- | apex/virtual/utils.py (renamed from apex/virtual/virtual_utils.py) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apex/virtual/virtual_utils.py b/apex/virtual/utils.py index 1fe2c399..226af1b5 100644 --- a/apex/virtual/virtual_utils.py +++ b/apex/virtual/utils.py @@ -16,7 +16,7 @@ import pprint import subprocess import xml.etree.ElementTree as ET -from apex.common import utils +from apex.common import utils as common_utils from apex.virtual import configure_vm as vm_lib from virtualbmc import manager as vbmc_lib @@ -39,7 +39,7 @@ def get_virt_ip(): tree = ET.fromstring(virsh_net_xml) ip_tag = tree.find('ip') - if ip_tag: + if ip_tag is not None: virsh_ip = ip_tag.get('address') if virsh_ip: logging.debug("Detected virsh default network ip: " @@ -95,9 +95,9 @@ def generate_inventory(target_file, ha_enabled=False, num_computes=1, tmp_node['memory'] = compute_ram inv_output['nodes']['node{}'.format(idx)] = copy.deepcopy(tmp_node) - utils.dump_yaml(inv_output, target_file) - + common_utils.dump_yaml(inv_output, target_file) logging.info('Virtual environment file created: {}'.format(target_file)) + return inv_output def host_setup(node): |