Moti Asayag has uploaded a new change for review. Change subject: engine: Provide informative message if cannot configure network ......................................................................
engine: Provide informative message if cannot configure network In case the network cannot be configured on the host by host deploy, a specific message can be provided for each reason. Change-Id: Ieba631be43f5b74ac62d5ab0e5325e70d85376c6 Signed-off-by: Moti Asayag <masa...@redhat.com> --- A \ M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java 2 files changed, 31 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/28260/1 diff --git "a/\\" "b/\\" new file mode 100644 index 0000000..ebe1027 --- /dev/null +++ "b/\\" @@ -0,0 +1,16 @@ +engine: Use updated qpid rpc_backend implementation + +The patch fixes the deprecated rpc_backend fqdn for +qpid. + +Bug-Url: https://bugzilla.redhat.com/1101180 +Signed-off-by: Moti Asayag <masa...@redhat.com> + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# On branch qos_profile_refactor +# Changes to be committed: +# (use "git reset HEAD <file>..." to unstage) +# +# modified: backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java +# diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java index c843bb6..1e3fb90 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java @@ -52,9 +52,19 @@ public void createManagementNetworkIfRequired() { final String managementNetwork = NetworkUtils.getEngineNetwork(); - if (host == null - || managementNetwork.equals(host.getActiveNic()) - || !FeatureSupported.setupManagementNetwork(host.getVdsGroupCompatibilityVersion())) { + if (host == null) { + return; + } + + if (managementNetwork.equals(host.getActiveNic())) { + log.infoFormat("The management network {0} is already configured on host {1}", + managementNetwork, + host.getName()); + return; + } + + if (!FeatureSupported.setupManagementNetwork(host.getVdsGroupCompatibilityVersion())) { + log.warnFormat("Host {0}'s cluster does not support normalize management network feature", host.getName()); return; } @@ -250,8 +260,9 @@ return DbFacade.getInstance(); } - @SuppressWarnings("serial") public static class NetworkConfiguratorException extends RuntimeException { + private static final long serialVersionUID = 3526212482581207006L; + public NetworkConfiguratorException(String message) { super(message); } -- To view, visit http://gerrit.ovirt.org/28260 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieba631be43f5b74ac62d5ab0e5325e70d85376c6 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
