Lior Vernia has uploaded a new change for review. Change subject: engine: Added network provider parameters to UpdateVds ......................................................................
engine: Added network provider parameters to UpdateVds So that upon reinstallation a network provider could be specified. Since now AddVds, UpdateVds and InstallVds parameters needed the network provider parameters, moved the fields to their common ancestor. Change-Id: I0efdb7e4f76f44c06a4d14726b4f2016ada24bef Signed-off-by: Lior Vernia <[email protected]> --- 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/AddVdsActionParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InstallVdsParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java 4 files changed, 22 insertions(+), 36 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/17250/1 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 8999eb5..69f1391 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 @@ -136,6 +136,8 @@ tempVar.setoVirtIsoFile(getParameters().getoVirtIsoFile()); tempVar.setOverrideFirewall(getParameters().getOverrideFirewall()); tempVar.setRebootAfterInstallation(getParameters().isRebootAfterInstallation()); + tempVar.setProviderId(getParameters().getProviderId()); + tempVar.setNetworkMappings(getParameters().getNetworkMappings()); tempVar.setAuthMethod(getParameters().getAuthMethod()); ArrayList<VdcReturnValueBase> resultList = Backend.getInstance().runInternalMultipleActions( VdcActionType.InstallVds, diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java index 435a30a..3e95767 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java @@ -15,8 +15,6 @@ private boolean privateAddPending; private boolean glusterPeerProbeNeeded = true; - private Guid providerId; - private String networkMappings; public boolean getAddPending() { return privateAddPending; @@ -43,21 +41,5 @@ public boolean isGlusterPeerProbeNeeded() { return this.glusterPeerProbeNeeded; - } - - public Guid getProviderId() { - return providerId; - } - - public void setProvider(Guid provider) { - this.providerId = provider; - } - - public String getNetworkMappings() { - return networkMappings; - } - - public void setNetworkMappings(String networkMappings) { - this.networkMappings = networkMappings; } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InstallVdsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InstallVdsParameters.java index ba2b070..0d209e3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InstallVdsParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InstallVdsParameters.java @@ -8,8 +8,6 @@ private boolean reinstallOrUpgrade; private String oVirtIsoFile; - private Guid providerId; - private String networkMappings; public InstallVdsParameters() { } @@ -39,21 +37,5 @@ public void setoVirtIsoFile(String value) { oVirtIsoFile = value; - } - - public Guid getProviderId() { - return providerId; - } - - public void setProviderId(Guid providerId) { - this.providerId = providerId; - } - - public String getNetworkMappings() { - return networkMappings; - } - - public void setNetworkMappings(String networkMappings) { - this.networkMappings = networkMappings; } } 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 7f20c70..88fe937 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 @@ -7,6 +7,7 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VdsStatic; +import org.ovirt.engine.core.compat.Guid; public class VdsOperationActionParameters extends VdsActionParameters { private static final long serialVersionUID = 4156122527623908516L; @@ -24,6 +25,9 @@ private boolean rebootAfterInstallation = true; private AuthenticationMethod authMethod; + + private Guid providerId; + private String networkMappings; public enum AuthenticationMethod { Password(0), @@ -126,4 +130,20 @@ this.rebootAfterInstallation = rebootAfterInstallation; } + public Guid getProviderId() { + return providerId; + } + + public void setProviderId(Guid providerId) { + this.providerId = providerId; + } + + public String getNetworkMappings() { + return networkMappings; + } + + public void setNetworkMappings(String networkMappings) { + this.networkMappings = networkMappings; + } + } -- To view, visit http://gerrit.ovirt.org/17250 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0efdb7e4f76f44c06a4d14726b4f2016ada24bef Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
