Merge "Adding python unittests for apex/virtual/*"

diff --combined apex/overcloud/overcloud_deploy.py
index 9931174,3b79ec4..a0a6670
--- 1/apex/overcloud/overcloud_deploy.py
--- 2/apex/overcloud/overcloud_deploy.py
+++ b/apex/overcloud/overcloud_deploy.py
@@@ -20,7 -20,7 +20,7 @@@ import tim
  from apex.common import constants as con
  from apex.common.exceptions import ApexDeployException
  from apex.common import parsers
- from apex.virtual import virtual_utils as virt_utils
+ from apex.virtual import utils as virt_utils
  from cryptography.hazmat.primitives import serialization as \
      crypto_serialization
  from cryptography.hazmat.primitives.asymmetric import rsa
@@@ -100,6 -100,7 +100,6 @@@ def create_deploy_cmd(ds, ns, inv, tmp_
      ds_opts = ds['deploy_options']
      deploy_options += build_sdn_env_list(ds_opts, SDN_FILE_MAP)
  
 -    # TODO(trozet): make sure rt kvm file is in tht dir
      for k, v in OTHER_FILE_MAP.items():
          if k in ds_opts and ds_opts[k]:
              deploy_options.append(os.path.join(con.THT_ENV_DIR, v))
@@@ -417,16 -418,17 +417,16 @@@ def prep_env(ds, ns, opnfv_env, net_env
                  ds_opts['dataplane'] == 'ovs_dpdk':
              print('  OS::TripleO::ComputeExtraConfigPre: '
                    './ovs-dpdk-preconfig.yaml')
 -        elif perf and perf_kern_comp:
 -            if 'resource_registry' in line:
 -                print("resource_registry:\n"
 -                      "  OS::TripleO::NodeUserData: first-boot.yaml")
 -            elif 'NovaSchedulerDefaultFilters' in line:
 -                print("  NovaSchedulerDefaultFilters: 'RamFilter,"
 -                      "ComputeFilter,AvailabilityZoneFilter,"
 -                      "ComputeCapabilitiesFilter,ImagePropertiesFilter,"
 -                      "NUMATopologyFilter'")
 -            else:
 -                print(line)
 +        elif ((perf and perf_kern_comp) or ds_opts.get('rt_kvm')) and \
 +                'resource_registry' in line:
 +            print("resource_registry:\n"
 +                  "  OS::TripleO::NodeUserData: first-boot.yaml")
 +        elif perf and perf_kern_comp and \
 +                'NovaSchedulerDefaultFilters' in line:
 +            print("  NovaSchedulerDefaultFilters: 'RamFilter,"
 +                  "ComputeFilter,AvailabilityZoneFilter,"
 +                  "ComputeCapabilitiesFilter,ImagePropertiesFilter,"
 +                  "NUMATopologyFilter'")
          else:
              print(line)