Moti Asayag has uploaded a new change for review.
Change subject: engine: Rename providerId to networkProviderId in add/update
host actions
......................................................................
engine: Rename providerId to networkProviderId in add/update host actions
The property is renamed due to a new provider which was added with the
same name for the sake of Foreman integration.
In addition, type was added to provider to clear few eclipse warnings.
Change-Id: I9cdaddbfd41223b9eb32b52ebfb9333709c0440d
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
5 files changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/29410/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
index 616206b..0ba879a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
@@ -85,7 +85,7 @@
addCanDoActionMessageVariable("server",
getParameters().getvds().getHostName());
}
- protected Provider<?> getHostProvider() {
+ private Provider<?> getHostProvider() {
return getProviderDao().get(getParameters().getProviderId());
}
@@ -170,7 +170,7 @@
installVdsParameters.setAuthMethod(getParameters().getAuthMethod());
installVdsParameters.setOverrideFirewall(getParameters().getOverrideFirewall());
installVdsParameters.setRebootAfterInstallation(getParameters().isRebootAfterInstallation());
-
installVdsParameters.setProviderId(getParameters().getProviderId());
+
installVdsParameters.setNetworkProviderId(getParameters().getNetworkProviderId());
installVdsParameters.setNetworkMappings(getParameters().getNetworkMappings());
Map<String, String> values = new HashMap<String, String>();
values.put(VdcObjectType.VDS.name().toLowerCase(),
getParameters().getvds().getName());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java
index bea1cfc..61e87b0 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java
@@ -95,8 +95,8 @@
installer.setManagementNetwork(NetworkUtils.getEngineNetwork());
}
- if (parameters.getProviderId() != null) {
- Provider<?> provider =
getDbFacade().getProviderDao().get(parameters.getProviderId());
+ if (parameters.getNetworkProviderId() != null) {
+ Provider<?> provider =
getDbFacade().getProviderDao().get(parameters.getNetworkProviderId());
if (provider.getType() == ProviderType.OPENSTACK_NETWORK) {
OpenstackNetworkProviderProperties agentProperties =
(OpenstackNetworkProviderProperties)
provider.getAdditionalProperties();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
index 21e766f..2edb7d9 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
@@ -146,7 +146,7 @@
tempVar.setoVirtIsoFile(getParameters().getoVirtIsoFile());
tempVar.setOverrideFirewall(getParameters().getOverrideFirewall());
tempVar.setRebootAfterInstallation(getParameters().isRebootAfterInstallation());
- tempVar.setProviderId(getParameters().getProviderId());
+
tempVar.setNetworkProviderId(getParameters().getNetworkProviderId());
tempVar.setNetworkMappings(getParameters().getNetworkMappings());
tempVar.setAuthMethod(getParameters().getAuthMethod());
ArrayList<VdcReturnValueBase> resultList =
runInternalMultipleActions(
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java
index 3ad8287..8eb5dc1 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java
@@ -26,7 +26,7 @@
private AuthenticationMethod authMethod;
- private Guid providerId;
+ private Guid networkProviderId;
private String networkMappings;
public enum AuthenticationMethod {
@@ -133,12 +133,12 @@
this.rebootAfterInstallation = rebootAfterInstallation;
}
- public Guid getProviderId() {
- return providerId;
+ public Guid getNetworkProviderId() {
+ return networkProviderId;
}
- public void setProviderId(Guid providerId) {
- this.providerId = providerId;
+ public void setNetworkProviderId(Guid networkProviderId) {
+ this.networkProviderId = networkProviderId;
}
public String getNetworkMappings() {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
index 817c7db..cf3c438 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
@@ -32,6 +32,7 @@
import org.ovirt.engine.core.common.businessentities.ExternalDiscoveredHost;
import org.ovirt.engine.core.common.businessentities.ExternalHostGroup;
import org.ovirt.engine.core.common.businessentities.FenceActionType;
+import org.ovirt.engine.core.common.businessentities.Permissions;
import org.ovirt.engine.core.common.businessentities.Provider;
import org.ovirt.engine.core.common.businessentities.RoleType;
import org.ovirt.engine.core.common.businessentities.StoragePool;
@@ -42,7 +43,6 @@
import org.ovirt.engine.core.common.businessentities.VDSType;
import org.ovirt.engine.core.common.businessentities.VdsProtocol;
import org.ovirt.engine.core.common.businessentities.VdsSpmStatus;
-import org.ovirt.engine.core.common.businessentities.Permissions;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.mode.ApplicationMode;
import org.ovirt.engine.core.common.queries.ConfigurationValues;
@@ -965,14 +965,14 @@
parameters.setRebootAfterInstallation(isVirt);
parameters.setAuthMethod(model.getAuthenticationMethod());
- Provider networkProvider =
model.getNetworkProviders().getSelectedItem();
+ Provider<?> networkProvider =
model.getNetworkProviders().getSelectedItem();
if (networkProvider != null) {
- parameters.setProviderId(networkProvider.getId());
+ parameters.setNetworkProviderId(networkProvider.getId());
parameters.setNetworkMappings(model.getInterfaceMappings().getEntity());
}
if (model.getIsProvisioning()) {
- Provider provider = (Provider)
model.getProviders().getSelectedItem();
+ Provider<?> provider = (Provider<?>)
model.getProviders().getSelectedItem();
ExternalHostGroup hostGroup = (ExternalHostGroup)
model.getExternalHostGroups().getSelectedItem();
ExternalComputeResource computeResource =
(ExternalComputeResource) model.getExternalComputeResource().getSelectedItem();
ExternalDiscoveredHost discoveredHost =
(ExternalDiscoveredHost)model.getExternalDiscoveredHosts().getSelectedItem();
@@ -1368,9 +1368,9 @@
param.setOverrideFirewall(model.getOverrideIpTables().getEntity());
param.setAuthMethod(model.getAuthenticationMethod());
- Provider networkProvider = (Provider)
model.getNetworkProviders().getSelectedItem();
+ Provider<?> networkProvider = (Provider<?>)
model.getNetworkProviders().getSelectedItem();
if (networkProvider != null) {
- param.setProviderId(networkProvider.getId());
+ param.setNetworkProviderId(networkProvider.getId());
param.setNetworkMappings((String)
model.getInterfaceMappings().getEntity());
}
@@ -1494,9 +1494,9 @@
param.setOverrideFirewall(model.getOverrideIpTables().getEntity());
param.setAuthMethod(model.getAuthenticationMethod());
- Provider networkProvider = (Provider)
model.getNetworkProviders().getSelectedItem();
+ Provider<?> networkProvider = (Provider<?>)
model.getNetworkProviders().getSelectedItem();
if (networkProvider != null) {
- param.setProviderId(networkProvider.getId());
+ param.setNetworkProviderId(networkProvider.getId());
param.setNetworkMappings((String)
model.getInterfaceMappings().getEntity());
}
--
To view, visit http://gerrit.ovirt.org/29410
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cdaddbfd41223b9eb32b52ebfb9333709c0440d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
