Arik Hadas has uploaded a new change for review. Change subject: core: rename ImportVmCommand ......................................................................
core: rename ImportVmCommand Rename ImportVmCommand to ImportVmFromStroageDomainCommand Change-Id: Icd1296e58bcaf30c81b597a76094d64cfb9b0342 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromStorageDomainCommand.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmFromStorageDomainCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java M backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/async_tasks_map.py 11 files changed, 47 insertions(+), 47 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/34850/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java index 3f6e869..86ddd40 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java @@ -191,7 +191,7 @@ private boolean shouldUpdateStorageDisk() { return getParameters().getOperation() == ImageOperation.Move || - getParameters().getParentCommand() == VdcActionType.ImportVm; + getParameters().getParentCommand() == VdcActionType.ImportVmFromStorageDomain; } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java index a1a12c1..aff7257 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; @NonTransactiveCommandAttribute(forceCompensation = true) -public class ImportVmFromConfigurationCommand<T extends ImportVmParameters> extends ImportVmCommand<T> { +public class ImportVmFromConfigurationCommand<T extends ImportVmParameters> extends ImportVmFromStorageDomainCommand<T> { private static final Logger log = LoggerFactory.getLogger(ImportVmFromConfigurationCommand.class); private Collection<Disk> vmDisksToAttach; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromStorageDomainCommand.java similarity index 99% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromStorageDomainCommand.java index bfa3a1c..8c5fc8c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromStorageDomainCommand.java @@ -103,10 +103,10 @@ @DisableInPrepareMode @NonTransactiveCommandAttribute(forceCompensation = true) -public class ImportVmCommand<T extends ImportVmParameters> extends ImportVmCommandBase<T> +public class ImportVmFromStorageDomainCommand<T extends ImportVmParameters> extends ImportVmCommandBase<T> implements QuotaStorageDependent, TaskHandlerCommand<T> { - private static final Logger log = LoggerFactory.getLogger(ImportVmCommand.class); + private static final Logger log = LoggerFactory.getLogger(ImportVmFromStorageDomainCommand.class); private static VmStatic vmStaticForDefaultValues = new VmStatic(); private List<DiskImage> imageList; @@ -116,15 +116,15 @@ private StorageDomain sourceDomain; private Guid sourceDomainId = Guid.Empty; - protected ImportVmCommand(Guid commandId) { + protected ImportVmFromStorageDomainCommand(Guid commandId) { super(commandId); } - public ImportVmCommand(T parameters) { + public ImportVmFromStorageDomainCommand(T parameters) { this(parameters, null); } - public ImportVmCommand(T parameters, CommandContext commandContext) { + public ImportVmFromStorageDomainCommand(T parameters, CommandContext commandContext) { super(parameters, commandContext); init(parameters); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmFromStorageDomainCommandTest.java similarity index 90% rename from backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java rename to backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmFromStorageDomainCommandTest.java index fc19c7a..a640406 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmFromStorageDomainCommandTest.java @@ -68,7 +68,7 @@ import org.ovirt.engine.core.vdsbroker.vdsbroker.VdsProperties; @RunWith(MockitoJUnitRunner.class) -public class ImportVmCommandTest { +public class ImportVmFromStorageDomainCommandTest { @ClassRule public static MockConfigRule mcr = new MockConfigRule( @@ -101,7 +101,7 @@ @Test public void insufficientDiskSpaceWithCollapse() { - final ImportVmCommand<ImportVmParameters> command = setupDiskSpaceTest(createParameters()); + final ImportVmFromStorageDomainCommand<ImportVmParameters> command = setupDiskSpaceTest(createParameters()); doReturn(new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_STORAGE_DOMAIN)). when(multipleSdValidator).allDomainsHaveSpaceForClonedDisks(anyList()); CanDoActionTestUtils.runAndAssertCanDoActionFailure(command, @@ -114,7 +114,7 @@ @Test public void insufficientDiskSpaceWithSnapshots() { ImportVmParameters parameters = createParameters(); - final ImportVmCommand<ImportVmParameters> command = setupDiskSpaceTest(parameters); + final ImportVmFromStorageDomainCommand<ImportVmParameters> command = setupDiskSpaceTest(parameters); parameters.setCopyCollapse(false); doReturn(new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_STORAGE_DOMAIN)). when(multipleSdValidator).allDomainsHaveSpaceForDisksWithSnapshots(anyList()); @@ -138,7 +138,7 @@ @Test public void refuseBalloonOnPPC() { - final ImportVmCommand<ImportVmParameters> c = setupDiskSpaceTest(createParameters()); + final ImportVmFromStorageDomainCommand<ImportVmParameters> c = setupDiskSpaceTest(createParameters()); addBalloonToVm(c.getParameters().getVm()); @@ -156,7 +156,7 @@ @Test public void acceptBalloon() { - final ImportVmCommand<ImportVmParameters> c = setupDiskSpaceTest(createParameters()); + final ImportVmFromStorageDomainCommand<ImportVmParameters> c = setupDiskSpaceTest(createParameters()); addBalloonToVm(c.getParameters().getVm()); @@ -172,7 +172,7 @@ @Test public void sufficientDiskSpace() { - final ImportVmCommand<ImportVmParameters> command = setupDiskSpaceTest(createParameters()); + final ImportVmFromStorageDomainCommand<ImportVmParameters> command = setupDiskSpaceTest(createParameters()); CanDoActionTestUtils.runAndAssertCanDoActionSuccess(command); verify(multipleSdValidator).allDomainsHaveSpaceForClonedDisks(anyList()); verify(multipleSdValidator, never()).allDomainsHaveSpaceForDisksWithSnapshots(anyList()); @@ -181,15 +181,15 @@ @Test public void lowThresholdStorageSpace() { - final ImportVmCommand<ImportVmParameters> command = setupDiskSpaceTest(createParameters()); + final ImportVmFromStorageDomainCommand<ImportVmParameters> command = setupDiskSpaceTest(createParameters()); doReturn(new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_STORAGE_DOMAIN)). when(multipleSdValidator).allDomainsWithinThresholds(); CanDoActionTestUtils.runAndAssertCanDoActionFailure(command, VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_STORAGE_DOMAIN); } - private ImportVmCommand<ImportVmParameters> setupDiskSpaceTest(ImportVmParameters parameters) { - ImportVmCommand<ImportVmParameters> cmd = spy(new ImportVmCommand<ImportVmParameters>(parameters)); + private ImportVmFromStorageDomainCommand<ImportVmParameters> setupDiskSpaceTest(ImportVmParameters parameters) { + ImportVmFromStorageDomainCommand<ImportVmParameters> cmd = spy(new ImportVmFromStorageDomainCommand<ImportVmParameters>(parameters)); parameters.setCopyCollapse(true); doReturn(true).when(cmd).validateNoDuplicateVm(); doReturn(true).when(cmd).validateVdsCluster(); @@ -308,7 +308,7 @@ ImportVmParameters parameters = createParameters(); parameters.getVm().setName(name); parameters.setImportAsNewEntity(isImportAsNewEntity); - ImportVmCommand<ImportVmParameters> command = new ImportVmCommand<>(parameters); + ImportVmFromStorageDomainCommand<ImportVmParameters> command = new ImportVmFromStorageDomainCommand<>(parameters); Set<ConstraintViolation<ImportVmParameters>> validate = ValidationUtils.getValidator().validate(parameters, command.getValidationGroups().toArray(new Class<?>[0])); @@ -327,14 +327,14 @@ RandomUtils.instance().nextPropertyString(BusinessEntitiesDefinitions.GENERAL_MAX_SIZE + 1); parameters.getVm().setUserDefinedProperties(tooLongString); parameters.setImportAsNewEntity(true); - ImportVmCommand<ImportVmParameters> command = new ImportVmCommand<>(parameters); + ImportVmFromStorageDomainCommand<ImportVmParameters> command = new ImportVmFromStorageDomainCommand<>(parameters); Set<ConstraintViolation<ImportVmParameters>> validate = ValidationUtils.getValidator().validate(parameters, command.getValidationGroups().toArray(new Class<?>[0])); assertTrue(validate.isEmpty()); parameters.getVm().setUserDefinedProperties(tooLongString); parameters.setImportAsNewEntity(false); - command = new ImportVmCommand<>(parameters); + command = new ImportVmFromStorageDomainCommand<>(parameters); validate = ValidationUtils.getValidator().validate(parameters, command.getValidationGroups().toArray(new Class<?>[0])); @@ -347,7 +347,7 @@ @Test public void testManagedDeviceSyncWithNewDiskId() { ImportVmParameters parameters = createParameters(); - ImportVmCommand<ImportVmParameters> command = new ImportVmCommand<>(parameters); + ImportVmFromStorageDomainCommand<ImportVmParameters> command = new ImportVmFromStorageDomainCommand<>(parameters); List<DiskImage> diskList = new ArrayList<>(); DiskImage diskImage = new DiskImage(); diskImage.setStorageIds(new ArrayList<Guid>()); @@ -373,7 +373,7 @@ public void testAliasGenerationByAddVmImagesAndSnapshotsWithCollapse() { ImportVmParameters params = createParameters(); params.setCopyCollapse(true); - ImportVmCommand<ImportVmParameters> cmd = spy(new ImportVmCommand<ImportVmParameters>(params)); + ImportVmFromStorageDomainCommand<ImportVmParameters> cmd = spy(new ImportVmFromStorageDomainCommand<ImportVmParameters>(params)); DiskImage collapsedDisk = params.getVm().getImages().get(1); @@ -393,7 +393,7 @@ params.setCopyCollapse(Boolean.TRUE); DiskImage diskImage = params.getVm().getImages().get(0); diskImage.setVmSnapshotId(Guid.Empty); - ImportVmCommand<ImportVmParameters> cmd = spy(new ImportVmCommand<ImportVmParameters>(params)); + ImportVmFromStorageDomainCommand<ImportVmParameters> cmd = spy(new ImportVmFromStorageDomainCommand<ImportVmParameters>(params)); doReturn(true).when(cmd).validateNoDuplicateVm(); doReturn(true).when(cmd).validateVdsCluster(); doReturn(true).when(cmd).validateUsbPolicy(); @@ -419,7 +419,7 @@ public void testAliasGenerationByAddVmImagesAndSnapshotsWithoutCollapse() { ImportVmParameters params = createParameters(); params.setCopyCollapse(false); - ImportVmCommand<ImportVmParameters> cmd = spy(new ImportVmCommand<ImportVmParameters>(params)); + ImportVmFromStorageDomainCommand<ImportVmParameters> cmd = spy(new ImportVmFromStorageDomainCommand<ImportVmParameters>(params)); for (DiskImage image : params.getVm().getImages()) { doNothing().when(cmd).saveImage(image); @@ -438,7 +438,7 @@ @Test public void testValidateClusterSupportForVirtioScsi() { - ImportVmCommand<ImportVmParameters> cmd = setupDiskSpaceTest(createParameters()); + ImportVmFromStorageDomainCommand<ImportVmParameters> cmd = setupDiskSpaceTest(createParameters()); cmd.getParameters().getVm().getDiskMap().values().iterator().next().setDiskInterface(DiskInterface.VirtIO_SCSI); cmd.getVdsGroup().setcompatibility_version(Version.v3_2); CanDoActionTestUtils.runAndAssertCanDoActionFailure(cmd, diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java index 6269d10..af9b57d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java @@ -123,7 +123,7 @@ VMStatus.WaitForLaunch, EnumSet.of(VdcActionType.HibernateVm, VdcActionType.RunVm, VdcActionType.CloneVm, VdcActionType.RunVmOnce, VdcActionType.AddVmTemplate, VdcActionType.RemoveVm, - VdcActionType.ExportVm, VdcActionType.MoveVm, VdcActionType.ImportVm, VdcActionType.ChangeDisk, + VdcActionType.ExportVm, VdcActionType.MoveVm, VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, VdcActionType.ExtendImageSize, VdcActionType.RebootVm)); @@ -131,14 +131,14 @@ VMStatus.Up, EnumSet.of(VdcActionType.RunVm, VdcActionType.CloneVm, VdcActionType.RunVmOnce, VdcActionType.AddVmTemplate, VdcActionType.RemoveVm, VdcActionType.CloneVm, - VdcActionType.ExportVm, VdcActionType.MoveVm, VdcActionType.ImportVm, + VdcActionType.ExportVm, VdcActionType.MoveVm, VdcActionType.ImportVmFromStorageDomain, VdcActionType.CancelMigrateVm)); vmMatrix.put( VMStatus.PoweringDown, EnumSet.of(VdcActionType.HibernateVm, VdcActionType.RunVm, VdcActionType.CloneVm, VdcActionType.RunVmOnce, VdcActionType.AddVmTemplate, VdcActionType.RemoveVm, VdcActionType.MigrateVm, - VdcActionType.ExportVm, VdcActionType.MoveVm, VdcActionType.ImportVm, + VdcActionType.ExportVm, VdcActionType.MoveVm, VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, @@ -147,7 +147,7 @@ VMStatus.PoweringUp, EnumSet.of(VdcActionType.HibernateVm, VdcActionType.RunVm, VdcActionType.CloneVm, VdcActionType.RunVmOnce, VdcActionType.AddVmTemplate, VdcActionType.RemoveVm, - VdcActionType.ExportVm, VdcActionType.MoveVm, VdcActionType.ImportVm, VdcActionType.ChangeDisk, + VdcActionType.ExportVm, VdcActionType.MoveVm, VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, VdcActionType.ExtendImageSize)); @@ -155,7 +155,7 @@ VMStatus.RebootInProgress, EnumSet.of(VdcActionType.HibernateVm, VdcActionType.RunVm, VdcActionType.CloneVm, VdcActionType.RunVmOnce, VdcActionType.AddVmTemplate, VdcActionType.RemoveVm, - VdcActionType.ExportVm, VdcActionType.MoveVm, VdcActionType.ImportVm, VdcActionType.ChangeDisk, + VdcActionType.ExportVm, VdcActionType.MoveVm, VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, VdcActionType.ExtendImageSize, VdcActionType.RebootVm)); @@ -164,7 +164,7 @@ EnumSet.of(VdcActionType.RunVm, VdcActionType.CloneVm, VdcActionType.RunVmOnce, VdcActionType.AddVmTemplate, VdcActionType.RemoveVm, VdcActionType.HibernateVm, VdcActionType.MigrateVm, VdcActionType.ExportVm, - VdcActionType.MoveVm, VdcActionType.ImportVm, VdcActionType.ChangeDisk, + VdcActionType.MoveVm, VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CreateAllSnapshotsFromVm, VdcActionType.ExtendImageSize, VdcActionType.RebootVm)); @@ -172,7 +172,7 @@ VMStatus.Suspended, EnumSet.of(VdcActionType.HibernateVm, VdcActionType.AddVmTemplate, VdcActionType.CloneVm, VdcActionType.RunVmOnce, VdcActionType.MigrateVm, VdcActionType.ExportVm, VdcActionType.MoveVm, - VdcActionType.ImportVm, VdcActionType.ChangeDisk, VdcActionType.RemoveVm, + VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.RemoveVm, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, VdcActionType.RebootVm, VdcActionType.CreateAllSnapshotsFromVm)); @@ -180,7 +180,7 @@ VMStatus.Paused, EnumSet.of(VdcActionType.RemoveVm, VdcActionType.HibernateVm, VdcActionType.CloneVm, VdcActionType.AddVmTemplate, VdcActionType.RunVmOnce, VdcActionType.ExportVm, - VdcActionType.MoveVm, VdcActionType.ImportVm, + VdcActionType.MoveVm, VdcActionType.ImportVmFromStorageDomain, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, VdcActionType.RebootVm)); vmMatrix.put( @@ -189,7 +189,7 @@ VdcActionType.RunVmOnce, VdcActionType.StopVm, VdcActionType.ShutdownVm, VdcActionType.HibernateVm, VdcActionType.MigrateVm, VdcActionType.RemoveVm, VdcActionType.AddVmTemplate, VdcActionType.ExportVm, VdcActionType.MoveVm, - VdcActionType.ImportVm, VdcActionType.ChangeDisk, + VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, VdcActionType.ExtendImageSize, VdcActionType.RebootVm)); @@ -199,7 +199,7 @@ VdcActionType.RunVmOnce, VdcActionType.StopVm, VdcActionType.ShutdownVm, VdcActionType.HibernateVm, VdcActionType.MigrateVm, VdcActionType.RemoveVm, VdcActionType.AddVmTemplate, VdcActionType.ExportVm, VdcActionType.MoveVm, - VdcActionType.ImportVm, VdcActionType.ChangeDisk, + VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, VdcActionType.ExtendImageSize, VdcActionType.RebootVm)); @@ -209,7 +209,7 @@ VdcActionType.RunVmOnce, VdcActionType.StopVm, VdcActionType.ShutdownVm, VdcActionType.HibernateVm, VdcActionType.MigrateVm, VdcActionType.RemoveVm, VdcActionType.AddVmTemplate, VdcActionType.ExportVm, VdcActionType.MoveVm, - VdcActionType.ImportVm, VdcActionType.ChangeDisk, + VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, VdcActionType.ExtendImageSize, VdcActionType.RebootVm)); @@ -230,7 +230,7 @@ VdcActionType.AddVmTemplate, VdcActionType.ExportVm, VdcActionType.MoveVm, - VdcActionType.ImportVm, + VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, @@ -246,7 +246,7 @@ VdcActionType.RunVmOnce, VdcActionType.StopVm, VdcActionType.ShutdownVm, VdcActionType.HibernateVm, VdcActionType.MigrateVm, VdcActionType.RemoveVm, VdcActionType.AddVmTemplate, VdcActionType.ExportVm, VdcActionType.MoveVm, - VdcActionType.ImportVm, VdcActionType.ChangeDisk, VdcActionType.CreateAllSnapshotsFromVm, + VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.CreateAllSnapshotsFromVm, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, VdcActionType.ExtendImageSize, VdcActionType.RebootVm)); @@ -255,7 +255,7 @@ EnumSet.of(VdcActionType.RunVm, VdcActionType.CloneVm, VdcActionType.RunVmOnce, VdcActionType.HibernateVm, VdcActionType.MigrateVm, VdcActionType.RemoveVm, VdcActionType.AddVmTemplate, VdcActionType.ExportVm, - VdcActionType.MoveVm, VdcActionType.ImportVm, VdcActionType.ChangeDisk, + VdcActionType.MoveVm, VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, VdcActionType.ExtendImageSize, VdcActionType.RebootVm)); @@ -266,7 +266,7 @@ VdcActionType.RunVmOnce, VdcActionType.StopVm, VdcActionType.ShutdownVm, VdcActionType.HibernateVm, VdcActionType.MigrateVm, VdcActionType.RemoveVm, VdcActionType.AddVmTemplate, VdcActionType.ExportVm, VdcActionType.MoveVm, - VdcActionType.ImportVm, VdcActionType.ChangeDisk, VdcActionType.CreateAllSnapshotsFromVm, + VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.CreateAllSnapshotsFromVm, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, VdcActionType.ExtendImageSize, VdcActionType.RebootVm)); @@ -276,7 +276,7 @@ VdcActionType.RunVmOnce, VdcActionType.StopVm, VdcActionType.ShutdownVm, VdcActionType.HibernateVm, VdcActionType.MigrateVm, VdcActionType.RemoveVm, VdcActionType.AddVmTemplate, VdcActionType.ExportVm, VdcActionType.MoveVm, - VdcActionType.ImportVm, VdcActionType.ChangeDisk, VdcActionType.CreateAllSnapshotsFromVm, + VdcActionType.ImportVmFromStorageDomain, VdcActionType.ChangeDisk, VdcActionType.CreateAllSnapshotsFromVm, VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, VdcActionType.ExtendImageSize, VdcActionType.RebootVm)); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java index e99a0ee..55c5948 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java @@ -44,7 +44,7 @@ HotSetNumberOfCpus(184, ActionGroup.EDIT_VM_PROPERTIES, false, QuotaDependency.VDS_GROUP, true), VmSlaPolicy(185, ActionGroup.EDIT_VM_PROPERTIES, false, QuotaDependency.NONE), ChangeFloppy(35, QuotaDependency.NONE), - ImportVm(36, ActionGroup.IMPORT_EXPORT_VM, QuotaDependency.STORAGE), + ImportVmFromStorageDomain(36, ActionGroup.IMPORT_EXPORT_VM, QuotaDependency.STORAGE), RemoveVmFromImportExport(37, ActionGroup.DELETE_VM, QuotaDependency.NONE), RemoveVmTemplateFromImportExport(38, ActionGroup.DELETE_TEMPLATE, QuotaDependency.NONE), ImportVmTemplate(39, ActionGroup.IMPORT_EXPORT_VM, QuotaDependency.STORAGE), diff --git a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties index 42f6216..17fe440 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties @@ -22,7 +22,7 @@ job.ExportVmTemplate=Exporting VM Template ${VmTemplate} To Export Domain ${Storage} job.AddDisk=Adding Disk ${DiskAlias} job.RemoveDisk=Removing Disk ${DiskAlias} -job.ImportVm=Importing VM ${VM} to Cluster ${VdsGroups} +job.ImportVmFromStorageDomain=Importing VM ${VM} to Cluster ${VdsGroups} job.ForceSelectSPM=Force selecting ${VDS} as SPM for Data Center ${StoragePool} job.ImportVmFromConfiguration=Importing VM ${VM} from configuration to Cluster ${VdsGroups} job.ImportVmTemplateFromConfiguration=Importing Template ${VmTemplate} from configuration to Cluster ${VdsGroups} diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java index cbe2397..026fc92 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java @@ -80,7 +80,7 @@ } } - return doAction(VdcActionType.ImportVm, params, action); + return doAction(VdcActionType.ImportVmFromStorageDomain, params, action); } @Override diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java index 117bebf2..863165e 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java @@ -188,7 +188,7 @@ public void doTestImport(StorageDomain storageDomain, Cluster cluster, boolean collapseSnapshots, boolean importAsNewEntity) throws Exception { setUpGetEntityExpectations(1, StorageDomainType.ImportExport, GUIDS[2]); - setUriInfo(setUpActionExpectations(VdcActionType.ImportVm, + setUriInfo(setUpActionExpectations(VdcActionType.ImportVmFromStorageDomain, ImportVmParameters.class, new String[] { "ContainerId", "StorageDomainId", "SourceDomainId", "DestDomainId", "StoragePoolId", "VdsGroupId", "CopyCollapse", "ImportAsNewEntity" }, new Object[] { VM_ID, GUIDS[2], STORAGE_DOMAIN_ID, GUIDS[2], DATA_CENTER_ID, GUIDS[1], collapseSnapshots, importAsNewEntity })); @@ -244,7 +244,7 @@ setUpGetDataCenterByStorageDomainExpectations(GUIDS[3]); setUriInfo(setUpActionExpectations( - VdcActionType.ImportVm, + VdcActionType.ImportVmFromStorageDomain, ImportVmParameters.class, new String[] { "ContainerId", "StorageDomainId", "SourceDomainId", "DestDomainId", "StoragePoolId", "VdsGroupId" }, new Object[] { VM_ID, GUIDS[2], STORAGE_DOMAIN_ID, GUIDS[2], DATA_CENTER_ID, GUIDS[1] }, diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java index cd1f28d..4fa9f2f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java @@ -484,7 +484,7 @@ importModel.startProgress(null); - Frontend.getInstance().runMultipleAction(VdcActionType.ImportVm, prms, + Frontend.getInstance().runMultipleAction(VdcActionType.ImportVmFromStorageDomain, prms, new IFrontendMultipleActionAsyncCallback() { @Override public void executed( diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/async_tasks_map.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/async_tasks_map.py index 0f8825b..c85ddec 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/async_tasks_map.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/async_tasks_map.py @@ -72,7 +72,7 @@ 'Exporting a template to an export domain', ], '26': [ - 'ImportVmCommand', + 'ImportVmFromStorageDomainCommand', 'Importing a virtual machine from an export domain', ], '31': [ -- To view, visit http://gerrit.ovirt.org/34850 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd1296e58bcaf30c81b597a76094d64cfb9b0342 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
