mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-28 14:51:37 +01:00
Code Issues Projects Releases Wiki Activity

Cosmetic fixes around constant names

Browse Source 
Change-Id: I84c6c6a28d37faba689ba6665a5bee02b89bc731
This commit is contained in:
Yuta HIGUCHI 2017-04-25 15:30:23 -07:00 committed by Andrea Campanella
parent 424bfa7f79
commit ed5b14d71d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,13 +122,13 @@ public class NetconfDeviceProviderTest {
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 @@ public class NetconfDeviceProviderTest {
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 @@ public class NetconfDeviceProviderTest {
@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));