Merge pull request #9773 from glekner/remove-kubevirt-dependants

Bug 1993975: remove kubevirt dependants #1

frontend/packages/kubevirt-plugin/integration-tests/tests/a-with-non-admin.scenario.ts

@@ -5,7 +5,7 @@ import * as crudView from '@console/internal-integration-tests/views/crud.view';
 import * as loginView from '@console/internal-integration-tests/views/login.view';
 import { closeGuidedTour } from '@console/internal-integration-tests/views/overview.view';
 import * as sidenav from '@console/internal-integration-tests/views/sidenav.view';
-import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
+import { VirtualMachineModel } from '../../src/models';
 import {
   addLeakableResource,
   click,

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

@@ -6,7 +6,7 @@ import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
 import { clickHorizontalTab } from '@console/internal-integration-tests/views/horizontal-nav.view';
 import { clickNavLink } from '@console/internal-integration-tests/views/sidenav.view';
 import { K8sKind } from '@console/internal/module/k8s';
-import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
+import { VirtualMachineModel } from '../../../src/models';
 import { confirmAction } from '../../utils/shared-actions.view';
 import { click } from '../../utils/shared-utils';
 import * as editDedicatedResourcesView from '../../views/dialogs/editDedicatedResourcesView';

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

@@ -1,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import { browser, ExpectedConditions as until } from 'protractor';
 import { testName } from '@console/internal-integration-tests/protractor.conf';
-import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
+import { VirtualMachineModel } from '../../../src/models';
 import { click, fillInput } from '../../utils/shared-utils';
 import * as view from '../../views/importWizard.view';
 import * as rhvView from '../../views/rhvImportWizard.view';

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

@@ -1,15 +1,14 @@
 /* eslint-disable no-await-in-loop, no-console */
 import { browser, ExpectedConditions as until } from 'protractor';
 import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
-import { modalOverlay } from '@console/kubevirt-plugin/integration-tests/views/uiResource.view';
-import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
 import { MatchLabels } from 'public/module/k8s';
 import { cloneDeepWithEnum } from '../../../src/constants/object-enum';
+import { VirtualMachineModel } from '../../../src/models';
 import { click, waitForStringNotInElement } from '../../utils/shared-utils';
 import { detailViewAction, listViewAction } from '../../views/actions.view';
 import { saveButton } from '../../views/kubevirtUIResource.view';
 import { vmtLinkByName } from '../../views/template.view';
-import { resourceHorizontalTab } from '../../views/uiResource.view';
+import { modalOverlay, resourceHorizontalTab } from '../../views/uiResource.view';
 import * as vmView from '../../views/virtualMachine.view';
 import { CloneVirtualMachineDialog } from '../dialogs/cloneVirtualMachineDialog';
 import { AddDialog } from '../dialogs/schedulingDialog';

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

@@ -2,7 +2,7 @@
 import { browser, ExpectedConditions as until } from 'protractor';
 import { testName } from '@console/internal-integration-tests/protractor.conf';
 import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
-import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
+import { VirtualMachineModel } from '../../../src/models';
 import { asyncForEach, click, fillInput } from '../../utils/shared-utils';
 import * as view from '../../views/importWizard.view';
 import * as wizardView from '../../views/wizard.view';

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

@@ -4,7 +4,7 @@ import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
 import { clickNavLink } from '@console/internal-integration-tests/views/sidenav.view';
 import { TemplateModel } from '@console/internal/models';
 import { K8sKind } from '@console/internal/module/k8s';
-import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
+import { VirtualMachineModel } from '../../../src/models';
 import { asyncForEach, click, fillInput } from '../../utils/shared-utils';
 import { diskStorageClass } from '../../views/dialogs/diskDialog.view';
 import { confirmActionButton } from '../../views/importWizard.view';

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

@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 import { browser } from 'protractor';
 import { appHost, testName } from '@console/internal-integration-tests/protractor.conf';
 import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
-import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
+import { VirtualMachineModel } from '../../src/models';
 import { getInterfaces } from '../../src/selectors/vm/selectors';
 import { getVMIDisks } from '../../src/selectors/vmi/basic';
 import {

frontend/packages/kubevirt-plugin/integration-tests/tests/vm.tab.dashboard.scenario.ts

@@ -1,6 +1,6 @@
 import { browser, ExpectedConditions as until } from 'protractor';
 import { testName } from '@console/internal-integration-tests/protractor.conf';
-import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
+import { VirtualMachineModel } from '../../src/models';
 import {
   click,
   createResources,

frontend/packages/kubevirt-plugin/integration-tests/tests/vm.tab.yaml.scenario.ts

@@ -12,7 +12,7 @@ import {
   saveButton,
   setEditorContent,
 } from '@console/internal-integration-tests/views/yaml.view';
-import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
+import { VirtualMachineModel } from '../../src/models';
 import { click, createResource, deleteResource, withResource } from '../utils/shared-utils';
 import { activeTab } from '../views/uiResource.view';
 import { virtualizationTitle } from '../views/vms.list.view';

frontend/packages/kubevirt-plugin/integration-tests/tests/vm.wizard.scenario.ts

@@ -1,8 +1,8 @@
 import { execSync } from 'child_process';
 import { browser } from 'protractor';
 import { testName } from '@console/internal-integration-tests/protractor.conf';
-import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
 import { isLoaded } from '../../../../integration-tests/views/crud.view';
+import { VirtualMachineModel } from '../../src/models';
 import {
   createResources,
   deleteResources,

frontend/packages/kubevirt-plugin/integration-tests/tests/vm.wizard.validation.scenario.ts

@@ -1,5 +1,5 @@
 import { browser, ExpectedConditions as until } from 'protractor';
-import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
+import { VirtualMachineModel } from '../../src/models';
 import { click } from '../utils/shared-utils';
 import * as view from '../views/wizard.view';
 import { DiskDialog } from './dialogs/diskDialog';

frontend/packages/kubevirt-plugin/integration-tests/v2v/rhv/v2v.rhv.import.incorrect.names.negative.scenario.ts

@@ -1,4 +1,4 @@
-import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
+import { VirtualMachineModel } from '../../../src/models';
 import { v2vUIDeployment } from '../../tests/mocks/mocks';
 import { RhvImportWizard } from '../../tests/models/rhvImportWizard';
 import { wrongValues } from '../../tests/utils/constants/vm';

frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/tabs/advanced-tab/sysprep/utils/sysprep-utils.ts

@@ -1,7 +1,7 @@
 import { ConfigMapModel } from '@console/internal/models';
 import { k8sCreate } from '@console/internal/module/k8s';
-import { VMKind } from '@console/kubevirt-plugin/src/types';
 import { VMWrapper } from '../../../../../../k8s/wrapper/vm/vm-wrapper';
+import { VMKind } from '../../../../../../types';
 import { buildOwnerReference } from '../../../../../../utils';
 
 export const SYSPREP = 'sysprep';

frontend/packages/kubevirt-plugin/src/components/dashboards-page/vm-dashboard/status/GuestAgentStatusHealth.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { OffIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
-import { VMIKind } from '@console/kubevirt-plugin/src/types';
 import HealthItem from '@console/shared/src/components/dashboard/status-card/HealthItem';
 import { HealthState } from '@console/shared/src/components/dashboard/status-card/states';
+import { VMIKind } from '../../../../types';
 import {
   isGuestAgentInstalled,
   isGuestAgentVersionSupported,

frontend/packages/kubevirt-plugin/src/components/info-messages/__tests__/mock_data.ts

@@ -1,4 +1,4 @@
-import { VMIKind } from '@console/kubevirt-plugin/src/types';
+import { VMIKind } from '../../../types';
 
 export const mockData: { [key: string]: [VMIKind, boolean] } = {
   testWithoutVMOwner: [

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

@@ -29,7 +29,6 @@ import {
   PersistentVolumeClaimKind,
   StorageClassResourceKind,
 } from '@console/internal/module/k8s';
-import { DataVolumeModel } from '@console/kubevirt-plugin/src/models';
 import {
   AccessMode,
   DataVolumeSourceType,
@@ -47,6 +46,7 @@ import { DataVolumeWrapper } from '../../../k8s/wrapper/vm/data-volume-wrapper';
 import { DiskWrapper } from '../../../k8s/wrapper/vm/disk-wrapper';
 import { PersistentVolumeClaimWrapper } from '../../../k8s/wrapper/vm/persistent-volume-claim-wrapper';
 import { VolumeWrapper } from '../../../k8s/wrapper/vm/volume-wrapper';
+import { DataVolumeModel } from '../../../models';
 import { ValidationErrorType } from '../../../selectors';
 import { getPvcStorageSize } from '../../../selectors/pvc/selectors';
 import { getName } from '../../../selectors/selectors';

frontend/packages/kubevirt-plugin/src/components/ssh-service/SSHDetailsPage/SSHDetailsPage.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { ClipboardCopy, Stack, StackItem, Text, TextVariants } from '@patternfly/react-core';
 import { useTranslation } from 'react-i18next';
-import { VMIKind, VMKind } from '@console/kubevirt-plugin/src/types';
 import useSSHCommand from '../../../hooks/use-ssh-command';
 import useSSHService from '../../../hooks/use-ssh-service';
+import { VMIKind, VMKind } from '../../../types';
 import { EditButton } from '../../edit-button';
 import SSHModal from '../SSHModal';
 

frontend/packages/kubevirt-plugin/src/components/ssh-service/SSHForm/SSHForm.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Spinner, Stack } from '@patternfly/react-core';
-import { VMIKind, VMKind } from '@console/kubevirt-plugin/src/types';
 import useSSHKeys from '../../../hooks/use-ssh-keys';
+import { VMIKind, VMKind } from '../../../types';
 import SSHFormKey from './SSHFormKey/SSHFormKey';
 
 import './ssh-form.scss';

frontend/packages/kubevirt-plugin/src/components/ssh-service/SSHForm/ssh-form-utils.ts

@@ -1,12 +1,12 @@
 import { ServiceModel } from '@console/internal/models';
 import { k8sCreate, k8sKill } from '@console/internal/module/k8s';
-import { VMIKind, VMKind } from '@console/kubevirt-plugin/src/types';
 import {
   CLOUD_INIT_CONFIG_DRIVE,
   CLOUD_INIT_NO_CLOUD,
   CLOUDINIT_DISK,
 } from '../../../constants/vm/constants';
 import { CloudInitDataHelper } from '../../../k8s/wrapper/vm/cloud-init-data-helper';
+import { VMIKind, VMKind } from '../../../types';
 
 export const AUTHORIZED_SSH_KEYS = 'authorizedsshkeys';
 

frontend/packages/kubevirt-plugin/src/components/ssh-service/SSHModal.tsx

@@ -6,8 +6,8 @@ import {
   ModalComponentProps,
   ModalTitle,
 } from '@console/internal/components/factory';
-import { VMIKind, VMKind } from '@console/kubevirt-plugin/src/types';
 import useSSHService from '../../hooks/use-ssh-service';
+import { VMIKind, VMKind } from '../../types';
 import { ModalFooter } from '../modals/modal/modal-footer';
 import SSHCreateService from './SSHCreateService/SSHCreateService';
 

frontend/packages/kubevirt-plugin/src/components/vm-templates/customize-source/CustomizeSourceForm.tsx

@@ -29,7 +29,6 @@ import {
 import { useK8sWatchResource } from '@console/internal/components/utils/k8s-watch-hook';
 import { PersistentVolumeClaimModel, TemplateModel } from '@console/internal/models';
 import { PersistentVolumeClaimKind, TemplateKind } from '@console/internal/module/k8s';
-import { VMKind } from '@console/kubevirt-plugin/src/types';
 import {
   TEMPLATE_PROVIDER_ANNOTATION,
   TEMPLATE_SUPPORT_LEVEL,
@@ -54,6 +53,7 @@ import { vCPUCount } from '../../../selectors/vm/cpu';
 import { getCPU } from '../../../selectors/vm/selectors';
 import { getTemplateSourceStatus } from '../../../statuses/template/template-source-status';
 import { isTemplateSourceError } from '../../../statuses/template/types';
+import { VMKind } from '../../../types';
 import { validateVmLikeEntityName } from '../../../utils/validations';
 import { FormPFSelect } from '../../form/form-pf-select';
 import { FormRow } from '../../form/form-row';

frontend/packages/kubevirt-plugin/src/components/vms/VMEventsStatusCard.tsx

@@ -6,11 +6,11 @@ import { useTranslation } from 'react-i18next';
 import { useK8sWatchResource } from '@console/internal/components/utils/k8s-watch-hook';
 import { EventModel } from '@console/internal/models';
 import { EventKind } from '@console/internal/module/k8s';
-import { VMKind } from '@console/kubevirt-plugin/src/types';
 import EventItem from '@console/shared/src/components/dashboard/activity-card/EventItem';
 import { NORMAL } from '../../constants';
 import { getNamespace } from '../../selectors';
 import { getVmEventsFilters } from '../../selectors/event/filters';
+import { VMKind } from '../../types';
 
 import './vm-events-status-card.scss';
 

frontend/packages/kubevirt-plugin/src/hooks/use-ssh-command.ts

@@ -1,8 +1,8 @@
 import { useK8sGet } from '@console/internal/components/utils/k8s-get-hook';
 import { RouteModel } from '@console/internal/models';
 import { ListKind, RouteKind } from '@console/internal/module/k8s';
-import { VMIKind, VMKind } from '@console/kubevirt-plugin/src/types';
 import { getCloudInitValues } from '../components/ssh-service/SSHForm/ssh-form-utils';
+import { VMIKind, VMKind } from '../types';
 import useSSHService from './use-ssh-service';
 
 const DEFAULT = 'default';

frontend/packages/kubevirt-plugin/src/hooks/use-ssh-keys.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useLocation } from 'react-router-dom';
-import { VMIKind, VMKind } from '@console/kubevirt-plugin/src/types';
 import { AUTHORIZED_SSH_KEYS } from '../components/ssh-service/SSHForm/ssh-form-utils';
+import { VMIKind, VMKind } from '../types';
 import useSecret, { useSecretResult } from './use-secret';
 import useSSHSelectors, { useSSHSelectorsResult } from './use-ssh-selectors';
 

frontend/packages/kubevirt-plugin/src/hooks/use-ssh-service.ts

@@ -5,14 +5,14 @@ import { useDispatch } from 'react-redux';
 import { useK8sWatchResource } from '@console/internal/components/utils/k8s-watch-hook';
 import { ServiceModel } from '@console/internal/models';
 import { K8sResourceKind } from '@console/internal/module/k8s';
-import { VMIKind, VMKind } from '@console/kubevirt-plugin/src/types';
 import { useActiveNamespace } from '@console/shared';
 import { sshActions, SSHActionsNames } from '../components/ssh-service/redux/actions';
 import {
   createOrDeleteSSHService,
   TARGET_PORT,
 } from '../components/ssh-service/SSHForm/ssh-form-utils';
 import { getServicePort } from '../selectors/service/selectors';
+import { VMIKind, VMKind } from '../types';
 import useSSHSelectors from './use-ssh-selectors';
 
 export type useSSHServiceResult = {

frontend/packages/kubevirt-plugin/src/k8s/requests/cdi-upload/cdi-upload-requests.ts

@@ -1,13 +1,13 @@
 import { k8sCreate, k8sGet, k8sKill, K8sResourceKind } from '@console/internal/module/k8s';
-import { DataVolumeModel, UploadTokenRequestModel } from '@console/kubevirt-plugin/src/models';
-import { V1alpha1DataVolume } from '@console/kubevirt-plugin/src/types/api';
 /* eslint-disable camelcase, @typescript-eslint/camelcase,no-await-in-loop */
 import { CDI_BIND_REQUESTED_ANNOTATION } from '../../../components/cdi-upload-provider/consts';
+import { DataVolumeModel, UploadTokenRequestModel } from '../../../models';
 import {
   getKubevirtModelAvailableAPIVersion,
   kubevirtReferenceForModel,
 } from '../../../models/kubevirtReferenceForModel';
 import { getName, getNamespace } from '../../../selectors';
+import { V1alpha1DataVolume } from '../../../types/api';
 import { delay } from '../../../utils/utils';
 
 const PVC_STATUS_DELAY = 2 * 1000;

frontend/packages/kubevirt-plugin/src/utils/guest-agent-utils.ts

@@ -1,5 +1,5 @@
-import { VMIKind } from '@console/kubevirt-plugin/src/types';
 import { getVMIConditionsByType } from '../selectors/vmi';
+import { VMIKind } from '../types';
 
 // Based on: https://github.com/kubevirt/kubevirt/blob/f71e9c9615a6c36178169d66814586a93ba515b5/staging/src/kubevirt.io/client-go/api/v1/types.go#L337
 const VMI_CONDITION_AGENT_CONNECTED = 'AgentConnected';

frontend/packages/network-attachment-definition-plugin/integration-tests/tests/models/nadForm.ts

@@ -1,9 +1,9 @@
 import { browser, ExpectedConditions as until } from 'protractor';
 import { BROWSER_TIMEOUT, testName } from '@console/internal-integration-tests/protractor.conf';
 import { createYAMLButton, isLoaded } from '@console/internal-integration-tests/views/crud.view';
-import { PAGE_LOAD_TIMEOUT_SECS } from '@console/kubevirt-plugin/integration-tests/tests/utils/constants/common';
 import { click, selectDropdownOptionById } from '@console/shared/src/test-utils/utils';
 import * as nadFormView from '../../views/nad.form.view';
+import { PAGE_LOAD_TIMEOUT_SECS } from '../utils/constants';
 
 // TODO See about moving this function from kubevirt-plugin to console-shared
 async function fillInput(elem: any, value: string) {