Moti Asayag has uploaded a new change for review. Change subject: engine: Remove support for LinuxBridge plugin ......................................................................
engine: Remove support for LinuxBridge plugin The Linux Bridge plug-in is deprecated in the Havana release, and will be removed in the Icehouse release. Therefore the engine should not support it. Therefore it should be removed from the ovirt-integration as well. Change-Id: Iaa05188a5cba9987754058b2492329a6134e52e4 Bug-Url: https://bugzilla.redhat.com/1102018 Signed-off-by: Moti Asayag <masa...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronPluginTranslator.java 2 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/28790/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java index c8a7a7f..ff11e8d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java @@ -21,10 +21,10 @@ /** * Convenience method to know if the plugin represented is Linux Bridge. * - * @return <code>true</code> iff the plugin type represents a Linux Bridge plugin. + * @return <code>false</code> the Linux Bridge plugin is deprecated and replaced by ml2. */ public final boolean isLinuxBridge() { - return OpenstackNetworkPluginType.LINUX_BRIDGE.name().equals(getPluginType()); + return false; } /** diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronPluginTranslator.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronPluginTranslator.java index 1baa30d..34c9960 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronPluginTranslator.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronPluginTranslator.java @@ -18,7 +18,7 @@ static { pluginForDisplay = new HashMap<String, OpenstackNetworkPluginType>(); displayStrings = new ArrayList<String>(); - for (OpenstackNetworkPluginType plugin : OpenstackNetworkPluginType.values()) { + for (OpenstackNetworkPluginType plugin : getOpenstackNetworkPlugins()) { String displayString = EnumTranslator.createAndTranslate(plugin); pluginForDisplay.put(displayString.toLowerCase(), plugin); displayStrings.add(displayString); @@ -26,6 +26,10 @@ Collections.sort(displayStrings, new LexoNumericComparator()); } + private static OpenstackNetworkPluginType[] getOpenstackNetworkPlugins() { + return new OpenstackNetworkPluginType[] { OpenstackNetworkPluginType.OPEN_VSWITCH }; + } + public static List<String> getPresetDisplayStrings() { return displayStrings; } -- To view, visit http://gerrit.ovirt.org/28790 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa05188a5cba9987754058b2492329a6134e52e4 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
