From b311c7e06cd1ebff9d1035f8593cbd6eb345e028 Mon Sep 17 00:00:00 2001
From: Jian Li <pyguni@gmail.com>
Date: Tue, 15 May 2018 13:47:19 +0900
Subject: [PATCH] Fix: assign correct subnet CIDR as a DHCP router option

Change-Id: Ib79b4d5f2396f0295f28ede7db00cf68c84e2a51
---
 .../openstacknetworking/impl/OpenstackSwitchingDhcpHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingDhcpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingDhcpHandler.java
index a769759a17..65afbf856a 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingDhcpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingDhcpHandler.java
@@ -401,7 +401,7 @@ public class OpenstackSwitchingDhcpHandler {
             option = new DhcpOption();
             option.setCode(OptionCode_RouterAddress.getValue());
             option.setLength((byte) 4);
-            option.setData(gatewayIp.toOctets());
+            option.setData(Ip4Address.valueOf(osSubnet.getGateway()).toOctets());
             options.add(option);
 
             // end option