ONOS commit d9df7bd278935c3d72ac6eeb0ff44efe1edde567

Change-Id: I319f3a3765db55034b894238fb9391eee56c6dd4
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>

3 files changed, 63 insertions, 63 deletions

diff --git a/framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java b/framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
index 32403421..a498b3f4 100644
--- a/framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
+++ b/framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
@@ -61,7 +61,7 @@ public final class BasicDeviceOperator implements ConfigOperator {
         }
 
         SparseAnnotations sa = combine(bdc, descr.annotations());
-        return new DefaultDeviceDescription(descr.deviceURI(), type, descr.manufacturer(),
+        return new DefaultDeviceDescription(descr.deviceUri(), type, descr.manufacturer(),
                                             descr.hwVersion(), descr.swVersion(),
                                             descr.serialNumber(), descr.chassisId(), sa);
     }
diff --git a/framework/src/onos/core/net/src/main/java/org/onosproject/net/statistic/impl/FlowStatisticManager.java b/framework/src/onos/core/net/src/main/java/org/onosproject/net/statistic/impl/FlowStatisticManager.java
index 6515ef31..f18c56dc 100644
--- a/framework/src/onos/core/net/src/main/java/org/onosproject/net/statistic/impl/FlowStatisticManager.java
+++ b/framework/src/onos/core/net/src/main/java/org/onosproject/net/statistic/impl/FlowStatisticManager.java
@@ -255,7 +255,7 @@ public class FlowStatisticManager implements FlowStatisticService {
                                                              Instruction.Type instType) {

         checkPermission(STATISTIC_READ);

 

-        List<TypedFlowEntryWithLoad> retTFEL = new ArrayList<>();

+        List<TypedFlowEntryWithLoad> retTfel = new ArrayList<>();

 

         Set<FlowEntry> currentStats;

         Set<FlowEntry> previousStats;

@@ -264,11 +264,11 @@ public class FlowStatisticManager implements FlowStatisticService {
         synchronized (flowStatisticStore) {

             currentStats = flowStatisticStore.getCurrentFlowStatistic(cp);

             if (currentStats == null) {

-                return retTFEL;

+                return retTfel;

             }

             previousStats = flowStatisticStore.getPreviousFlowStatistic(cp);

             if (previousStats == null) {

-                return retTFEL;

+                return retTfel;

             }

             // copy to local flow entry set

             typedStatistics = new TypedStatistics(currentStats, previousStats);

@@ -291,7 +291,7 @@ public class FlowStatisticManager implements FlowStatisticService {
             List<TypedFlowEntryWithLoad> fel = typedFlowEntryLoadByInstInternal(cp, currentMap, previousMap,

                     isAllInstType, instType, TypedFlowEntryWithLoad.shortPollInterval());

             if (fel.size() > 0) {

-                retTFEL.addAll(fel);

+                retTfel.addAll(fel);

             }

         }

 

@@ -302,7 +302,7 @@ public class FlowStatisticManager implements FlowStatisticService {
             List<TypedFlowEntryWithLoad> fel = typedFlowEntryLoadByInstInternal(cp, currentMap, previousMap,

                     isAllInstType, instType, TypedFlowEntryWithLoad.shortPollInterval());

             if (fel.size() > 0) {

-                retTFEL.addAll(fel);

+                retTfel.addAll(fel);

             }

         }

 

@@ -313,7 +313,7 @@ public class FlowStatisticManager implements FlowStatisticService {
             List<TypedFlowEntryWithLoad> fel = typedFlowEntryLoadByInstInternal(cp, currentMap, previousMap,

                     isAllInstType, instType, TypedFlowEntryWithLoad.midPollInterval());

             if (fel.size() > 0) {

-                retTFEL.addAll(fel);

+                retTfel.addAll(fel);

             }

         }

 

@@ -324,7 +324,7 @@ public class FlowStatisticManager implements FlowStatisticService {
             List<TypedFlowEntryWithLoad> fel = typedFlowEntryLoadByInstInternal(cp, currentMap, previousMap,

                     isAllInstType, instType, TypedFlowEntryWithLoad.longPollInterval());

             if (fel.size() > 0) {

-                retTFEL.addAll(fel);

+                retTfel.addAll(fel);

             }

         }

 

@@ -335,11 +335,11 @@ public class FlowStatisticManager implements FlowStatisticService {
             List<TypedFlowEntryWithLoad> fel = typedFlowEntryLoadByInstInternal(cp, currentMap, previousMap,

                     isAllInstType, instType, TypedFlowEntryWithLoad.avgPollInterval());

             if (fel.size() > 0) {

-                retTFEL.addAll(fel);

+                retTfel.addAll(fel);

             }

         }

 

-        return retTFEL;

+        return retTfel;

     }

 

     private List<TypedFlowEntryWithLoad> typedFlowEntryLoadByInstInternal(ConnectPoint cp,

diff --git a/framework/src/onos/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java b/framework/src/onos/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
index ee9dc8fb..70fdb406 100644
--- a/framework/src/onos/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
+++ b/framework/src/onos/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
@@ -495,15 +495,15 @@ public class ProxyArpManagerTest {
         replay(hostService);
         replay(interfaceService);
 
-        Ethernet ndpRequest = buildNDP(ICMP6.NEIGHBOR_SOLICITATION,
-                                       MAC4, SOLICITED_MAC3,
-                                       IP4, IP3);
+        Ethernet ndpRequest = buildNdp(ICMP6.NEIGHBOR_SOLICITATION,
+                MAC4, SOLICITED_MAC3,
+                IP4, IP3);
 
         proxyArp.reply(ndpRequest, getLocation(5));
 
         assertEquals(1, packetService.packets.size());
-        Ethernet ndpReply = buildNDP(ICMP6.NEIGHBOR_ADVERTISEMENT,
-                                     MAC3, MAC4, IP3, IP4);
+        Ethernet ndpReply = buildNdp(ICMP6.NEIGHBOR_ADVERTISEMENT,
+                MAC3, MAC4, IP3, IP4);
         verifyPacketOut(ndpReply, getLocation(5), packetService.packets.get(0));
     }
 
@@ -556,9 +556,9 @@ public class ProxyArpManagerTest {
         replay(hostService);
         replay(interfaceService);
 
-        Ethernet ndpRequest = buildNDP(ICMP6.NEIGHBOR_SOLICITATION,
-                                       MAC4, SOLICITED_MAC3,
-                                       IP4, IP3);
+        Ethernet ndpRequest = buildNdp(ICMP6.NEIGHBOR_SOLICITATION,
+                MAC4, SOLICITED_MAC3,
+                IP4, IP3);
 
         proxyArp.reply(ndpRequest, getLocation(NUM_DEVICES));
 
@@ -686,9 +686,9 @@ public class ProxyArpManagerTest {
         replay(hostService);
         replay(interfaceService);
 
-        Ethernet ndpRequest = buildNDP(ICMP6.NEIGHBOR_SOLICITATION,
-                                       MAC4, SOLICITED_MAC3,
-                                       IP4, IP3);
+        Ethernet ndpRequest = buildNdp(ICMP6.NEIGHBOR_SOLICITATION,
+                MAC4, SOLICITED_MAC3,
+                IP4, IP3);
 
         proxyArp.reply(ndpRequest, getLocation(NUM_DEVICES));
 
@@ -752,37 +752,37 @@ public class ProxyArpManagerTest {
         replay(hostService);
         replay(interfaceService);
 
-        Ethernet ndpRequest = buildNDP(ICMP6.NEIGHBOR_SOLICITATION,
-                                       MAC2,
-                                       MacAddress.valueOf("33:33:ff:00:00:01"),
-                                       theirIp,
-                                       ourFirstIp);
+        Ethernet ndpRequest = buildNdp(ICMP6.NEIGHBOR_SOLICITATION,
+                MAC2,
+                MacAddress.valueOf("33:33:ff:00:00:01"),
+                theirIp,
+                ourFirstIp);
 
         proxyArp.reply(ndpRequest, LOC1);
         assertEquals(1, packetService.packets.size());
 
-        Ethernet ndpReply = buildNDP(ICMP6.NEIGHBOR_ADVERTISEMENT,
-                                     firstMac,
-                                     MAC2,
-                                     ourFirstIp,
-                                     theirIp);
+        Ethernet ndpReply = buildNdp(ICMP6.NEIGHBOR_ADVERTISEMENT,
+                firstMac,
+                MAC2,
+                ourFirstIp,
+                theirIp);
         verifyPacketOut(ndpReply, LOC1, packetService.packets.get(0));
 
         // Test a request for the second address on that port
         packetService.packets.clear();
-        ndpRequest = buildNDP(ICMP6.NEIGHBOR_SOLICITATION,
-                              MAC2,
-                              MacAddress.valueOf("33:33:ff:00:00:01"),
-                              theirIp,
-                              ourSecondIp);
+        ndpRequest = buildNdp(ICMP6.NEIGHBOR_SOLICITATION,
+                MAC2,
+                MacAddress.valueOf("33:33:ff:00:00:01"),
+                theirIp,
+                ourSecondIp);
         proxyArp.reply(ndpRequest, LOC1);
         assertEquals(1, packetService.packets.size());
 
-        ndpReply = buildNDP(ICMP6.NEIGHBOR_ADVERTISEMENT,
-                                     secondMac,
-                                     MAC2,
-                                     ourSecondIp,
-                                     theirIp);
+        ndpReply = buildNdp(ICMP6.NEIGHBOR_ADVERTISEMENT,
+                secondMac,
+                MAC2,
+                ourSecondIp,
+                theirIp);
         verifyPacketOut(ndpReply, LOC1, packetService.packets.get(0));
     }
 
@@ -819,21 +819,21 @@ public class ProxyArpManagerTest {
 
         Ip6Address theirIp = Ip6Address.valueOf("1000::ffff");
 
-        Ethernet ndpRequest = buildNDP(ICMP6.NEIGHBOR_SOLICITATION,
-                              MAC1,
-                              MacAddress.valueOf("33:33:ff:00:00:01"),
-                              theirIp,
-                              Ip6Address.valueOf("3000::1"));
+        Ethernet ndpRequest = buildNdp(ICMP6.NEIGHBOR_SOLICITATION,
+                MAC1,
+                MacAddress.valueOf("33:33:ff:00:00:01"),
+                theirIp,
+                Ip6Address.valueOf("3000::1"));
         proxyArp.reply(ndpRequest, LOC1);
         assertEquals(0, packetService.packets.size());
 
         // Request for a valid internal IP address but coming in an external port
         packetService.packets.clear();
-        ndpRequest = buildNDP(ICMP6.NEIGHBOR_SOLICITATION,
-                              MAC1,
-                              MacAddress.valueOf("33:33:ff:00:00:01"),
-                              theirIp,
-                              IP3);
+        ndpRequest = buildNdp(ICMP6.NEIGHBOR_SOLICITATION,
+                MAC1,
+                MacAddress.valueOf("33:33:ff:00:00:01"),
+                theirIp,
+                IP3);
         proxyArp.reply(ndpRequest, LOC1);
         assertEquals(0, packetService.packets.size());
     }
@@ -894,11 +894,11 @@ public class ProxyArpManagerTest {
 
         // This is a request from something inside our network (like a BGP
         // daemon) to an external host.
-        Ethernet ndpRequest = buildNDP(ICMP6.NEIGHBOR_SOLICITATION,
-                                       ourMac,
-                                       MacAddress.valueOf("33:33:ff:00:00:01"),
-                                       ourIp,
-                                       theirIp);
+        Ethernet ndpRequest = buildNdp(ICMP6.NEIGHBOR_SOLICITATION,
+                ourMac,
+                MacAddress.valueOf("33:33:ff:00:00:01"),
+                ourIp,
+                theirIp);
 
         proxyArp.reply(ndpRequest, getLocation(5));
         assertEquals(1, packetService.packets.size());
@@ -954,9 +954,9 @@ public class ProxyArpManagerTest {
         replay(hostService);
         replay(interfaceService);
 
-        Ethernet ndpRequest = buildNDP(ICMP6.NEIGHBOR_SOLICITATION,
-                                       MAC4, SOLICITED_MAC3,
-                                       IP4, IP3);
+        Ethernet ndpRequest = buildNdp(ICMP6.NEIGHBOR_SOLICITATION,
+                MAC4, SOLICITED_MAC3,
+                IP4, IP3);
 
         proxyArp.forward(ndpRequest, LOC2);
 
@@ -995,9 +995,9 @@ public class ProxyArpManagerTest {
         replay(hostService);
         replay(interfaceService);
 
-        Ethernet ndpRequest = buildNDP(ICMP6.NEIGHBOR_SOLICITATION,
-                                       MAC4, SOLICITED_MAC3,
-                                       IP4, IP3);
+        Ethernet ndpRequest = buildNdp(ICMP6.NEIGHBOR_SOLICITATION,
+                MAC4, SOLICITED_MAC3,
+                IP4, IP3);
 
         proxyArp.forward(ndpRequest, getLocation(NUM_DEVICES));
 
@@ -1113,7 +1113,7 @@ public class ProxyArpManagerTest {
      * @param dstIp  destination IP address
      * @return the NDP packet
      */
-    private Ethernet buildNDP(byte type, MacAddress srcMac, MacAddress dstMac,
+    private Ethernet buildNdp(byte type, MacAddress srcMac, MacAddress dstMac,
                               Ip6Address srcIp, Ip6Address dstIp) {
         assertThat(type, anyOf(
                 is(ICMP6.NEIGHBOR_SOLICITATION),