[Engine-patches] Change in ovirt-engine[master]: webadmin: allowing prefix as mask staticIP conf in HostSetup...

[mmucha]

Martin Mucha has uploaded a new change for review.

Change subject: webadmin: allowing prefix as mask staticIP conf in 
HostSetupNetworksVDSCommand
......................................................................

webadmin: allowing prefix as mask staticIP conf in HostSetupNetworksVDSCommand

Change-Id: If9ff4b9f5eda9d3c8127ac19bf24b4b35317e86b
Signed-off-by: Martin Mucha <mmu...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostSetupNetworksVDSCommand.java
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/39861/1

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostSetupNetworksVDSCommand.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostSetupNetworksVDSCommand.java
index 34beb87..28b1a99 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostSetupNetworksVDSCommand.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostSetupNetworksVDSCommand.java
@@ -7,6 +7,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.common.businessentities.network.Bond;
 import org.ovirt.engine.core.common.businessentities.network.NetworkQoS;
+import org.ovirt.engine.core.common.validation.MaskValidator;
 import org.ovirt.engine.core.common.vdscommands.HostNetwork;
 import 
org.ovirt.engine.core.common.vdscommands.HostSetupNetworksVdsCommandParameters;
 import org.ovirt.engine.core.utils.NetworkUtils;
@@ -92,7 +93,7 @@
             break;
         case STATIC_IP:
             putIfNotEmpty(opts, "ipaddr", attachment.getAddress());
-            putIfNotEmpty(opts, "netmask", attachment.getNetmask());
+            putPrefixOrNetmaskIfNotEmpty(opts, attachment.getNetmask());
             putIfNotEmpty(opts, "gateway", attachment.getGateway());
             break;
         default:
@@ -100,6 +101,14 @@
         }
     }
 
+    private void putPrefixOrNetmaskIfNotEmpty(Map<String, Object> opts, String 
netmask) {
+        if (MaskValidator.getInstance().isPrefixValid(netmask)) {
+            putIfNotEmpty(opts, "prefix", netmask.replace("/", ""));
+        } else {
+            putIfNotEmpty(opts, "netmask", netmask);
+        }
+    }
+
     private Map<String, Object> generateBonds() {
         Map<String, Object> bonds = new HashMap<>();
 


-- 
To view, visit https://gerrit.ovirt.org/39861
To unsubscribe, visit https://gerrit.ovirt.org/settings

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