commit ed5b14d71d76ae5cbbba85eb9459eba93dcf4e51
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Apr 25 15:30:23 2017 -0700
committer Andrea Campanella <andrea@onlab.us> Wed Apr 26 07:20:42 2017 +0000
tree 6d491b2a89f038f0e1419273712c338be08a6145
parent 424bfa7f79ddd7c3721a2f5f579d8c0e82647acb

Cosmetic fixes around constant names

Change-Id: I84c6c6a28d37faba689ba6665a5bee02b89bc731

providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java

diff --git a/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java b/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java
index 6ebaef9..da0a8cc 100644
--- a/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java
+++ b/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java
@@ -122,13 +122,13 @@
     private final NetconfProviderConfig netconfProviderConfig = new MockNetconfProviderConfig();
     private static final String NETCONF_DEVICE_ID_STRING = "netconf:1.1.1.1:830";
     private static final String NETCONF_DEVICE_ID_STRING_OLD = "netconf:1.1.1.2:1";
-    private static final String NETCONF_DEVICE_ID_STRING_IPv6 = "netconf:2001:0db8:0000:0000:0000:ff00:0042:8329:830";
+    private static final String NETCONF_DEVICE_ID_STRING_IPV6 = "netconf:2001:0db8:0000:0000:0000:ff00:0042:8329:830";
     private static final String IP_STRING = "1.1.1.1";
     private static final String IP_STRING_OLD = "1.1.1.2";
-    private static final String IP_STRING_IPv6 = "2001:0db8:0000:0000:0000:ff00:0042:8329";
+    private static final String IP_STRING_IPV6 = "2001:0db8:0000:0000:0000:ff00:0042:8329";
     private static final IpAddress IP = IpAddress.valueOf(IP_STRING);
     private static final IpAddress IP_OLD = IpAddress.valueOf(IP_STRING_OLD);
-    private static final IpAddress IP_v6 = IpAddress.valueOf(IP_STRING_IPv6);
+    private static final IpAddress IP_V6 = IpAddress.valueOf(IP_STRING_IPV6);
     private static final int PORT = 830;
     private static final String TEST = "test";
     private static final int DELAY_DISCOVERY = 500;
@@ -174,7 +174,7 @@
         available = false;
         firstRequest = true;
         DeviceId subject = DeviceId.deviceId(NETCONF_DEVICE_ID_STRING);
-        DeviceId subjectIpv6 = DeviceId.deviceId(NETCONF_DEVICE_ID_STRING_IPv6);
+        DeviceId subjectIpv6 = DeviceId.deviceId(NETCONF_DEVICE_ID_STRING_IPV6);
         String key = "netconf";
         ObjectMapper mapper = new ObjectMapper();
         JsonNode jsonNode = mapper.readTree(jsonStream);
@@ -234,7 +234,7 @@
     @Test
     public void configurationDeviceIdIpv6() {
         assertTrue("Configuration should be valid", netconfDeviceConfigEmptyIpv6.isValid());
-        assertThat(netconfDeviceConfigEmptyIpv6.ip(), is(IP_v6));
+        assertThat(netconfDeviceConfigEmptyIpv6.ip(), is(IP_V6));
         assertThat(netconfDeviceConfigEmptyIpv6.port(), is(PORT));
         assertThat(netconfDeviceConfigEmptyIpv6.username(), is(StringUtils.EMPTY));
         assertThat(netconfDeviceConfigEmptyIpv6.password(), is(StringUtils.EMPTY));