[Engine-patches] Change in ovirt-engine[master]: engine: Multiple gateways test failure fixed

[sabose]

Sahina Bose has uploaded a new change for review.

Change subject: engine: Multiple gateways test failure fixed
......................................................................

engine: Multiple gateways test failure fixed

Fixed failing junit tests
1)  at org.junit.Assert.assertFalse(Assert.java:79)
        at 
org.ovirt.engine.core.bll.SetupNetworksParametersTest.validateParameters(SetupNetworksParametersTest.java:37)

2) NPE in 
gatewayChanged(org.ovirt.engine.core.bll.network.host.SetupNetworksHelperTest)

Change-Id: Ie0f697a198b064dabc603f3ec438d5ea670b474e
Signed-off-by: Sahina Bose <sab...@redhat.com>
---
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
2 files changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/15434/1

diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
index e0e1d7a..5c852fa 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
@@ -30,7 +30,7 @@
         params.setInterfaces(Arrays.asList(nic));
 
         nic.setNetworkName("otherThenMgmtNetwork");
-        nic.setGateway("1.1.1.1");
+        nic.setGateway("1.1.1");
 
         Validator validator = ValidationUtils.getValidator();
 
diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
index 61911ec..9c70377 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
@@ -30,6 +30,7 @@
 import org.ovirt.engine.core.common.config.ConfigValues;
 import org.ovirt.engine.core.common.errors.VdcBllMessages;
 import org.ovirt.engine.core.compat.Guid;
+import org.ovirt.engine.core.compat.Version;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 import org.ovirt.engine.core.dao.VdsDAO;
 import org.ovirt.engine.core.dao.network.InterfaceDao;
@@ -45,7 +46,8 @@
 
     @Rule
     public static MockConfigRule mcr = new 
MockConfigRule(mockConfig(ConfigValues.ManagementNetwork,
-            MANAGEMENT_NETWORK_NAME));
+            MANAGEMENT_NETWORK_NAME),
+            mockConfig(ConfigValues.MultipleGatewaysSupported, "3.3", true));
 
     @Mock
     private NetworkDao networkDAO;
@@ -1477,6 +1479,7 @@
     private SetupNetworksHelper createHelper(SetupNetworksParameters params) {
         VDS vds = mock(VDS.class);
         when(vds.getId()).thenReturn(Guid.Empty);
+        when(vds.getVdsGroupCompatibilityVersion()).thenReturn(Version.v3_3);
         return createHelper(params, vds);
     }
 


--
To view, visit http://gerrit.ovirt.org/15434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0f697a198b064dabc603f3ec438d5ea670b474e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sahina Bose <sab...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches