Fix failing KubeVirt Protractor e2e tests

frontend/packages/kubevirt-plugin/integration-tests/tests/models/uiResource.ts

@@ -1,8 +1,8 @@
 import { resourceTitle } from '@console/internal-integration-tests/views/crud.view';
+import { apiVersionForModel } from '@console/internal/module/k8s/k8s-ref';
 import { K8sKind } from '@console/internal/module/k8s/types';
 import { click } from '../../utils/shared-utils';
 import * as view from '../../views/uiResource.view';
-import { apiVersionForModel } from '../utils/selectors';
 import { getResourceObject } from '../utils/utils';
 
 export class UIResource {

frontend/packages/kubevirt-plugin/integration-tests/tests/vm.detail.dedicated-resources.scenario.ts

@@ -1,5 +1,5 @@
 import { browser, ExpectedConditions as until } from 'protractor';
-import { isDedicatedCPUPlacement } from '../../src/selectors/vm';
+import { isDedicatedCPUPlacement } from '../../src/selectors/vm/selectors';
 import { click, removeLeakedResources, withResource } from '../utils/shared-utils';
 import * as editDedicatedResourcesView from '../views/dialogs/editDedicatedResourcesView';
 import { saveButton } from '../views/kubevirtUIResource.view';

frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/redux/state-update/prefill-vm-template-state-update.ts

@@ -7,8 +7,16 @@ import { CloudInitDataHelper } from '../../../../k8s/wrapper/vm/cloud-init-data-
 import { DiskWrapper } from '../../../../k8s/wrapper/vm/disk-wrapper';
 import { VolumeWrapper } from '../../../../k8s/wrapper/vm/volume-wrapper';
 import { getName } from '../../../../selectors';
+import { isCustomFlavor, toUIFlavor } from '../../../../selectors/vm-like/flavor';
+import {
+  getTemplateFlavors,
+  getTemplateHostname,
+  getTemplateOperatingSystems,
+  getTemplateWorkloadProfiles,
+} from '../../../../selectors/vm-template/advanced';
+import { isCommonTemplate, selectVM } from '../../../../selectors/vm-template/basic';
+import { DEFAULT_CPU, parseCPU } from '../../../../selectors/vm/cpu';
 import {
-  DEFAULT_CPU,
   getCPU,
   getDataVolumeTemplates,
   getDisks,
@@ -17,16 +25,7 @@ import {
   getNetworks,
   getVolumes,
   hasAutoAttachPodInterface,
-  parseCPU,
-} from '../../../../selectors/vm';
-import { isCustomFlavor, toUIFlavor } from '../../../../selectors/vm-like/flavor';
-import {
-  getTemplateFlavors,
-  getTemplateHostname,
-  getTemplateOperatingSystems,
-  getTemplateWorkloadProfiles,
-} from '../../../../selectors/vm-template/advanced';
-import { isCommonTemplate, selectVM } from '../../../../selectors/vm-template/basic';
+} from '../../../../selectors/vm/selectors';
 import { isWinToolsImage } from '../../../../selectors/vm/winimage';
 import { V1alpha1DataVolume, V1Volume } from '../../../../types/api';
 import { V1Network } from '../../../../types/vm';

frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/redux/state-update/storage-tab-state-update.ts

@@ -17,8 +17,8 @@ import {
 } from '../../../../selectors/config-map/sc-defaults';
 import { getDataVolumeStorageClassName } from '../../../../selectors/dv/selectors';
 import { iGetRelevantTemplate } from '../../../../selectors/immutable/template/combined';
-import { getVolumeContainerImage } from '../../../../selectors/vm';
 import { isWindowsTemplate } from '../../../../selectors/vm-template/advanced';
+import { getVolumeContainerImage } from '../../../../selectors/vm/volume';
 import { isWinToolsImage } from '../../../../selectors/vm/winimage';
 import { V1alpha1DataVolume } from '../../../../types/api/V1alpha1DataVolume';
 import { toShallowJS } from '../../../../utils/immutable';

frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/tabs/vm-settings-tab/flavor.tsx

@@ -4,14 +4,14 @@ import { useTranslation } from 'react-i18next';
 import { CUSTOM_FLAVOR } from '../../../../constants';
 import { Flavor } from '../../../../constants/vm/flavor';
 import { asValidationObject, ValidationErrorType, getLabelValue } from '../../../../selectors';
-import { getFlavor } from '../../../../selectors/vm';
 import { getTemplateFlavorData } from '../../../../selectors/vm-template/advanced';
 import {
   getFlavorLabel,
   getFlavors,
   getOsDefaultTemplate,
   getWorkloadProfiles,
 } from '../../../../selectors/vm-template/combined-dependent';
+import { getFlavor } from '../../../../selectors/vm/selectors';
 import {
   iGetIsLoaded,
   iGetLoadedData,

frontend/packages/kubevirt-plugin/src/components/create-vm/dev-console/use-catalog-vm-templates.tsx

@@ -7,7 +7,6 @@ import { humanizeBinaryBytes, SectionHeading } from '@console/internal/component
 import { PersistentVolumeClaimKind, PodKind } from '@console/internal/module/k8s';
 import { BOOT_SOURCE_AVAILABLE } from '../../../constants';
 import { getNamespace, getDescription } from '../../../selectors/selectors';
-import { getOperatingSystemName, getWorkloadProfile } from '../../../selectors/vm';
 import {
   getTemplateFlavorData,
   getTemplateSizeRequirementInBytes,
@@ -18,6 +17,7 @@ import {
   getTemplateProvider,
   templateProviders,
 } from '../../../selectors/vm-template/basic';
+import { getOperatingSystemName, getWorkloadProfile } from '../../../selectors/vm/selectors';
 import { getTemplateSourceStatus } from '../../../statuses/template/template-source-status';
 import { isTemplateSourceError } from '../../../statuses/template/types';
 import { V1alpha1DataVolume } from '../../../types/api';

frontend/packages/kubevirt-plugin/src/components/create-vm/forms/create-vm-form.tsx

@@ -25,14 +25,15 @@ import { ROOT_DISK_INSTALL_NAME } from '../../../constants';
 import { DataVolumeSourceType, DEFAULT_DISK_SIZE } from '../../../constants/vm';
 import { DataVolumeModel, VirtualMachineModel } from '../../../models';
 import { kubevirtReferenceForModel } from '../../../models/kubevirtReferenceForModel';
-import { getCPU, getWorkloadProfile, vCPUCount } from '../../../selectors/vm';
 import {
   getDefaultDiskBus,
   getTemplateFlavorData,
   getTemplateMemory,
   getTemplateSizeRequirementInBytes,
 } from '../../../selectors/vm-template/advanced';
 import { getTemplateName, selectVM } from '../../../selectors/vm-template/basic';
+import { vCPUCount } from '../../../selectors/vm/cpu';
+import { getCPU, getWorkloadProfile } from '../../../selectors/vm/selectors';
 import { isTemplateSourceError, TemplateSourceStatus } from '../../../statuses/template/types';
 import { VMKind } from '../../../types';
 import { TemplateItem } from '../../../types/template';

frontend/packages/kubevirt-plugin/src/components/dashboards-page/vm-dashboard/vm-details-card.tsx

@@ -28,7 +28,7 @@ import {
   getUID,
 } from '../../../selectors';
 import { findVMIPod } from '../../../selectors/pod/selectors';
-import { getOperatingSystem, getOperatingSystemName } from '../../../selectors/vm';
+import { getOperatingSystem, getOperatingSystemName } from '../../../selectors/vm/selectors';
 import { getVmiIpAddresses, getVMINodeName } from '../../../selectors/vmi';
 import {
   getGuestAgentFieldNotAvailMsg,

frontend/packages/kubevirt-plugin/src/components/dashboards-page/vm-dashboard/vm-inventory-card.tsx

@@ -22,7 +22,7 @@ import { VirtualMachineSnapshotModel } from '../../../models';
 import { kubevirtReferenceForModel } from '../../../models/kubevirtReferenceForModel';
 import { getName, getNamespace } from '../../../selectors';
 import { getVmSnapshotVmName } from '../../../selectors/snapshot/snapshot';
-import { getDisks, getNetworks } from '../../../selectors/vm';
+import { getDisks, getNetworks } from '../../../selectors/vm/selectors';
 import { getVMLikeModel } from '../../../selectors/vm/vmlike';
 import { getVMIDisks, getVMINetworks } from '../../../selectors/vmi';
 import { VMSnapshot } from '../../../types';

frontend/packages/kubevirt-plugin/src/components/modals/boot-order-modal/boot-order-modal.tsx

@@ -23,15 +23,15 @@ import { VMIWrapper } from '../../../k8s/wrapper/vm/vmi-wrapper';
 import { VirtualMachineInstanceModel } from '../../../models';
 import { kubevirtReferenceForModel } from '../../../models/kubevirtReferenceForModel';
 import { getName, getNamespace } from '../../../selectors';
+import { isBootOrderChanged } from '../../../selectors/vm-like/next-run-changes';
 import {
-  asVM,
   getBootableDevices,
   getBootableDevicesInOrder,
   getTransformedDevices,
-  getVMLikeModel,
-  isVMRunningOrExpectedRunning,
-} from '../../../selectors/vm';
-import { isBootOrderChanged } from '../../../selectors/vm-like/next-run-changes';
+} from '../../../selectors/vm/devices';
+import { isVMRunningOrExpectedRunning } from '../../../selectors/vm/selectors';
+import { asVM } from '../../../selectors/vm/vm';
+import { getVMLikeModel } from '../../../selectors/vm/vmlike';
 import { BootableDeviceType, VMIKind } from '../../../types';
 import { VMLikeEntityKind } from '../../../types/vmLike';
 import { createBasicLookup, getLoadedData } from '../../../utils';

frontend/packages/kubevirt-plugin/src/components/modals/clone-vm-modal/clone-vm-modal.tsx

@@ -29,12 +29,11 @@ import { cloneVM } from '../../../k8s/requests/vm/clone';
 import { DataVolumeModel, VirtualMachineModel } from '../../../models';
 import { kubevirtReferenceForModel } from '../../../models/kubevirtReferenceForModel';
 import { getName, getNamespace, ValidationErrorType, getDescription } from '../../../selectors';
+import { getVolumes, isVMExpectedRunning } from '../../../selectors/vm/selectors';
 import {
   getVolumeDataVolumeName,
   getVolumePersistentVolumeClaimName,
-  getVolumes,
-  isVMExpectedRunning,
-} from '../../../selectors/vm';
+} from '../../../selectors/vm/volume';
 import { VMKind, VMIKind } from '../../../types';
 import { V1alpha1DataVolume } from '../../../types/api';
 import { getLoadedData, getLoadError, prefixedID } from '../../../utils';

frontend/packages/kubevirt-plugin/src/components/modals/clone-vm-modal/configuration-summary.tsx

@@ -8,6 +8,7 @@ import {
 } from '../../../selectors/dv/selectors';
 import { getPvcResources, getPvcStorageClassName } from '../../../selectors/pvc/selectors';
 import { getStorageSize } from '../../../selectors/selectors';
+import { getFlavorData } from '../../../selectors/vm/flavor-data';
 import {
   getCPU,
   getDataVolumeTemplates,
@@ -18,8 +19,7 @@ import {
   getOperatingSystemName,
   getVolumes,
   getWorkloadProfile,
-} from '../../../selectors/vm';
-import { getFlavorData } from '../../../selectors/vm/flavor-data';
+} from '../../../selectors/vm/selectors';
 import { V1alpha1DataVolume } from '../../../types/api';
 import { VMKind } from '../../../types/vm';
 import { DASH } from '../../../utils';

frontend/packages/kubevirt-plugin/src/components/modals/delete-disk-modal/delete-disk-modal.tsx

@@ -17,7 +17,9 @@ import { freeOwnedResources } from '../../../k8s/requests/free-owned-resources';
 import { removeHotplugPersistent } from '../../../k8s/requests/vm/actions';
 import { DataVolumeModel } from '../../../models';
 import { isHotplugDisk } from '../../../selectors/disks/hotplug';
-import { asVM, getVMLikeModel, isVMRunningOrExpectedRunning } from '../../../selectors/vm';
+import { isVMRunningOrExpectedRunning } from '../../../selectors/vm/selectors';
+import { asVM } from '../../../selectors/vm/vm';
+import { getVMLikeModel } from '../../../selectors/vm/vmlike';
 import { VMIKind } from '../../../types';
 import { V1Disk, V1RemoveVolumeOptions, V1Volume } from '../../../types/api';
 import { VMLikeEntityKind } from '../../../types/vmLike';

frontend/packages/kubevirt-plugin/src/components/modals/delete-nic-modal/delete-nic-modal.tsx

@@ -11,7 +11,7 @@ import { HandlePromiseProps, withHandlePromise } from '@console/internal/compone
 import { k8sPatch } from '@console/internal/module/k8s';
 import { YellowExclamationTriangleIcon } from '@console/shared/src/components/status/icons';
 import { getRemoveNICPatches } from '../../../k8s/patches/vm/vm-nic-patches';
-import { getVMLikeModel } from '../../../selectors/vm';
+import { getVMLikeModel } from '../../../selectors/vm/vmlike';
 import { V1NetworkInterface } from '../../../types/vm';
 import { VMLikeEntityKind } from '../../../types/vmLike';
 

frontend/packages/kubevirt-plugin/src/components/modals/disk-modal/disk-modal-enhanced.tsx

@@ -23,7 +23,7 @@ import { VMIWrapper } from '../../../k8s/wrapper/vm/vmi-wrapper';
 import { VolumeWrapper } from '../../../k8s/wrapper/vm/volume-wrapper';
 import { getName, getNamespace } from '../../../selectors';
 import { isTemplate } from '../../../selectors/check-type';
-import { getVMLikeModel } from '../../../selectors/vm';
+import { getVMLikeModel } from '../../../selectors/vm/vmlike';
 import { VMIKind, VMKind } from '../../../types';
 import { V1alpha1DataVolume, V1Disk, V1Volume } from '../../../types/api';
 import { VMLikeEntityKind } from '../../../types/vmLike';

frontend/packages/kubevirt-plugin/src/components/modals/menu-actions-modals/delete-vm-modal.tsx

@@ -29,7 +29,7 @@ import {
 } from '../../../models/kubevirtReferenceForModel';
 import { getName, getNamespace } from '../../../selectors';
 import { getVmSnapshotVmName } from '../../../selectors/snapshot/snapshot';
-import { getVolumes } from '../../../selectors/vm';
+import { getVolumes } from '../../../selectors/vm/selectors';
 import { VMIKind, VMKind, VMSnapshot } from '../../../types/vm';
 import { redirectToList } from './utils';
 import { VMIUsersAlert } from './vmi-users-alert';

frontend/packages/kubevirt-plugin/src/components/modals/menu-actions-modals/delete-vm-template-modal.tsx

@@ -15,7 +15,8 @@ import { useOwnedVolumeReferencedResources } from '../../../hooks/use-owned-volu
 import { useUpToDateVMLikeEntity } from '../../../hooks/use-vm-like-entity';
 import { deleteVMTemplate } from '../../../k8s/requests/vmtemplate/actions';
 import { getName, getNamespace } from '../../../selectors';
-import { asVM, getVolumes } from '../../../selectors/vm';
+import { getVolumes } from '../../../selectors/vm/selectors';
+import { asVM } from '../../../selectors/vm/vm';
 import { redirectToList } from './utils';
 
 export const DeleteVMTemplateModal = withHandlePromise((props: DeleteVMTemplateModalProps) => {

frontend/packages/kubevirt-plugin/src/components/modals/nic-modal/nic-modal-enhanced.tsx

@@ -8,7 +8,9 @@ import { getUpdateNICPatches } from '../../../k8s/patches/vm/vm-nic-patches';
 import { NetworkInterfaceWrapper } from '../../../k8s/wrapper/vm/network-interface-wrapper';
 import { NetworkWrapper } from '../../../k8s/wrapper/vm/network-wrapper';
 import { getName, getNamespace } from '../../../selectors';
-import { asVM, getInterfaces, getUsedNetworks, getVMLikeModel } from '../../../selectors/vm';
+import { getInterfaces, getUsedNetworks } from '../../../selectors/vm/selectors';
+import { asVM } from '../../../selectors/vm/vm';
+import { getVMLikeModel } from '../../../selectors/vm/vmlike';
 import { VMLikeEntityKind } from '../../../types/vmLike';
 import { getSimpleName, getLoadedData } from '../../../utils';
 import { NICModal } from './nic-modal';

frontend/packages/kubevirt-plugin/src/components/modals/scheduling-modals/affinity-modal/affinity-modal.tsx

@@ -26,8 +26,8 @@ import { k8sPatch, NodeKind } from '@console/internal/module/k8s';
 import { useCollisionChecker } from '../../../../hooks/use-collision-checker';
 import { getAffinityPatch } from '../../../../k8s/patches/vm/vm-scheduling-patches';
 import { getName } from '../../../../selectors';
-import { getVMLikeModel } from '../../../../selectors/vm';
 import { getVMLikeAffinity } from '../../../../selectors/vm-like/selectors';
+import { getVMLikeModel } from '../../../../selectors/vm/vmlike';
 import { VMLikeEntityKind } from '../../../../types/vmLike';
 import { getLoadedData, getLoadError, isLoaded } from '../../../../utils';
 import { ModalFooter } from '../../modal/modal-footer';

frontend/packages/kubevirt-plugin/src/components/modals/scheduling-modals/affinity-modal/connected-affinity-modal.tsx

@@ -3,7 +3,7 @@ import { createModalLauncher, ModalComponentProps } from '@console/internal/comp
 import { Firehose } from '@console/internal/components/utils';
 import { NodeModel } from '@console/internal/models';
 import { getName, getNamespace } from '../../../../selectors';
-import { getVMLikeModel } from '../../../../selectors/vm';
+import { getVMLikeModel } from '../../../../selectors/vm/vmlike';
 import { VMLikeEntityKind } from '../../../../types/vmLike';
 import { AffinityModal } from './affinity-modal';
 

frontend/packages/kubevirt-plugin/src/components/modals/scheduling-modals/dedicated-resources-modal/connected-dedicated-resources-modal.tsx

@@ -3,7 +3,7 @@ import { createModalLauncher, ModalComponentProps } from '@console/internal/comp
 import { Firehose } from '@console/internal/components/utils';
 import { NodeModel } from '@console/internal/models';
 import { getName, getNamespace } from '../../../../selectors';
-import { getVMLikeModel } from '../../../../selectors/vm';
+import { getVMLikeModel } from '../../../../selectors/vm/vmlike';
 import { VMLikeEntityKind } from '../../../../types/vmLike';
 import { DedicatedResourcesModal } from './dedicated-resources-modal';
 

frontend/packages/kubevirt-plugin/src/components/modals/scheduling-modals/dedicated-resources-modal/dedicated-resources-modal.tsx

@@ -12,7 +12,9 @@ import { NodeModel } from '@console/internal/models';
 import { k8sPatch, NodeKind } from '@console/internal/module/k8s';
 import { useCollisionChecker } from '../../../../hooks/use-collision-checker';
 import { getDedicatedCpuPatch } from '../../../../k8s/patches/vm/vm-cpu-patches';
-import { asVM, getVMLikeModel, isDedicatedCPUPlacement } from '../../../../selectors/vm';
+import { isDedicatedCPUPlacement } from '../../../../selectors/vm/selectors';
+import { asVM } from '../../../../selectors/vm/vm';
+import { getVMLikeModel } from '../../../../selectors/vm/vmlike';
 import { VMLikeEntityKind } from '../../../../types/vmLike';
 import { getLoadedData, getLoadError, isLoaded } from '../../../../utils';
 import { ModalFooter } from '../../modal/modal-footer';

frontend/packages/kubevirt-plugin/src/components/modals/scheduling-modals/node-selector-modal/connected-node-selector-modal.tsx

@@ -3,7 +3,7 @@ import { createModalLauncher, ModalComponentProps } from '@console/internal/comp
 import { Firehose } from '@console/internal/components/utils';
 import { NodeModel } from '@console/internal/models';
 import { getName, getNamespace } from '../../../../selectors';
-import { getVMLikeModel } from '../../../../selectors/vm';
+import { getVMLikeModel } from '../../../../selectors/vm/vmlike';
 import { VMLikeEntityKind } from '../../../../types/vmLike';
 import { NSModal } from './node-selector-modal';
 

frontend/packages/kubevirt-plugin/src/components/modals/scheduling-modals/node-selector-modal/node-selector-modal.tsx

@@ -13,8 +13,8 @@ import { k8sPatch, NodeKind } from '@console/internal/module/k8s';
 import { useCollisionChecker } from '../../../../hooks/use-collision-checker';
 import { useIDEntities } from '../../../../hooks/use-id-entities';
 import { getNodeSelectorPatches } from '../../../../k8s/patches/vm/vm-scheduling-patches';
-import { getVMLikeModel } from '../../../../selectors/vm';
 import { getVMLikeNodeSelector } from '../../../../selectors/vm-like/selectors';
+import { getVMLikeModel } from '../../../../selectors/vm/vmlike';
 import { VMLikeEntityKind } from '../../../../types/vmLike';
 import { getLoadedData, getLoadError, isLoaded } from '../../../../utils';
 import { LabelRow } from '../../../LabelsList/LabelRow/label-row';

frontend/packages/kubevirt-plugin/src/components/modals/scheduling-modals/tolerations-modal/connected-tolerations-modal.tsx

@@ -3,7 +3,7 @@ import { createModalLauncher, ModalComponentProps } from '@console/internal/comp
 import { Firehose } from '@console/internal/components/utils';
 import { NodeModel } from '@console/internal/models';
 import { getName, getNamespace } from '../../../../selectors';
-import { getVMLikeModel } from '../../../../selectors/vm';
+import { getVMLikeModel } from '../../../../selectors/vm/vmlike';
 import { VMLikeEntityKind } from '../../../../types/vmLike';
 import { TModal } from './tolerations-modal';
 

frontend/packages/kubevirt-plugin/src/components/modals/scheduling-modals/tolerations-modal/tolerations-modal.tsx

@@ -14,8 +14,8 @@ import { k8sPatch, NodeKind } from '@console/internal/module/k8s';
 import { useCollisionChecker } from '../../../../hooks/use-collision-checker';
 import { useIDEntities } from '../../../../hooks/use-id-entities';
 import { getTolerationsPatch } from '../../../../k8s/patches/vm/vm-scheduling-patches';
-import { getVMLikeModel } from '../../../../selectors/vm';
 import { getVMLikeTolerations } from '../../../../selectors/vm-like/selectors';
+import { getVMLikeModel } from '../../../../selectors/vm/vmlike';
 import { VMLikeEntityKind } from '../../../../types/vmLike';
 import { getLoadedData, getLoadError, isLoaded } from '../../../../utils';
 import { LabelsList } from '../../../LabelsList/labels-list';

frontend/packages/kubevirt-plugin/src/components/modals/snapshot-modal/SnapshotsModal.tsx

@@ -20,7 +20,8 @@ import { HandlePromiseProps, withHandlePromise } from '@console/internal/compone
 import { k8sCreate } from '@console/internal/module/k8s';
 import { VMSnapshotWrapper } from '../../../k8s/wrapper/vm/vm-snapshot-wrapper';
 import { getName, getNamespace } from '../../../selectors';
-import { asVM, getVolumeSnapshotStatuses } from '../../../selectors/vm';
+import { getVolumeSnapshotStatuses } from '../../../selectors/vm/selectors';
+import { asVM } from '../../../selectors/vm/vm';
 import { VMSnapshot } from '../../../types';
 import { VMLikeEntityKind } from '../../../types/vmLike';
 import { buildOwnerReference, prefixedID } from '../../../utils';