Yaniv Bronhaim has uploaded a new change for review. Change subject: Due to commit a276f142 foreman id is not provided in vds static table ......................................................................
Due to commit a276f142 foreman id is not provided in vds static table By Changing the order of adding vdsStatic db we miss the update of setHostProviderId. This patch removes the duplication and use directly vdsStatic to update provider id. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1113003 Change-Id: I163311d3c3e7edc89a0ca77a94eed688528ad192 Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java 2 files changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/37113/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 fa5efbf..b11cbc7 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 @@ -90,7 +90,7 @@ } private Provider<?> getHostProvider() { - return getProviderDao().get(getParameters().getProviderId()); + return getProviderDao().get(getParameters().getVdsStaticData().getHostProviderId()); } @Override @@ -128,7 +128,6 @@ } HostProviderProxy proxy = ((HostProviderProxy) ProviderProxyFactory.getInstance().create(getHostProvider())); - getParameters().getvds().getStaticData().setHostProviderId(getParameters().getProviderId()); proxy.provisionHost( getParameters().getvds(), getParameters().getHostGroup(), 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 a3ad631..8314ebb 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 @@ -12,14 +12,13 @@ private boolean privateAddPending; private boolean glusterPeerProbeNeeded; private boolean privateAddProvisioned; - private Guid providerId; private ExternalHostGroup hostGroup; private String hostMac; private String discoverName; private ExternalComputeResource computeResource; private String discoverIp; public String getDiscoverIp() { return discoverIp; } - public Guid getProviderId() { return providerId; }; + private List<FenceAgent> fenceAgents; public ExternalHostGroup getHostGroup() { return hostGroup; }; public String getHostMac() { return hostMac; }; public String getDiscoverName() { return discoverName; }; @@ -40,7 +39,7 @@ privateAddProvisioned = true; hostMac = mac; hostGroup = hg; - providerId = pid; + getVdsStaticData().setHostProviderId(pid); discoverName = discover_name; computeResource = cr; discoverIp = discover_ip; -- To view, visit http://gerrit.ovirt.org/37113 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I163311d3c3e7edc89a0ca77a94eed688528ad192 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
