diff options
author | Tim Rozet <trozet@redhat.com> | 2017-09-29 05:12:14 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-09-29 05:12:14 +0000 |
commit | ba982af00b7ae7901eeef44260f62867dc60efc1 (patch) | |
tree | 6347a8ea2fc9b81ed8ec7515643e4476811f0049 /apex/virtual | |
parent | 924fd4c07a19029188b315f5aca716b03665f79f (diff) | |
parent | 024d3bb4be9987f626bf0c843828f95d1c660535 (diff) |
Merge "Adding python unittests for apex/virtual/*" into stable/euphrates
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): |