Federico Simoncelli has uploaded a new change for review. Change subject: misc: rename Openstack Image to OpenStack Image ......................................................................
misc: rename Openstack Image to OpenStack Image Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=987945 Change-Id: I0a8c92e7e2d5b78e64ba55bb9636e97d86c3a8f9 Signed-off-by: Federico Simoncelli <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportRepoImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/OpenStackImageProviderProxy.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ProviderProxyFactory.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportExportRepoImageCommandTest.java R backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenStackImageProviderProperties.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/provider/ProviderDaoDbFacadeImpl.java M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties 12 files changed, 36 insertions(+), 36 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/17344/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportRepoImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportRepoImageCommand.java index f3971a6..3763386 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportRepoImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportRepoImageCommand.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.bll.provider.OpenstackImageProviderProxy; +import org.ovirt.engine.core.bll.provider.OpenStackImageProviderProxy; import org.ovirt.engine.core.bll.provider.ProviderProxyFactory; import org.ovirt.engine.core.bll.storage.StoragePoolValidator; import org.ovirt.engine.core.bll.utils.PermissionSubject; @@ -34,7 +34,7 @@ private DiskImage diskImage; - private OpenstackImageProviderProxy providerProxy; + private OpenStackImageProviderProxy providerProxy; public ExportRepoImageCommand(T parameters) { super(parameters); @@ -45,9 +45,9 @@ return ProviderProxyFactory.getInstance(); } - protected OpenstackImageProviderProxy getProviderProxy() { + protected OpenStackImageProviderProxy getProviderProxy() { if (providerProxy == null) { - providerProxy = OpenstackImageProviderProxy + providerProxy = OpenStackImageProviderProxy .getFromStorageDomainId(getParameters().getDestinationDomainId()); } return providerProxy; @@ -85,7 +85,7 @@ @Override protected void executeCommand() { DiskImage diskImage = getDiskImage(); - OpenstackImageProviderProxy proxy = getProviderProxy(); + OpenStackImageProviderProxy proxy = getProviderProxy(); acquireImageDbLock(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java index 8c1d5ca..348e9e1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.bll.provider.OpenstackImageProviderProxy; +import org.ovirt.engine.core.bll.provider.OpenStackImageProviderProxy; import org.ovirt.engine.core.bll.provider.ProviderProxyFactory; import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter; import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter; @@ -28,7 +28,7 @@ public class ImportRepoImageCommand<T extends ImportRepoImageParameters> extends CommandBase<T> implements TaskHandlerCommand<ImportRepoImageParameters>, QuotaStorageDependent { - private OpenstackImageProviderProxy providerProxy; + private OpenStackImageProviderProxy providerProxy; public ImportRepoImageCommand(T parameters) { super(parameters); @@ -40,9 +40,9 @@ return ProviderProxyFactory.getInstance(); } - protected OpenstackImageProviderProxy getProviderProxy() { + protected OpenStackImageProviderProxy getProviderProxy() { if (providerProxy == null) { - providerProxy = OpenstackImageProviderProxy + providerProxy = OpenStackImageProviderProxy .getFromStorageDomainId(getParameters().getSourceStorageDomainId()); } return providerProxy; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java index 54e2db2..c56dc72 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.bll.provider.OpenstackImageProviderProxy; +import org.ovirt.engine.core.bll.provider.OpenStackImageProviderProxy; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.ImportRepoImageParameters; @@ -16,7 +16,7 @@ public class ImportRepoImageCopyTaskHandler extends AbstractSPMAsyncTaskHandler<TaskHandlerCommand<? extends ImportRepoImageParameters>> { - private OpenstackImageProviderProxy providerProxy; + private OpenStackImageProviderProxy providerProxy; public ImportRepoImageCopyTaskHandler(TaskHandlerCommand<? extends ImportRepoImageParameters> cmd) { super(cmd); @@ -36,9 +36,9 @@ return AsyncTaskType.copyImage; } - protected OpenstackImageProviderProxy getProviderProxy() { + protected OpenStackImageProviderProxy getProviderProxy() { if (providerProxy == null) { - providerProxy = OpenstackImageProviderProxy + providerProxy = OpenStackImageProviderProxy .getFromStorageDomainId(getEnclosingCommand().getParameters().getSourceStorageDomainId()); } return providerProxy; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java index c8624d6..ded6d6b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java @@ -12,7 +12,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.ovirt.engine.core.bll.provider.OpenstackImageProviderProxy; +import org.ovirt.engine.core.bll.provider.OpenStackImageProviderProxy; import org.ovirt.engine.core.bll.provider.ProviderProxyFactory; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.businessentities.ImageFileType; @@ -171,7 +171,7 @@ boolean forceRefresh) { // The result list we send back. List<RepoImage> repoList = null; - if (! isStorageDomainValid(storageDomainId, imageType, forceRefresh)){ + if (!isStorageDomainValid(storageDomainId, imageType, forceRefresh)) { return null; } // At any case, if refreshed or not, get Iso list from the cache. @@ -212,7 +212,7 @@ final RepoFileMetaDataDAO repoFileMetaDataDao = repoStorageDom; Provider provider = providerDao.get(new Guid(storageDomain.getStorage())); - final OpenstackImageProviderProxy client = ProviderProxyFactory.getInstance().create(provider); + final OpenStackImageProviderProxy client = ProviderProxyFactory.getInstance().create(provider); Lock syncObject = getSyncObject(storageDomain.getId(), imageType); try { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/OpenstackImageProviderProxy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/OpenStackImageProviderProxy.java similarity index 97% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/OpenstackImageProviderProxy.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/OpenStackImageProviderProxy.java index 0bd989b..07be0c8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/OpenstackImageProviderProxy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/OpenStackImageProviderProxy.java @@ -9,7 +9,7 @@ import com.woorea.openstack.keystone.utils.KeystoneTokenProvider; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.ImageFileType; -import org.ovirt.engine.core.common.businessentities.OpenstackImageProviderProperties; +import org.ovirt.engine.core.common.businessentities.OpenStackImageProviderProperties; import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.RepoImage; import org.ovirt.engine.core.common.businessentities.StorageDomain; @@ -35,7 +35,7 @@ import java.util.Map; -public class OpenstackImageProviderProxy implements ProviderProxy { +public class OpenStackImageProviderProxy implements ProviderProxy { enum GlanceImageFormat { RAW("raw"), @@ -75,13 +75,13 @@ private static final int QCOW2_SIZE_OFFSET = 24; - private Provider<OpenstackImageProviderProperties> provider; + private Provider<OpenStackImageProviderProperties> provider; private OpenStackTokenProvider tokenProvider; private Glance client; - public OpenstackImageProviderProxy(Provider<OpenstackImageProviderProperties> provider) { + public OpenStackImageProviderProxy(Provider<OpenStackImageProviderProperties> provider) { this.provider = provider; } @@ -139,7 +139,7 @@ return provider; } - public static OpenstackImageProviderProxy getFromStorageDomainId(Guid storageDomainId) { + public static OpenStackImageProviderProxy getFromStorageDomainId(Guid storageDomainId) { StorageDomainStatic storageDomainStatic = getDbFacade().getStorageDomainStaticDao().get(storageDomainId); if (storageDomainStatic != null) { Provider provider = getDbFacade().getProviderDao().get(new Guid(storageDomainStatic.getStorage())); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ProviderProxyFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ProviderProxyFactory.java index 0ad8f34..39203c3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ProviderProxyFactory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ProviderProxyFactory.java @@ -2,7 +2,7 @@ import org.ovirt.engine.core.bll.host.provider.foreman.ForemanHostProviderProxy; import org.ovirt.engine.core.bll.provider.network.openstack.OpenstackNetworkProviderProxy; -import org.ovirt.engine.core.common.businessentities.OpenstackImageProviderProperties; +import org.ovirt.engine.core.common.businessentities.OpenStackImageProviderProperties; import org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties; import org.ovirt.engine.core.common.businessentities.Provider; @@ -34,7 +34,7 @@ return (P) new OpenstackNetworkProviderProxy((Provider<OpenstackNetworkProviderProperties>) provider); case OPENSTACK_IMAGE: - return (P) new OpenstackImageProviderProxy((Provider<OpenstackImageProviderProperties>) provider); + return (P) new OpenStackImageProviderProxy((Provider<OpenStackImageProviderProperties>) provider); default: return null; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportExportRepoImageCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportExportRepoImageCommandTest.java index 2b1986c..eec281f 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportExportRepoImageCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportExportRepoImageCommandTest.java @@ -4,7 +4,7 @@ import org.junit.Rule; import org.mockito.Mock; import org.ovirt.engine.core.bll.lock.InMemoryLockManager; -import org.ovirt.engine.core.bll.provider.OpenstackImageProviderProxy; +import org.ovirt.engine.core.bll.provider.OpenStackImageProviderProxy; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.ProviderType; @@ -41,7 +41,7 @@ private DiskImageDAO diskImageDao; @Mock - private OpenstackImageProviderProxy providerProxy; + private OpenStackImageProviderProxy providerProxy; private Guid providerId; @@ -85,7 +85,7 @@ return storagePoolDao; } - public OpenstackImageProviderProxy getProviderProxy() { + public OpenStackImageProviderProxy getProviderProxy() { return providerProxy; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackImageProviderProperties.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenStackImageProviderProperties.java similarity index 76% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackImageProviderProperties.java rename to backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenStackImageProviderProperties.java index bb351d3..b328123 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackImageProviderProperties.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenStackImageProviderProperties.java @@ -1,13 +1,13 @@ package org.ovirt.engine.core.common.businessentities; -public class OpenstackImageProviderProperties extends TenantProviderProperties { +public class OpenStackImageProviderProperties extends TenantProviderProperties { private static final long serialVersionUID = -3887979451360188295L; @Override public String toString() { StringBuilder builder = new StringBuilder(); - builder.append("OpenstackImageProviderProperties [pluginType=") + builder.append("OpenStackImageProviderProperties [pluginType=") .append(", tenantName=") .append(getTenantName()) .append("]"); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/provider/ProviderDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/provider/ProviderDaoDbFacadeImpl.java index 0924192..1e16224 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/provider/ProviderDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/provider/ProviderDaoDbFacadeImpl.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; -import org.ovirt.engine.core.common.businessentities.OpenstackImageProviderProperties; +import org.ovirt.engine.core.common.businessentities.OpenStackImageProviderProperties; import org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties; import org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties.AgentConfiguration; import org.ovirt.engine.core.common.businessentities.Provider; @@ -42,8 +42,8 @@ agentConfiguration = networkProperties.getAgentConfiguration(); break; case OPENSTACK_IMAGE: - OpenstackImageProviderProperties imageProperties = - (OpenstackImageProviderProperties) entity.getAdditionalProperties(); + OpenStackImageProviderProperties imageProperties = + (OpenStackImageProviderProperties) entity.getAdditionalProperties(); tenantName = imageProperties.getTenantName(); break; default: @@ -124,7 +124,7 @@ .deserialize(rs.getString("agent_configuration"), AgentConfiguration.class)); return networkProperties; case OPENSTACK_IMAGE: - OpenstackImageProviderProperties imageProperties = new OpenstackImageProviderProperties(); + OpenStackImageProviderProperties imageProperties = new OpenStackImageProviderProperties(); imageProperties.setTenantName(rs.getString("tenant_name")); return imageProperties; default: diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml index a4126a3..9ec3567 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml @@ -44,7 +44,7 @@ <include name="common/businessentities/OpenstackNetworkProviderProperties.java" /> <include name="common/businessentities/OpenstackNetworkPluginType.java" /> <include name="common/businessentities/DiskAlignment.java" /> - <include name="common/businessentities/OpenstackImageProviderProperties.java" /> + <include name="common/businessentities/OpenStackImageProviderProperties.java" /> <!-- Network business entities --> <include name="common/businessentities/network/VdsNetworkInterface.java" /> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java index 64808ca..7ccbc96 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java @@ -4,7 +4,7 @@ import org.ovirt.engine.core.common.action.ProviderParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; -import org.ovirt.engine.core.common.businessentities.OpenstackImageProviderProperties; +import org.ovirt.engine.core.common.businessentities.OpenStackImageProviderProperties; import org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties; import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.ProviderType; @@ -248,7 +248,7 @@ properties.setAgentConfiguration(getNeutronAgentModel().flush()); provider.setAdditionalProperties(properties); } else if (isTypeOpenStackImage()) { - provider.setAdditionalProperties(new OpenstackImageProviderProperties()); + provider.setAdditionalProperties(new OpenStackImageProviderProperties()); } boolean authenticationRequired = (Boolean) requiresAuthentication.getEntity(); diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties index bdd7690..d5f99f3 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties @@ -172,4 +172,4 @@ ProviderType___OPENSTACK_NETWORK=OpenStack Network OpenstackNetworkPluginType___LINUX_BRIDGE=Linux Bridge OpenstackNetworkPluginType___OPEN_VSWITCH=Open vSwitch -ProviderType___OPENSTACK_IMAGE=Openstack Image +ProviderType___OPENSTACK_IMAGE=OpenStack Image -- To view, visit http://gerrit.ovirt.org/17344 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a8c92e7e2d5b78e64ba55bb9636e97d86c3a8f9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
