openshift · openshift-merge-robot · Jul 10, 2021 · Jul 8, 2021
diff --git a/frontend/packages/kubevirt-plugin/integration-tests-cypress/enums/provisionSource.ts b/frontend/packages/kubevirt-plugin/integration-tests-cypress/enums/provisionSource.ts
@@ -1,4 +1,4 @@
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../src/constants/object-enum';
 
 export class ProvisionSource extends ObjectEnum<string> {
   static readonly URL = new ProvisionSource(

diff --git a/frontend/packages/kubevirt-plugin/integration-tests/tests/models/baseVMBuilder.ts b/frontend/packages/kubevirt-plugin/integration-tests/tests/models/baseVMBuilder.ts
@@ -1,5 +1,5 @@
 import { K8sKind } from '@console/internal/module/k8s';
-import { cloneDeepWithEnum } from '@console/shared/src/constants/object-enum';
+import { cloneDeepWithEnum } from '../../../src/constants';
 import { CloudInitConfig, Disk, FlavorConfig, Network } from '../types/types';
 import { BaseVMBuilderData } from '../types/vm';
 import { ProvisionSource } from '../utils/constants/enums/provisionSource';

diff --git a/frontend/packages/kubevirt-plugin/integration-tests/tests/models/virtualMachine.ts b/frontend/packages/kubevirt-plugin/integration-tests/tests/models/virtualMachine.ts
@@ -3,9 +3,9 @@ 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 { cloneDeepWithEnum } from '@console/shared/src/constants/object-enum';
 import { click, waitForStringNotInElement } from '@console/shared/src/test-utils/utils';
 import { MatchLabels } from 'public/module/k8s';
+import { cloneDeepWithEnum } from '../../../src/constants/object-enum';
 import { detailViewAction, listViewAction } from '../../views/actions.view';
 import { saveButton } from '../../views/kubevirtUIResource.view';
 import { vmtLinkByName } from '../../views/template.view';

diff --git a/frontend/packages/kubevirt-plugin/integration-tests/tests/models/virtualMachineTemplate.ts b/frontend/packages/kubevirt-plugin/integration-tests/tests/models/virtualMachineTemplate.ts
@@ -1,8 +1,8 @@
 import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
-import { cloneDeepWithEnum } from '@console/shared/src/constants/object-enum';
 import { detailViewAction, listViewAction } from '@console/shared/src/test-utils/actions.view';
 /* eslint-disable no-await-in-loop */
 import { click } from '@console/shared/src/test-utils/utils';
+import { cloneDeepWithEnum } from '../../../src/constants/object-enum';
 import { templateCreateVMLink, vmtLinkByName, vmtTitle } from '../../views/template.view';
 import { VirtualMachineTemplateModel } from '../types/types';
 import { VMTemplateBuilderData } from '../types/vm';

diff --git a/...packages/kubevirt-plugin/integration-tests/tests/utils/constants/enums/provisionSource.ts b/...packages/kubevirt-plugin/integration-tests/tests/utils/constants/enums/provisionSource.ts
@@ -1,4 +1,4 @@
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../../../../src/constants';
 
 export class ProvisionSource extends ObjectEnum<string> {
   static readonly URL = new ProvisionSource(

diff --git a/frontend/packages/kubevirt-plugin/src/components/modals/disk-modal/storage-ui-source.ts b/frontend/packages/kubevirt-plugin/src/components/modals/disk-modal/storage-ui-source.ts
@@ -1,6 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
-import { VolumeType } from '../../../constants';
+import { VolumeType, ObjectEnum } from '../../../constants';
 import {
   SelectDropdownData,
   SelectDropdownObjectEnum,

diff --git a/frontend/packages/kubevirt-plugin/src/constants/index.ts b/frontend/packages/kubevirt-plugin/src/constants/index.ts
@@ -3,3 +3,4 @@ export * from './vm-templates';
 export * from './cdi';
 export * from './namespace';
 export * from './status-constants';
+export * from './object-enum';
diff --git a/...nsole-shared/src/constants/object-enum.ts → ...evirt-plugin/src/constants/object-enum.ts b/...nsole-shared/src/constants/object-enum.ts → ...evirt-plugin/src/constants/object-enum.ts
diff --git a/frontend/packages/kubevirt-plugin/src/constants/select-dropdown-object-enum.ts b/frontend/packages/kubevirt-plugin/src/constants/select-dropdown-object-enum.ts
@@ -1,4 +1,4 @@
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from './object-enum';
 
 export type SelectDropdownData = {
   descriptionKey?: string;

diff --git a/frontend/packages/kubevirt-plugin/src/constants/status-enum.ts b/frontend/packages/kubevirt-plugin/src/constants/status-enum.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members,no-underscore-dangle */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from './object-enum';
 import { StatusSimpleLabel } from './status-constants';
 import { StatusGroup } from './status-group';
 

diff --git a/frontend/packages/kubevirt-plugin/src/constants/status-group.ts b/frontend/packages/kubevirt-plugin/src/constants/status-group.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from './object-enum';
 
 export class StatusGroup extends ObjectEnum<string> {
   static readonly VMIMPORT = new StatusGroup('VMIMPORT', 'VM Import');

diff --git a/frontend/packages/kubevirt-plugin/src/constants/v2v-import/ovirt/ovirt-disk-bus.ts b/frontend/packages/kubevirt-plugin/src/constants/v2v-import/ovirt/ovirt-disk-bus.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 import { DiskBus } from '../../vm/storage';
 
 export class OvirtDiskBus extends ObjectEnum<string> {

diff --git a/.../packages/kubevirt-plugin/src/constants/v2v-import/ovirt/ovirt-network-interface-model.ts b/.../packages/kubevirt-plugin/src/constants/v2v-import/ovirt/ovirt-network-interface-model.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 import { NetworkInterfaceModel } from '../../vm/network';
 
 export class OvirtNetworkInterfaceModel extends ObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/constants/v2v-import/ovirt/v2v-vm-import-status.ts b/frontend/packages/kubevirt-plugin/src/constants/v2v-import/ovirt/v2v-vm-import-status.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 import { StatusSimpleLabel } from '../../status-constants';
 import { StatusEnum } from '../../status-enum';
 import { StatusGroup } from '../../status-group';

diff --git a/frontend/packages/kubevirt-plugin/src/constants/v2v-import/ovirt/vm-import-type.ts b/frontend/packages/kubevirt-plugin/src/constants/v2v-import/ovirt/vm-import-type.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 
 export class VMImportType extends ObjectEnum<string> {
   static readonly OVIRT = new VMImportType('ovirt');

diff --git a/frontend/packages/kubevirt-plugin/src/constants/v2v-import/vmware/vmware-firmware.ts b/frontend/packages/kubevirt-plugin/src/constants/v2v-import/vmware/vmware-firmware.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 
 export class VMwareFirmware extends ObjectEnum<string> {
   static readonly BIOS = new VMwareFirmware('bios', true);

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm-templates/support.ts b/frontend/packages/kubevirt-plugin/src/constants/vm-templates/support.ts
@@ -1,4 +1,4 @@
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../object-enum';
 import { SelectDropdownObjectEnum } from '../select-dropdown-object-enum';
 
 export class TemplateSupport extends SelectDropdownObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/console-type.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/console-type.ts
@@ -1,5 +1,5 @@
 import { constants } from '@patternfly/react-console';
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../object-enum';
 /* eslint-disable lines-between-class-members */
 
 const {

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/default-os-selection.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/default-os-selection.ts
@@ -1,7 +1,7 @@
 import { TemplateKind } from '@console/internal/module/k8s';
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { getName } from '../../selectors';
 import { isUpstream } from '../../utils/common';
+import { ObjectEnum } from '../object-enum';
 
 export class OSSelection extends ObjectEnum<string> {
   static readonly FEDORA = new OSSelection(

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/flavor.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/flavor.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../object-enum';
 import { SelectDropdownObjectEnum } from '../select-dropdown-object-enum';
 
 export class Flavor extends SelectDropdownObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/network/network-interface-model.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/network/network-interface-model.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 import { SelectDropdownData, SelectDropdownObjectEnum } from '../../select-dropdown-object-enum';
 
 export class NetworkInterfaceModel extends SelectDropdownObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/network/network-interface-type.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/network/network-interface-type.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 import { SelectDropdownObjectEnum } from '../../select-dropdown-object-enum';
 
 export class NetworkInterfaceType extends SelectDropdownObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/network/network-type.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/network/network-type.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 import { NetworkInterfaceType } from './network-interface-type';
 
 export class NetworkType extends ObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/provision-source.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/provision-source.ts
@@ -1,5 +1,4 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { StorageUISource } from '../../components/modals/disk-modal/storage-ui-source';
 import { DataVolumeWrapper } from '../../k8s/wrapper/vm/data-volume-wrapper';
 import { VolumeWrapper } from '../../k8s/wrapper/vm/volume-wrapper';
@@ -13,6 +12,7 @@ import {
   getVolumes,
 } from '../../selectors/vm';
 import { VMLikeEntityKind } from '../../types/vmLike';
+import { ObjectEnum } from '../object-enum';
 import { SelectDropdownObjectEnum } from '../select-dropdown-object-enum';
 import { DataVolumeSourceType, VolumeType } from './storage';
 

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/storage/access-mode.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/storage/access-mode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 
 export class AccessMode extends ObjectEnum<string> {
   static readonly READ_WRITE_ONCE = new AccessMode('ReadWriteOnce', 'Single User (RWO)');

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/storage/data-volume-source-type.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/storage/data-volume-source-type.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 import { SelectDropdownObjectEnum } from '../../select-dropdown-object-enum';
 
 export class DataVolumeSourceType extends SelectDropdownObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/storage/disk-bus.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/storage/disk-bus.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 import { SelectDropdownObjectEnum } from '../../select-dropdown-object-enum';
 
 export class DiskBus extends SelectDropdownObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/storage/disk-type.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/storage/disk-type.ts
@@ -1,6 +1,6 @@
 /* eslint-disable lines-between-class-members */
 import * as _ from 'lodash';
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 import { DiskBus } from './disk-bus';
 
 export class DiskType extends ObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/storage/volume-mode.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/storage/volume-mode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 
 export class VolumeMode extends ObjectEnum<string> {
   static readonly BLOCK = new VolumeMode('Block');

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/storage/volume-type.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/storage/volume-type.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../object-enum';
 
 interface VolumeMetadata {
   isEnvType?: boolean;

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/vm-status.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/vm-status.ts
@@ -1,6 +1,6 @@
 /* eslint-disable lines-between-class-members,no-underscore-dangle */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { getStringEnumValues } from '../../utils/types';
+import { ObjectEnum } from '../object-enum';
 import { StatusSimpleLabel } from '../status-constants';
 import { StatusEnum, StatusMetadata } from '../status-enum';
 import { StatusGroup } from '../status-group';

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/workload-profile.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/workload-profile.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../object-enum';
 import { SelectDropdownObjectEnum } from '../select-dropdown-object-enum';
 
 export class WorkloadProfile extends SelectDropdownObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/k8s/wrapper/common/__tests__/mocks/smoothie-wrapper.ts b/frontend/packages/kubevirt-plugin/src/k8s/wrapper/common/__tests__/mocks/smoothie-wrapper.ts
@@ -1,4 +1,4 @@
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../../../../constants/object-enum';
 import { ObjectWithTypePropertyWrapper } from '../../object-with-type-property-wrapper';
 
 export type Smoothie = {

diff --git a/.../kubevirt-plugin/src/k8s/wrapper/common/k8s-resource-object-with-type-property-wrapper.ts b/.../kubevirt-plugin/src/k8s/wrapper/common/k8s-resource-object-with-type-property-wrapper.ts
@@ -1,6 +1,6 @@
 import { K8sKind, K8sResourceKind, OwnerReference } from '@console/internal/module/k8s/types';
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../../constants/object-enum';
 import {
   getCreationTimestamp,
   getLabels,

diff --git a/...tend/packages/kubevirt-plugin/src/k8s/wrapper/common/object-with-type-property-wrapper.ts b/...tend/packages/kubevirt-plugin/src/k8s/wrapper/common/object-with-type-property-wrapper.ts
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../../constants';
 import { omitEmpty } from '../../../utils/common';
 import { Wrapper } from './wrapper';
 

diff --git a/frontend/packages/kubevirt-plugin/src/statuses/pod-deployment/constants.ts b/frontend/packages/kubevirt-plugin/src/statuses/pod-deployment/constants.ts
@@ -1,4 +1,4 @@
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../constants';
 import { DeploymentStatus } from '../deployment';
 
 export class PodDeploymentStatus extends ObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/statuses/v2v/constants.ts b/frontend/packages/kubevirt-plugin/src/statuses/v2v/constants.ts
@@ -1,4 +1,4 @@
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { ObjectEnum } from '../../constants';
 
 // phases constants conform v2vvmware_controller.go
 export class V2VProviderStatus extends ObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/utils/validations/template/template-validations.ts b/frontend/packages/kubevirt-plugin/src/utils/validations/template/template-validations.ts
@@ -1,7 +1,6 @@
 /* eslint-disable lines-between-class-members */
 import * as _ from 'lodash';
-import { ObjectEnum } from '@console/shared/src/constants/object-enum';
-import { DiskBus, DiskType } from '../../../constants';
+import { DiskBus, DiskType, ObjectEnum } from '../../../constants';
 import { ValidationErrorType } from '../../../selectors';
 import { CommonTemplatesValidation } from '../../../types/template';
 import { isSetEqual } from '../../common';