From: Sam Hague <shague@redhat.com>
Date: Fri, 26 Aug 2016 20:42:40 +0000 (-0400)
Subject: fix checkstyle for NetvirtIT
X-Git-Tag: release/carbon~834^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=85fa1f58485d4071602996e5de19380b0579ae51;p=netvirt.git

fix checkstyle for NetvirtIT

Change-Id: I51517f242d063ab2b68be692a96cf7c7b24bfec8
Signed-off-by: Sam Hague <shague@redhat.com>
---

diff --git a/vpnservice/it/impl/src/test/java/org/opendaylight/netvirt/it/NetvirtIT.java b/vpnservice/it/impl/src/test/java/org/opendaylight/netvirt/it/NetvirtIT.java
index d9fb29fec3..dafafe21d1 100644
--- a/vpnservice/it/impl/src/test/java/org/opendaylight/netvirt/it/NetvirtIT.java
+++ b/vpnservice/it/impl/src/test/java/org/opendaylight/netvirt/it/NetvirtIT.java
@@ -161,7 +161,8 @@ public class NetvirtIT extends AbstractMdsalTestBase {
                 super.getLoggingOption());
                 // TODO trying to get console logged to karaf.log, but doesn't work.
                 // wondering if the test stops and the log isn't flushed?
-                //,editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j.rootLogger", "INFO, async, stdout, osgi:*"));
+                //editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
+                //        "log4j.rootLogger", "INFO, async, stdout, osgi:*"));
     }
 
     @Before
@@ -286,9 +287,9 @@ public class NetvirtIT extends AbstractMdsalTestBase {
         }
     }
 
-    private final String NETWORK1_NAME = "net1";
-    private final String NETWORK1_SEGID = "101";
-    private final String NETWORK1_IPPFX = "10.1.1.";
+    private static final String NETWORK1_NAME = "net1";
+    private static final String NETWORK1_SEGID = "101";
+    private static final String NETWORK1_IPPFX = "10.1.1.";
 
     /**
      * Test a basic neutron use case. This test constructs a Neutron network, subnet, and two "vm" ports
diff --git a/vpnservice/it/impl/src/test/java/org/opendaylight/netvirt/it/NeutronNetwork.java b/vpnservice/it/impl/src/test/java/org/opendaylight/netvirt/it/NeutronNetwork.java
index 9f2c6c69c8..ecd26b4413 100644
--- a/vpnservice/it/impl/src/test/java/org/opendaylight/netvirt/it/NeutronNetwork.java
+++ b/vpnservice/it/impl/src/test/java/org/opendaylight/netvirt/it/NeutronNetwork.java
@@ -48,6 +48,7 @@ public class NeutronNetwork {
     String getNetworkId() {
         return networkId;
     }
+
     String getSubnetId() {
         return subnetId;
     }