bump versions of Galaxy collection requirements

Implement 2.9 version policy

Update ec2 collection name

Enable ovirt, refresh test files

Put in upstream forks to get it running for now

pick up openstack.cloud fix

awx/main/models/inventory.py

@@ -1616,7 +1616,7 @@ class PluginFileInjector(object):
     # so that a source without a collection will have null values
     namespace = None
     collection = None
-    collection_migration = '2.10'  # In this version, content moved to collections
+    collection_migration = '2.9'  # Starting with this version, we use collections
 
     def __init__(self, ansible_version):
         # This is InventoryOptions instance, could be source or inventory update
@@ -1886,8 +1886,8 @@ class ec2(PluginFileInjector):
     initial_version = '2.9'  # Driven by unsafe group names issue, parent_group templating, hostvars
     ini_env_reference = 'EC2_INI_PATH'
     base_injector = 'managed'
-    namespace = 'ansible'
-    collection = 'amazon'
+    namespace = 'amazon'
+    collection = 'aws'
 
     def get_plugin_env(self, *args, **kwargs):
         ret = super(ec2, self).get_plugin_env(*args, **kwargs)
@@ -2230,10 +2230,10 @@ class gce(PluginFileInjector):
 
 class vmware(PluginFileInjector):
     plugin_name = 'vmware_vm_inventory'  # FIXME: implement me
-    initial_version = '2.10'  # Only tested with collection version, TODO: test 2.9 as candidate
+    initial_version = '2.9'  # Only tested with collection version
     ini_env_reference = 'VMWARE_INI_PATH'
     base_injector = 'managed'
-    namespace = 'community'
+    namespace = 'alancoding'  # FIXME
     collection = 'vmware'
 
     @property
@@ -2584,7 +2584,7 @@ class openstack(PluginFileInjector):
 class rhv(PluginFileInjector):
     """ovirt uses the custom credential templating, and that is all
     """
-    # plugin_name = 'FIXME'  # contribute inventory plugin to Ansible
+    plugin_name = 'ovirt'
     base_injector = 'template'
     namespace = 'ovirt'
     collection = 'ovirt_collection'
@@ -2597,7 +2597,7 @@ class rhv(PluginFileInjector):
 class satellite6(PluginFileInjector):
     plugin_name = 'foreman'
     ini_env_reference = 'FOREMAN_INI_PATH'
-    initial_version = '2.10'
+    initial_version = '2.9'
     # No base injector, because this does not work in playbooks. Bug??
     namespace = 'theforeman'
     collection = 'foreman'

awx/main/tests/data/inventory/plugins/ec2/files/aws_ec2.yml

@@ -76,7 +76,7 @@ keyed_groups:
   parent_group: '{{ placement.region }}'
   prefix: ''
   separator: ''
-plugin: ansible.amazon.aws_ec2
+plugin: amazon.aws.aws_ec2
 regions:
 - us-east-2
 - ap-south-1

awx/main/tests/data/inventory/plugins/rhv/env.json

@@ -0,0 +1,7 @@
+{
+    "ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
+    "OVIRT_INI_PATH": "{{ file_reference }}",
+    "OVIRT_PASSWORD": "fooo",
+    "OVIRT_URL": "https://foo.invalid",
+    "OVIRT_USERNAME": "fooo"
+}

awx/main/tests/data/inventory/plugins/rhv/files/file_reference

@@ -0,0 +1,5 @@
+[ovirt]
+ovirt_url=https://foo.invalid
+ovirt_username=fooo
+ovirt_password=fooo
+ovirt_ca_file=fooo

awx/main/tests/data/inventory/plugins/rhv/files/ovirt.yml

@@ -0,0 +1 @@
+plugin: ovirt.ovirt_collection.ovirt

awx/main/tests/data/inventory/plugins/satellite6/files/foreman.yml

@@ -1 +1,20 @@
+keyed_groups:
+- key: foreman['environment_name'] | lower | regex_replace(' ', '') | regex_replace('[^A-Za-z0-9\_]', '_') | regex_replace('none', '')
+  prefix: foreman_environment_
+  separator: ''
+- key: foreman['location_name'] | lower | regex_replace(' ', '') | regex_replace('[^A-Za-z0-9\_]', '_')
+  prefix: foreman_location_
+  separator: ''
+- key: foreman['organization_name'] | lower | regex_replace(' ', '') | regex_replace('[^A-Za-z0-9\_]', '_')
+  prefix: foreman_organization_
+  separator: ''
+- key: foreman['content_facet_attributes']['lifecycle_environment_name'] | lower | regex_replace(' ', '') | regex_replace('[^A-Za-z0-9\_]', '_')
+  prefix: foreman_lifecycle_environment_
+  separator: ''
+- key: foreman['content_facet_attributes']['content_view_name'] | lower | regex_replace(' ', '') | regex_replace('[^A-Za-z0-9\_]', '_')
+  prefix: foreman_content_view_
+  separator: ''
+legacy_hostvars: true
 plugin: theforeman.foreman.foreman
+want_facts: true
+want_params: true

awx/main/tests/data/inventory/plugins/vmware/env.json

@@ -0,0 +1,7 @@
+{
+    "ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
+    "VMWARE_HOST": "https://foo.invalid",
+    "VMWARE_PASSWORD": "fooo",
+    "VMWARE_USER": "fooo",
+    "VMWARE_VALIDATE_CERTS": "False"
+}

awx/main/tests/data/inventory/plugins/vmware/files/vmware_vm_inventory.yml

@@ -0,0 +1,215 @@
+plugin: community.vmware.vmware_vm_inventory
+properties:
+- name
+- config.cpuHotAddEnabled
+- config.cpuHotRemoveEnabled
+- config.instanceUuid
+- config.hardware.numCPU
+- config.template
+- config.name
+- guest.hostName
+- guest.ipAddress
+- guest.guestId
+- guest.guestState
+- runtime.maxMemoryUsage
+- customValue
+- vpmcsupported
+- vpmcenabled
+- vmxconfigchecksum
+- vmstorageobjectid
+- vmnpivwwnupdatesupported
+- vmnpivwwnsupported
+- vmnpivwwndisablesupported
+- vmfsnativesnapshotsupported
+- vm
+- virtualmmuusagesupported
+- virtualmmuusageignored
+- virtualexecusageignored
+- vflashcachereservation
+- vflashcacheallocation
+- version
+- vassertsenabled
+- vappconfig
+- value
+- uuid
+- triggeredalarmstate
+- toolsversionstatus2
+- toolsversionstatus
+- toolsversion
+- toolsupdatestatus
+- toolssynctimesupported
+- toolsstatus
+- toolsrunningstatus
+- toolsrebootpredictsupported
+- toolsinstalltype
+- toolsinstallermounted
+- toolsautoupdatesupported
+- tools
+- timestamp
+- template
+- tag
+- swapstorageobjectid
+- swapplacementsupported
+- swapplacement
+- suspendtime
+- suspendinterval
+- summary
+- storage
+- snapshotoperationssupported
+- snapshotinbackground
+- snapshotconfigsupported
+- snapshot
+- settingvideoramsizesupported
+- settingscreenresolutionsupported
+- settingdisplaytopologysupported
+- settingdisplaytopologymodessupported
+- sesparsedisksupported
+- securebootsupported
+- screen
+- scheduledhardwareupgradeinfo
+- s1acpimanagementsupported
+- runtime
+- rootsnapshot
+- reverttosnapshotsupported
+- resourcepool
+- repconfig
+- recordreplaysupported
+- recordreplaystate
+- recenttask
+- quiescedsnapshotssupported
+- quiescedforkparent
+- quickstats
+- question
+- powerstate
+- powerpolicy
+- poweredonmonitortypechangesupported
+- poweredoffsnapshotssupported
+- pervmevcsupported
+- permission
+- perdatastoreusage
+- paused
+- parentvapp
+- overallstatus
+- onlinestandby
+- offlinefeaturerequirement
+- nummksconnections
+- npivwwnonnonrdmvmsupported
+- npivworldwidenametype
+- npivtemporarydisabled
+- npivportworldwidename
+- npivonnonrdmdisks
+- npivnodeworldwidename
+- npivdesiredportwwns
+- npivdesirednodewwns
+- networkshaper
+- network
+- net
+- nestedhvsupported
+- nestedhvenabled
+- needsecondaryreason
+- name
+- multiplesnapshotssupported
+- multiplecorespersocketsupported
+- modified
+- minrequiredevcmodekey
+- migrateencryption
+- messagebustunnelenabled
+- messagebussupported
+- memorysnapshotssupported
+- memoryreservationlocksupported
+- memoryreservationlockedtomax
+- memoryoverhead
+- memoryhotaddenabled
+- memoryallocation
+- memoryaffinity
+- maxmksconnections
+- maxmemoryusage
+- maxcpuusage
+- managedby
+- locksnapshotssupported
+- locationid
+- layoutex
+- layout
+- latencysensitivity
+- keyid
+- ipstack
+- ipaddress
+- interactiveguestoperationsready
+- instantclonefrozen
+- instanceuuid
+- initialoverhead
+- hotplugmemorylimit
+- hotplugmemoryincrementsize
+- hostname
+- hostbasedreplicationsupported
+- host
+- hardware
+- gueststatechangesupported
+- gueststate
+- guestoperationsready
+- guestkernelcrashed
+- guestintegrityinfo
+- guestid
+- guestheartbeatstatus
+- guestfullname
+- guestfamily
+- guestautolocksupported
+- guestautolockenabled
+- guest
+- generationinfo
+- ftinfo
+- forkconfiginfo
+- flags
+- firmware
+- files
+- featurerequirementsupported
+- featurerequirement
+- featuremask
+- faulttolerancestate
+- extraconfig
+- effectiverole
+- dynamictype
+- dynamicproperty
+- disksharessupported
+- diskonlysnapshotonsuspendedvmsupported
+- disk
+- disablesnapshotssupported
+- device
+- defaultpowerops
+- datastoreurl
+- datastore
+- dasvmprotection
+- customvalue
+- cryptostate
+- createdate
+- cpuhotremoveenabled
+- cpuhotaddenabled
+- cpufeaturemasksupported
+- cpufeaturemask
+- cpuallocation
+- cpuaffinity
+- runtime.consolidationneeded
+- consolepreferencessupported
+- consolepreferences
+- connectionstate
+- configstatus
+- configissue
+- config
+- cleanpoweroff
+- changeversion
+- changetrackingsupported
+- changetrackingenabled
+- capability
+- canconnectusbdevices
+- boottime
+- bootretryoptionssupported
+- bootoptionssupported
+- bootoptions
+- availablefield
+- appstate
+- appheartbeatstatus
+- ansible_uuid
+- ansible_ssh_host
+- ansible_host
+- annotation
+- alternateguestname

awx/main/tests/data/inventory/scripts/ec2/files/file_reference

@@ -1,6 +1,7 @@
 [ec2]
 base_source_var = value_of_var
 boto_profile = /tmp/my_boto_stuff
+iam_role_arn = arn:aws:iam::123456789012:role/test-role
 regions = us-east-2,ap-south-1
 regions_exclude = us-gov-west-1,cn-north-1
 destination_variable = public_dns_name