rename oVirt4 to Red Hat Virtualization

see: https://github.com/ansible/ansible-tower/issues/7790

awx/main/constants.py

@@ -5,7 +5,7 @@ import re
 
 from django.utils.translation import ugettext_lazy as _
 
-CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'ovirt4', 'satellite6', 'cloudforms', 'tower')
+CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'rhv', 'satellite6', 'cloudforms', 'tower')
 SCHEDULEABLE_PROVIDERS = CLOUD_PROVIDERS + ('custom', 'scm',)
 PRIVILEGE_ESCALATION_METHODS = [ ('sudo', _('Sudo')), ('su', _('Su')), ('pbrun', _('Pbrun')), ('pfexec', _('Pfexec')), ('dzdo', _('DZDO')), ('pmrun', _('Pmrun')), ('runas', _('Runas'))]
 ANSI_SGR_PATTERN = re.compile(r'\x1b\[[0-9;]*m')

awx/main/management/commands/inventory_import.py

@@ -229,6 +229,7 @@ def load_inventory_source(source, group_filter_re=None,
     '''
     # Sanity check: We sanitize these module names for our API but Ansible proper doesn't follow
     # good naming conventions
+    source = source.replace('rhv.py', 'ovirt4.py')
     source = source.replace('satellite6.py', 'foreman.py')
     source = source.replace('vmware.py', 'vmware_inventory.py')
     if not os.path.exists(source):

awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py

@@ -14,15 +14,15 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(credentialtypes.create_ovirt4_tower_credtype),
+        migrations.RunPython(credentialtypes.create_rhv_tower_credtype),
         migrations.AlterField(
             model_name='inventorysource',
             name='source',
-            field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'ovirt4', 'oVirt4'), (b'tower', 'Ansible Tower'), (b'custom', 'Custom Script')]),
+            field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'rhv', 'Red Hat Virtualization'), (b'tower', 'Ansible Tower'), (b'custom', 'Custom Script')]),
         ),
         migrations.AlterField(
             model_name='inventoryupdate',
             name='source',
-            field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'ovirt4', 'oVirt4'), (b'tower', 'Ansible Tower'), (b'custom', 'Custom Script')]),
+            field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'File, Directory or Script'), (b'scm', 'Sourced from a Project'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure_rm', 'Microsoft Azure Resource Manager'), (b'vmware', 'VMware vCenter'), (b'satellite6', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'rhv', 'Red Hat Virtualization'), (b'tower', 'Ansible Tower'), (b'custom', 'Custom Script')]),
         ),
     ]

awx/main/migrations/_credentialtypes.py

@@ -174,7 +174,7 @@ def migrate_job_credentials(apps, schema_editor):
         utils.get_current_apps = orig_current_apps
 
 
-def create_ovirt4_tower_credtype(apps, schema_editor):
+def create_rhv_tower_credtype(apps, schema_editor):
     CredentialType.setup_tower_managed_defaults()
 
 

awx/main/models/base.py

@@ -52,7 +52,7 @@ PROJECT_UPDATE_JOB_TYPE_CHOICES = [
     (PERM_INVENTORY_CHECK, _('Check')),
 ]
 
-CLOUD_INVENTORY_SOURCES = ['ec2', 'vmware', 'gce', 'azure_rm', 'openstack', 'ovirt4', 'custom', 'satellite6', 'cloudforms', 'scm', 'tower',]
+CLOUD_INVENTORY_SOURCES = ['ec2', 'vmware', 'gce', 'azure_rm', 'openstack', 'rhv', 'custom', 'satellite6', 'cloudforms', 'scm', 'tower',]
 
 VERBOSITY_CHOICES = [
     (0, '0 (Normal)'),

awx/main/models/credential.py

@@ -62,7 +62,7 @@ class V1Credential(object):
         ('gce', 'Google Compute Engine'),
         ('azure_rm', 'Microsoft Azure Resource Manager'),
         ('openstack', 'OpenStack'),
-        ('ovirt4', 'oVirt4'),
+        ('rhv', 'Red Hat Virtualization'),
         ('insights', 'Insights'),
         ('tower', 'Ansible Tower'),
     ]
@@ -1019,10 +1019,10 @@ def insights(cls):
 
 
 @CredentialType.default
-def ovirt4(cls):
+def rhv(cls):
     return cls(
         kind='cloud',
-        name='oVirt4',
+        name='Red Hat Virtualization',
         managed_by_tower=True,
         inputs={
             'fields': [{

awx/main/models/inventory.py

@@ -883,7 +883,7 @@ class InventorySourceOptions(BaseModel):
         ('satellite6', _('Red Hat Satellite 6')),
         ('cloudforms', _('Red Hat CloudForms')),
         ('openstack', _('OpenStack')),
-        ('ovirt4', _('oVirt4')),
+        ('rhv', _('Red Hat Virtualization')),
         ('tower', _('Ansible Tower')),
         ('custom', _('Custom Script')),
     ]
@@ -1134,7 +1134,7 @@ class InventorySourceOptions(BaseModel):
         return [('all', 'All')]
 
     @classmethod
-    def get_ovirt4_region_choices(self):
+    def get_rhv_region_choices(self):
         """No region supprt"""
         return [('all', 'All')]
 

awx/main/tests/functional/test_credential.py

@@ -25,7 +25,7 @@ def test_default_cred_types():
         'insights',
         'net',
         'openstack',
-        'ovirt4',
+        'rhv',
         'satellite6',
         'scm',
         'ssh',

awx/main/tests/unit/test_tasks.py

@@ -704,8 +704,8 @@ class TestJobCredentials(TestJobExecution):
         self.task.run(self.pk)
 
     @pytest.mark.parametrize("ca_file", [None, '/path/to/some/file'])
-    def test_ovirt4_credentials(self, ca_file):
+    def test_rhv_credentials(self, ca_file):
-        ovirt4 = CredentialType.defaults['ovirt4']()
+        rhv = CredentialType.defaults['rhv']()
         inputs = {
             'host': 'some-ovirt-host.example.org',
             'username': 'bob',
@@ -715,7 +715,7 @@ class TestJobCredentials(TestJobExecution):
             inputs['ca_file'] = ca_file
         credential = Credential(
             pk=1,
-            credential_type=ovirt4,
+            credential_type=rhv,
             inputs=inputs
         )
         credential.inputs['password'] = encrypt_field(credential, 'password')

awx/settings/defaults.py

@@ -825,12 +825,12 @@ OPENSTACK_INSTANCE_ID_VAR = 'openstack.id'
 # ---------------------
 # ----- oVirt4 -----
 # ---------------------
-OVIRT4_ENABLED_VAR = 'status'
+RHV_ENABLED_VAR = 'status'
-OVIRT4_ENABLED_VALUE = 'up'
+RHV_ENABLED_VALUE = 'up'
-OVIRT4_GROUP_FILTER = r'^.+$'
+RHV_GROUP_FILTER = r'^.+$'
-OVIRT4_HOST_FILTER = r'^.+$'
+RHV_HOST_FILTER = r'^.+$'
-OVIRT4_EXCLUDE_EMPTY_GROUPS = True
+RHV_EXCLUDE_EMPTY_GROUPS = True
-OVIRT4_INSTANCE_ID_VAR = 'id'
+RHV_INSTANCE_ID_VAR = 'id'
 
 # ---------------------
 # ----- Tower     -----