diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java
index b520b17..277e58e 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java
@@ -279,7 +279,8 @@
         }
 
         if (addOrRemove) {
-            Map<String, String> options = ImmutableMap.of(DPDK_DEVARGS, dpdkInterface.pciAddress());
+            Map<String, String> options =
+                    ImmutableMap.of(DPDK_DEVARGS, dpdkInterface.pciAddress());
 
             OvsdbInterface.Builder builder = OvsdbInterface.builder()
                     .name(dpdkInterface.intf())
@@ -302,7 +303,8 @@
      * @param openstackNode      device identifier
      * @return the hostname of selected gateway node
      */
-    public static String getGwByComputeNode(Set<OpenstackNode> gws, OpenstackNode openstackNode) {
+    public static String getGwByComputeNode(Set<OpenstackNode> gws,
+                                            OpenstackNode openstackNode) {
         int numOfGw = gws.size();
 
         if (numOfGw == 0) {
