Merge pull request #1494 from jkrocil/fix-utils-vms

Fix utils.virtual_machines - check provider type

utils/virtual_machines.py

@@ -2,17 +2,21 @@
 """
 
 from cfme.cloud.provider import get_from_config as get_cloud_from_config
-from cfme.exceptions import UnknownProviderType
 from cfme.infrastructure.provider import get_from_config as get_infra_from_config
+from utils import conf
 from utils.log import logger
 from utils.mgmt_system import RHEVMSystem, VMWareSystem, EC2System, OpenstackSystem, SCVMMSystem
+from utils.providers import infra_provider_type_map
 
 
 def deploy_template(provider_key, vm_name, template_name=None, timeout=900, **deploy_args):
-    try:
+
+    provider_type = conf.cfme_data['management_systems'][provider_key]['type']
+    if provider_type in infra_provider_type_map:
         provider_crud = get_infra_from_config(provider_key)
-    except UnknownProviderType:
+    else:
         provider_crud = get_cloud_from_config(provider_key)
+
     mgmt = provider_crud.get_mgmt_system()
     data = provider_crud.get_yaml_data()