WIP commit for AAP-22242 to add OpenShift Virtualization Inventory so…

awx/main/models/inventory.py

@@ -933,6 +933,8 @@ class InventorySourceOptions(BaseModel):
  ('controller', _('Red Hat Ansible Automation Platform')),
  ('insights', _('Red Hat Insights')),
  ('terraform', _('Terraform State')),
+ ('openshift_virtualization', _('OpenShift Virtualization')),
+
  ]
 
  # From the options of the Django management base command
@@ -1693,6 +1695,16 @@ class insights(PluginFileInjector):
  use_fqcn = True
 
 
+class openshift_virtualization(PluginFileInjector):
+ plugin_name = 'openshift_virtualization'
+ base_injector = 'template'
+ namespace = 'kubevirt'
+ collection = 'core'
+ downstream_namespace = 'redhat'
+ downstream_collection = 'openshift_virtualization'
+ use_fqcn = True
+
+
 class constructed(PluginFileInjector):
  plugin_name = 'constructed'
  namespace = 'ansible'

awx/ui/src/screens/Inventory/InventorySourceAdd/InventorySourceAdd.test.js

@@ -56,6 +56,7 @@ describe('<InventorySourceAdd />', () => {
  ['satellite6', 'Red Hat Satellite 6'],
  ['openstack', 'OpenStack'],
  ['rhv', 'Red Hat Virtualization'],
+ ['openshift_virtualization', 'Red Hat OpenShift Virtualization'],
  ['controller', 'Red Hat Ansible Automation Platform'],
  ],
  },

awx/ui/src/screens/Inventory/shared/InventorySourceSubForms/OpenShiftVirtualizationSubForm.js

@@ -0,0 +1,60 @@
+import React, { useCallback } from 'react';
+import { useField, useFormikContext } from 'formik';
+import { t } from '@lingui/macro';
+import { useConfig } from 'contexts/Config';
+import getDocsBaseUrl from 'util/getDocsBaseUrl';
+import CredentialLookup from 'components/Lookup/CredentialLookup';
+import { required } from 'util/validators';
+import {
+ OptionsField,
+ VerbosityField,
+ EnabledVarField,
+ EnabledValueField,
+ HostFilterField,
+ SourceVarsField,
+} from './SharedFields';
+import getHelpText from '../Inventory.helptext';
+
+const VirtualizationSubForm = ({ autoPopulateCredential }) => {
+ const helpText = getHelpText();
+ const { setFieldValue, setFieldTouched } = useFormikContext();
+ const [credentialField, credentialMeta, credentialHelpers] =
+ useField('credential');
+ const config = useConfig();
+
+ const handleCredentialUpdate = useCallback(
+ (value) => {
+ setFieldValue('credential', value);
+ setFieldTouched('credential', true, false);
+ },
+ [setFieldValue, setFieldTouched]
+ );
+
+ const docsBaseUrl = getDocsBaseUrl(config);
+ return (
+ <>
+ <CredentialLookup
+ credentialTypeNamespace="openshift_virtualization"
+ label={t`Credential`}
+ helperTextInvalid={credentialMeta.error}
+ isValid={!credentialMeta.touched || !credentialMeta.error}
+ onBlur={() => credentialHelpers.setTouched()}
+ onChange={handleCredentialUpdate}
+ value={credentialField.value}
+ required
+ autoPopulate={autoPopulateCredential}
+ validate={required(t`Select a value for this field`)}
+ />
+ <VerbosityField />
+ <HostFilterField />
+ <EnabledVarField />
+ <EnabledValueField />
+ <OptionsField />
+ <SourceVarsField
+ popoverContent={helpText.sourceVars(docsBaseUrl, 'openshift_virtualization')}
+ />
+ </>
+ );
+};
+
+export default OpenShiftVirtualizationSubForm;

awx/ui/src/screens/Inventory/shared/InventorySourceSubForms/OpenShiftVirtualizationSubForm.test.js

@@ -0,0 +1,65 @@
+import React from 'react';
+import { act } from 'react-dom/test-utils';
+import { Formik } from 'formik';
+import { CredentialsAPI } from 'api';
+import { mountWithContexts } from '../../../../../testUtils/enzymeHelpers';
+import VirtualizationSubForm from './VirtualizationSubForm';
+
+jest.mock('../../../../api');
+
+const initialValues = {
+ credential: null,
+ overwrite: false,
+ overwrite_vars: false,
+ source_path: '',
+ source_project: null,
+ source_script: null,
+ source_vars: '---\n',
+ update_cache_timeout: 0,
+ update_on_launch: true,
+ verbosity: 1,
+};
+
+describe('<VirtualizationSubForm />', () => {
+ let wrapper;
+
+ beforeEach(async () => {
+ CredentialsAPI.read.mockResolvedValue({
+ data: { count: 0, results: [] },
+ });
+
+ await act(async () => {
+ wrapper = mountWithContexts(
+ <Formik initialValues={initialValues}>
+ <VirtualizationSubForm />
+ </Formik>
+ );
+ });
+ });
+
+ afterAll(() => {
+ jest.clearAllMocks();
+ });
+
+ test('should render subform fields', () => {
+ expect(wrapper.find('FormGroup[label="Credential"]')).toHaveLength(1);
+ expect(wrapper.find('FormGroup[label="Verbosity"]')).toHaveLength(1);
+ expect(wrapper.find('FormGroup[label="Update options"]')).toHaveLength(1);
+ expect(
+ wrapper.find('FormGroup[label="Cache timeout (seconds)"]')
+ ).toHaveLength(1);
+ expect(
+ wrapper.find('VariablesField[label="Source variables"]')
+ ).toHaveLength(1);
+ });
+
+ test('should make expected api calls', () => {
+ expect(CredentialsAPI.read).toHaveBeenCalledTimes(1);
+ expect(CredentialsAPI.read).toHaveBeenCalledWith({
+ credential_type__namespace: 'rhv',
+ order_by: 'name',
+ page: 1,
+ page_size: 5,
+ });
+ });
+});

awx_collection/plugins/modules/inventory_source.py

@@ -42,7 +42,7 @@
  source:
  description:
  - The source to use for this group.
- choices: [ "scm", "ec2", "gce", "azure_rm", "vmware", "satellite6", "openstack", "rhv", "controller", "insights" ]
+ choices: [ "scm", "ec2", "gce", "azure_rm", "vmware", "satellite6", "openstack", "rhv", "controller", "insights", "openshift_virtualization" ]
  type: str
  source_path:
  description:
@@ -170,7 +170,7 @@ def main():
  #
  # How do we handle manual and file? The controller does not seem to be able to activate them
  #
- source=dict(choices=["scm", "ec2", "gce", "azure_rm", "vmware", "satellite6", "openstack", "rhv", "controller", "insights"]),
+ source=dict(choices=["scm", "ec2", "gce", "azure_rm", "vmware", "satellite6", "openstack", "rhv", "controller", "insights", "openshift_virtualization"]),
  source_path=dict(),
  source_vars=dict(type='dict'),
  enabled_var=dict(),