From b65d7844e2cfa70cb33cc5698d72e061fac659bd Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Thu, 3 Aug 2017 16:28:24 -0700 Subject: [PATCH] ONOS-6887 Move neighbour classes from incubator to core Change-Id: I5fa70253b833838566a3527d8938e04be4274210 --- .../onosproject/proxyarp/DefaultProxyArp.java | 4 ++-- .../impl/BgpSpeakerNeighbourHandler.java | 6 ++--- .../segmentrouting/ArpHandler.java | 4 ++-- .../segmentrouting/IcmpHandler.java | 4 ++-- .../segmentrouting/SegmentRoutingManager.java | 2 +- .../SegmentRoutingNeighbourDispatcher.java | 4 ++-- .../SegmentRoutingNeighbourHandler.java | 2 +- .../vpls/VplsNeighbourHandler.java | 6 ++--- .../vpls/VplsNeighbourHandlerTest.java | 12 +++++----- .../cli/net/NeighbourHandlersListCommand.java | 2 +- .../DefaultNeighbourMessageHandler.java | 2 +- .../NeighbourHandlerRegistration.java | 2 +- .../neighbour/NeighbourMessageActions.java | 2 +- .../neighbour/NeighbourMessageContext.java | 2 +- .../neighbour/NeighbourMessageHandler.java | 2 +- .../net/neighbour/NeighbourMessageType.java | 2 +- .../net/neighbour/NeighbourProtocol.java | 2 +- .../neighbour/NeighbourResolutionService.java | 2 +- .../net/neighbour/package-info.java | 2 +- .../impl/DefaultNeighbourMessageActions.java | 6 ++--- .../impl/DefaultNeighbourMessageContext.java | 19 ++++++++-------- .../impl/NeighbourResolutionManager.java | 12 +++++----- .../net/neighbour/impl/package-info.java | 2 +- .../DefaultNeighbourMessageActionsTest.java | 18 +++++++-------- .../impl/NeighbourResolutionManagerTest.java | 22 +++++++++---------- .../neighbour/impl/NeighbourTestUtils.java | 2 +- docs/internal-incubator | 1 - 27 files changed, 71 insertions(+), 75 deletions(-) rename {incubator/api/src/main/java/org/onosproject/incubator => core/api/src/main/java/org/onosproject}/net/neighbour/DefaultNeighbourMessageHandler.java (97%) rename {incubator/api/src/main/java/org/onosproject/incubator => core/api/src/main/java/org/onosproject}/net/neighbour/NeighbourHandlerRegistration.java (96%) rename {incubator/api/src/main/java/org/onosproject/incubator => core/api/src/main/java/org/onosproject}/net/neighbour/NeighbourMessageActions.java (97%) rename {incubator/api/src/main/java/org/onosproject/incubator => core/api/src/main/java/org/onosproject}/net/neighbour/NeighbourMessageContext.java (98%) rename {incubator/api/src/main/java/org/onosproject/incubator => core/api/src/main/java/org/onosproject}/net/neighbour/NeighbourMessageHandler.java (96%) rename {incubator/api/src/main/java/org/onosproject/incubator => core/api/src/main/java/org/onosproject}/net/neighbour/NeighbourMessageType.java (94%) rename {incubator/api/src/main/java/org/onosproject/incubator => core/api/src/main/java/org/onosproject}/net/neighbour/NeighbourProtocol.java (94%) rename {incubator/api/src/main/java/org/onosproject/incubator => core/api/src/main/java/org/onosproject}/net/neighbour/NeighbourResolutionService.java (98%) rename {incubator/api/src/main/java/org/onosproject/incubator => core/api/src/main/java/org/onosproject}/net/neighbour/package-info.java (93%) rename {incubator/net/src/main/java/org/onosproject/incubator => core/net/src/main/java/org/onosproject}/net/neighbour/impl/DefaultNeighbourMessageActions.java (96%) rename {incubator/net/src/main/java/org/onosproject/incubator => core/net/src/main/java/org/onosproject}/net/neighbour/impl/DefaultNeighbourMessageContext.java (95%) rename {incubator/net/src/main/java/org/onosproject/incubator => core/net/src/main/java/org/onosproject}/net/neighbour/impl/NeighbourResolutionManager.java (97%) rename {incubator/net/src/main/java/org/onosproject/incubator => core/net/src/main/java/org/onosproject}/net/neighbour/impl/package-info.java (92%) rename {incubator/net/src/test/java/org/onosproject/incubator => core/net/src/test/java/org/onosproject}/net/neighbour/impl/DefaultNeighbourMessageActionsTest.java (88%) rename {incubator/net/src/test/java/org/onosproject/incubator => core/net/src/test/java/org/onosproject}/net/neighbour/impl/NeighbourResolutionManagerTest.java (95%) rename {incubator/net/src/test/java/org/onosproject/incubator => core/net/src/test/java/org/onosproject}/net/neighbour/impl/NeighbourTestUtils.java (98%) diff --git a/apps/proxyarp/src/main/java/org/onosproject/proxyarp/DefaultProxyArp.java b/apps/proxyarp/src/main/java/org/onosproject/proxyarp/DefaultProxyArp.java index ba74c0f597..d8095bb98f 100644 --- a/apps/proxyarp/src/main/java/org/onosproject/proxyarp/DefaultProxyArp.java +++ b/apps/proxyarp/src/main/java/org/onosproject/proxyarp/DefaultProxyArp.java @@ -23,8 +23,8 @@ import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.ReferenceCardinality; import org.onosproject.core.ApplicationId; import org.onosproject.core.CoreService; -import org.onosproject.incubator.net.neighbour.DefaultNeighbourMessageHandler; -import org.onosproject.incubator.net.neighbour.NeighbourResolutionService; +import org.onosproject.net.neighbour.DefaultNeighbourMessageHandler; +import org.onosproject.net.neighbour.NeighbourResolutionService; import org.onosproject.net.ConnectPoint; import org.onosproject.net.edge.EdgePortEvent; import org.onosproject.net.edge.EdgePortListener; diff --git a/apps/routing/common/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java b/apps/routing/common/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java index 13e5943240..ab1e595a83 100644 --- a/apps/routing/common/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java +++ b/apps/routing/common/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java @@ -29,9 +29,9 @@ import org.onosproject.net.intf.Interface; import org.onosproject.net.intf.InterfaceEvent; import org.onosproject.net.intf.InterfaceListener; import org.onosproject.net.intf.InterfaceService; -import org.onosproject.incubator.net.neighbour.NeighbourMessageContext; -import org.onosproject.incubator.net.neighbour.NeighbourMessageHandler; -import org.onosproject.incubator.net.neighbour.NeighbourResolutionService; +import org.onosproject.net.neighbour.NeighbourMessageContext; +import org.onosproject.net.neighbour.NeighbourMessageHandler; +import org.onosproject.net.neighbour.NeighbourResolutionService; import org.onosproject.net.ConnectPoint; import org.onosproject.net.Host; import org.onosproject.net.config.NetworkConfigEvent; diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/ArpHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/ArpHandler.java index 88bfcc0e0a..b3a0acae26 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/ArpHandler.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/ArpHandler.java @@ -22,7 +22,7 @@ import org.onlab.packet.IpAddress; import org.onlab.packet.IpPrefix; import org.onlab.packet.MacAddress; import org.onlab.packet.VlanId; -import org.onosproject.incubator.net.neighbour.NeighbourMessageContext; +import org.onosproject.net.neighbour.NeighbourMessageContext; import org.onosproject.net.ConnectPoint; import org.onosproject.net.DeviceId; import org.onosproject.net.host.HostService; @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; import java.util.Set; import java.util.stream.Collectors; -import static org.onosproject.incubator.net.neighbour.NeighbourMessageType.REQUEST; +import static org.onosproject.net.neighbour.NeighbourMessageType.REQUEST; /** * Handler of ARP packets that responses or forwards ARP packets that diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java index f7b1183596..9402af55a0 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java @@ -27,8 +27,8 @@ import org.onlab.packet.MPLS; import org.onlab.packet.MacAddress; import org.onlab.packet.VlanId; import org.onlab.packet.ndp.NeighborSolicitation; -import org.onosproject.incubator.net.neighbour.NeighbourMessageContext; -import org.onosproject.incubator.net.neighbour.NeighbourMessageType; +import org.onosproject.net.neighbour.NeighbourMessageContext; +import org.onosproject.net.neighbour.NeighbourMessageType; import org.onosproject.incubator.net.routing.ResolvedRoute; import org.onosproject.net.ConnectPoint; import org.onosproject.net.DeviceId; diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java index ec208589c1..2f8c2ed4b4 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java @@ -43,7 +43,7 @@ import org.onosproject.net.intf.InterfaceService; import org.onosproject.incubator.net.routing.RouteEvent; import org.onosproject.incubator.net.routing.RouteListener; import org.onosproject.incubator.net.routing.RouteService; -import org.onosproject.incubator.net.neighbour.NeighbourResolutionService; +import org.onosproject.net.neighbour.NeighbourResolutionService; import org.onosproject.mastership.MastershipService; import org.onosproject.net.ConnectPoint; import org.onosproject.net.Device; diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourDispatcher.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourDispatcher.java index eb5b110b84..cc815da73e 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourDispatcher.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourDispatcher.java @@ -16,8 +16,8 @@ package org.onosproject.segmentrouting; -import org.onosproject.incubator.net.neighbour.NeighbourMessageContext; -import org.onosproject.incubator.net.neighbour.NeighbourMessageHandler; +import org.onosproject.net.neighbour.NeighbourMessageContext; +import org.onosproject.net.neighbour.NeighbourMessageHandler; import org.onosproject.net.host.HostService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourHandler.java index 0215249b72..f03e0be048 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourHandler.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourHandler.java @@ -19,7 +19,7 @@ package org.onosproject.segmentrouting; import org.onlab.packet.Ethernet; import org.onlab.packet.IpAddress; import org.onlab.packet.MacAddress; -import org.onosproject.incubator.net.neighbour.NeighbourMessageContext; +import org.onosproject.net.neighbour.NeighbourMessageContext; import org.onosproject.net.ConnectPoint; import org.onosproject.net.DeviceId; import org.onosproject.net.Host; diff --git a/apps/vpls/src/main/java/org/onosproject/vpls/VplsNeighbourHandler.java b/apps/vpls/src/main/java/org/onosproject/vpls/VplsNeighbourHandler.java index 6701858a87..2cbd412109 100644 --- a/apps/vpls/src/main/java/org/onosproject/vpls/VplsNeighbourHandler.java +++ b/apps/vpls/src/main/java/org/onosproject/vpls/VplsNeighbourHandler.java @@ -28,9 +28,9 @@ import org.onosproject.net.intf.Interface; import org.onosproject.net.intf.InterfaceEvent; import org.onosproject.net.intf.InterfaceListener; import org.onosproject.net.intf.InterfaceService; -import org.onosproject.incubator.net.neighbour.NeighbourMessageContext; -import org.onosproject.incubator.net.neighbour.NeighbourMessageHandler; -import org.onosproject.incubator.net.neighbour.NeighbourResolutionService; +import org.onosproject.net.neighbour.NeighbourMessageContext; +import org.onosproject.net.neighbour.NeighbourMessageHandler; +import org.onosproject.net.neighbour.NeighbourResolutionService; import org.onosproject.net.ConnectPoint; import org.onosproject.net.Host; import org.onosproject.net.config.NetworkConfigEvent; diff --git a/apps/vpls/src/test/java/org/onosproject/vpls/VplsNeighbourHandlerTest.java b/apps/vpls/src/test/java/org/onosproject/vpls/VplsNeighbourHandlerTest.java index 4b48d95a8b..c5adcfb9ac 100644 --- a/apps/vpls/src/test/java/org/onosproject/vpls/VplsNeighbourHandlerTest.java +++ b/apps/vpls/src/test/java/org/onosproject/vpls/VplsNeighbourHandlerTest.java @@ -28,12 +28,12 @@ import org.onlab.packet.MacAddress; import org.onlab.packet.VlanId; import org.onosproject.core.ApplicationId; import org.onosproject.net.intf.Interface; -import org.onosproject.incubator.net.neighbour.NeighbourHandlerRegistration; -import org.onosproject.incubator.net.neighbour.NeighbourMessageContext; -import org.onosproject.incubator.net.neighbour.NeighbourMessageHandler; -import org.onosproject.incubator.net.neighbour.NeighbourMessageType; -import org.onosproject.incubator.net.neighbour.NeighbourProtocol; -import org.onosproject.incubator.net.neighbour.NeighbourResolutionService; +import org.onosproject.net.neighbour.NeighbourHandlerRegistration; +import org.onosproject.net.neighbour.NeighbourMessageContext; +import org.onosproject.net.neighbour.NeighbourMessageHandler; +import org.onosproject.net.neighbour.NeighbourMessageType; +import org.onosproject.net.neighbour.NeighbourProtocol; +import org.onosproject.net.neighbour.NeighbourResolutionService; import org.onosproject.net.ConnectPoint; import org.onosproject.net.Host; import org.onosproject.net.host.HostService; diff --git a/cli/src/main/java/org/onosproject/cli/net/NeighbourHandlersListCommand.java b/cli/src/main/java/org/onosproject/cli/net/NeighbourHandlersListCommand.java index 8e5ffd80e9..8ba768b27f 100644 --- a/cli/src/main/java/org/onosproject/cli/net/NeighbourHandlersListCommand.java +++ b/cli/src/main/java/org/onosproject/cli/net/NeighbourHandlersListCommand.java @@ -19,7 +19,7 @@ package org.onosproject.cli.net; import org.apache.karaf.shell.commands.Command; import org.onosproject.cli.AbstractShellCommand; import org.onosproject.net.intf.Interface; -import org.onosproject.incubator.net.neighbour.NeighbourResolutionService; +import org.onosproject.net.neighbour.NeighbourResolutionService; /** * Lists neighbour message handlers. diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/DefaultNeighbourMessageHandler.java b/core/api/src/main/java/org/onosproject/net/neighbour/DefaultNeighbourMessageHandler.java similarity index 97% rename from incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/DefaultNeighbourMessageHandler.java rename to core/api/src/main/java/org/onosproject/net/neighbour/DefaultNeighbourMessageHandler.java index ee0c28add0..5f34e9f29f 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/DefaultNeighbourMessageHandler.java +++ b/core/api/src/main/java/org/onosproject/net/neighbour/DefaultNeighbourMessageHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour; +package org.onosproject.net.neighbour; import org.onosproject.net.Host; import org.onosproject.net.host.HostService; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourHandlerRegistration.java b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourHandlerRegistration.java similarity index 96% rename from incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourHandlerRegistration.java rename to core/api/src/main/java/org/onosproject/net/neighbour/NeighbourHandlerRegistration.java index df3531970d..3186cf62ff 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourHandlerRegistration.java +++ b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourHandlerRegistration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour; +package org.onosproject.net.neighbour; import org.onosproject.core.ApplicationId; import org.onosproject.net.intf.Interface; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourMessageActions.java b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourMessageActions.java similarity index 97% rename from incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourMessageActions.java rename to core/api/src/main/java/org/onosproject/net/neighbour/NeighbourMessageActions.java index 0e04aee822..5bbfee2c2f 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourMessageActions.java +++ b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourMessageActions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour; +package org.onosproject.net.neighbour; import com.google.common.annotations.Beta; import org.onlab.packet.MacAddress; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourMessageContext.java b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourMessageContext.java similarity index 98% rename from incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourMessageContext.java rename to core/api/src/main/java/org/onosproject/net/neighbour/NeighbourMessageContext.java index ca5e3ce56d..aef37bb0e7 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourMessageContext.java +++ b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourMessageContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour; +package org.onosproject.net.neighbour; import com.google.common.annotations.Beta; import org.onlab.packet.Ethernet; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourMessageHandler.java b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourMessageHandler.java similarity index 96% rename from incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourMessageHandler.java rename to core/api/src/main/java/org/onosproject/net/neighbour/NeighbourMessageHandler.java index 319f8b0cae..040f4b0dfe 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourMessageHandler.java +++ b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourMessageHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour; +package org.onosproject.net.neighbour; import com.google.common.annotations.Beta; import org.onosproject.net.host.HostService; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourMessageType.java b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourMessageType.java similarity index 94% rename from incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourMessageType.java rename to core/api/src/main/java/org/onosproject/net/neighbour/NeighbourMessageType.java index babb40d41d..63fd199331 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourMessageType.java +++ b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourMessageType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour; +package org.onosproject.net.neighbour; import com.google.common.annotations.Beta; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourProtocol.java b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourProtocol.java similarity index 94% rename from incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourProtocol.java rename to core/api/src/main/java/org/onosproject/net/neighbour/NeighbourProtocol.java index 440b649b61..ad00dd1f55 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourProtocol.java +++ b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourProtocol.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour; +package org.onosproject.net.neighbour; import com.google.common.annotations.Beta; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourResolutionService.java b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourResolutionService.java similarity index 98% rename from incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourResolutionService.java rename to core/api/src/main/java/org/onosproject/net/neighbour/NeighbourResolutionService.java index e6e3e20c68..d64cc5e8a0 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/NeighbourResolutionService.java +++ b/core/api/src/main/java/org/onosproject/net/neighbour/NeighbourResolutionService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour; +package org.onosproject.net.neighbour; import com.google.common.annotations.Beta; import org.onosproject.core.ApplicationId; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/package-info.java b/core/api/src/main/java/org/onosproject/net/neighbour/package-info.java similarity index 93% rename from incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/package-info.java rename to core/api/src/main/java/org/onosproject/net/neighbour/package-info.java index bf9c0a388c..7503dc0c63 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/neighbour/package-info.java +++ b/core/api/src/main/java/org/onosproject/net/neighbour/package-info.java @@ -17,4 +17,4 @@ /** * Neighbour message (ARP, NDP) handling. */ -package org.onosproject.incubator.net.neighbour; +package org.onosproject.net.neighbour; diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/DefaultNeighbourMessageActions.java b/core/net/src/main/java/org/onosproject/net/neighbour/impl/DefaultNeighbourMessageActions.java similarity index 96% rename from incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/DefaultNeighbourMessageActions.java rename to core/net/src/main/java/org/onosproject/net/neighbour/impl/DefaultNeighbourMessageActions.java index 05241defc5..ed78212a79 100644 --- a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/DefaultNeighbourMessageActions.java +++ b/core/net/src/main/java/org/onosproject/net/neighbour/impl/DefaultNeighbourMessageActions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour.impl; +package org.onosproject.net.neighbour.impl; import org.onlab.packet.ARP; import org.onlab.packet.Ethernet; @@ -28,8 +28,8 @@ import org.onlab.packet.ndp.NeighborAdvertisement; import org.onlab.packet.ndp.NeighborDiscoveryOptions; import org.onlab.util.Tools; import org.onosproject.net.intf.Interface; -import org.onosproject.incubator.net.neighbour.NeighbourMessageActions; -import org.onosproject.incubator.net.neighbour.NeighbourMessageContext; +import org.onosproject.net.neighbour.NeighbourMessageActions; +import org.onosproject.net.neighbour.NeighbourMessageContext; import org.onosproject.net.ConnectPoint; import org.onosproject.net.edge.EdgePortService; import org.onosproject.net.flow.DefaultTrafficTreatment; diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/DefaultNeighbourMessageContext.java b/core/net/src/main/java/org/onosproject/net/neighbour/impl/DefaultNeighbourMessageContext.java similarity index 95% rename from incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/DefaultNeighbourMessageContext.java rename to core/net/src/main/java/org/onosproject/net/neighbour/impl/DefaultNeighbourMessageContext.java index d0b2b2848a..2e013affd6 100644 --- a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/DefaultNeighbourMessageContext.java +++ b/core/net/src/main/java/org/onosproject/net/neighbour/impl/DefaultNeighbourMessageContext.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour.impl; +package org.onosproject.net.neighbour.impl; + +import java.util.Objects; -import com.google.common.annotations.Beta; import org.onlab.packet.ARP; import org.onlab.packet.Ethernet; import org.onlab.packet.ICMP6; @@ -27,21 +28,19 @@ import org.onlab.packet.IpAddress; import org.onlab.packet.MacAddress; import org.onlab.packet.VlanId; import org.onlab.packet.ndp.NeighborSolicitation; -import org.onosproject.net.intf.Interface; -import org.onosproject.incubator.net.neighbour.NeighbourMessageActions; -import org.onosproject.incubator.net.neighbour.NeighbourMessageContext; -import org.onosproject.incubator.net.neighbour.NeighbourMessageType; -import org.onosproject.incubator.net.neighbour.NeighbourProtocol; import org.onosproject.net.ConnectPoint; - -import java.util.Objects; +import org.onosproject.net.intf.Interface; +import org.onosproject.net.neighbour.NeighbourMessageActions; +import org.onosproject.net.neighbour.NeighbourMessageContext; +import org.onosproject.net.neighbour.NeighbourMessageType; +import org.onosproject.net.neighbour.NeighbourProtocol; import static com.google.common.base.Preconditions.checkState; /** * Default implementation of a neighbour message context. */ -@Beta + public class DefaultNeighbourMessageContext implements NeighbourMessageContext { private final NeighbourProtocol protocol; diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java b/core/net/src/main/java/org/onosproject/net/neighbour/impl/NeighbourResolutionManager.java similarity index 97% rename from incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java rename to core/net/src/main/java/org/onosproject/net/neighbour/impl/NeighbourResolutionManager.java index 43db0403cf..2a9a187ee3 100644 --- a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java +++ b/core/net/src/main/java/org/onosproject/net/neighbour/impl/NeighbourResolutionManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour.impl; +package org.onosproject.net.neighbour.impl; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMap; @@ -39,11 +39,11 @@ import org.onosproject.cfg.ComponentConfigService; import org.onosproject.core.ApplicationId; import org.onosproject.core.CoreService; import org.onosproject.net.intf.Interface; -import org.onosproject.incubator.net.neighbour.NeighbourHandlerRegistration; -import org.onosproject.incubator.net.neighbour.NeighbourMessageActions; -import org.onosproject.incubator.net.neighbour.NeighbourMessageContext; -import org.onosproject.incubator.net.neighbour.NeighbourMessageHandler; -import org.onosproject.incubator.net.neighbour.NeighbourResolutionService; +import org.onosproject.net.neighbour.NeighbourHandlerRegistration; +import org.onosproject.net.neighbour.NeighbourMessageActions; +import org.onosproject.net.neighbour.NeighbourMessageContext; +import org.onosproject.net.neighbour.NeighbourMessageHandler; +import org.onosproject.net.neighbour.NeighbourResolutionService; import org.onosproject.net.ConnectPoint; import org.onosproject.net.edge.EdgePortService; import org.onosproject.net.flow.DefaultTrafficSelector; diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/neighbour/impl/package-info.java similarity index 92% rename from incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/package-info.java rename to core/net/src/main/java/org/onosproject/net/neighbour/impl/package-info.java index a16207eced..a044c6752b 100644 --- a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/package-info.java +++ b/core/net/src/main/java/org/onosproject/net/neighbour/impl/package-info.java @@ -17,4 +17,4 @@ /** * Implementation of neighbour resolution service. */ -package org.onosproject.incubator.net.neighbour.impl; +package org.onosproject.net.neighbour.impl; diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/neighbour/impl/DefaultNeighbourMessageActionsTest.java b/core/net/src/test/java/org/onosproject/net/neighbour/impl/DefaultNeighbourMessageActionsTest.java similarity index 88% rename from incubator/net/src/test/java/org/onosproject/incubator/net/neighbour/impl/DefaultNeighbourMessageActionsTest.java rename to core/net/src/test/java/org/onosproject/net/neighbour/impl/DefaultNeighbourMessageActionsTest.java index 0faa303805..52b52279ed 100644 --- a/incubator/net/src/test/java/org/onosproject/incubator/net/neighbour/impl/DefaultNeighbourMessageActionsTest.java +++ b/core/net/src/test/java/org/onosproject/net/neighbour/impl/DefaultNeighbourMessageActionsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour.impl; +package org.onosproject.net.neighbour.impl; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; @@ -43,9 +43,7 @@ import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expectLastCall; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -import static org.onosproject.incubator.net.neighbour.impl.DefaultNeighbourMessageContext.createContext; -import static org.onosproject.incubator.net.neighbour.impl.NeighbourTestUtils.createArpRequest; -import static org.onosproject.incubator.net.neighbour.impl.NeighbourTestUtils.intf; +import static org.onosproject.net.neighbour.impl.DefaultNeighbourMessageContext.createContext; /** * Unit tests for DefaultNeighbourMessageActions. @@ -70,8 +68,8 @@ public class DefaultNeighbourMessageActionsTest { private static final VlanId VLAN1 = VlanId.vlanId((short) 1); - private static final Interface INTF1 = intf(CP1, IP1, MAC1, VLAN1); - private static final Interface INTF2 = intf(CP2, IP2, MAC2, VLAN1); + private static final Interface INTF1 = NeighbourTestUtils.intf(CP1, IP1, MAC1, VLAN1); + private static final Interface INTF2 = NeighbourTestUtils.intf(CP2, IP2, MAC2, VLAN1); private DefaultNeighbourMessageActions actions; private PacketService packetService; @@ -84,7 +82,7 @@ public class DefaultNeighbourMessageActionsTest { @Test public void reply() throws Exception { - Ethernet request = createArpRequest(IP1); + Ethernet request = NeighbourTestUtils.createArpRequest(IP1); Ip4Address ip4Address = INTF1.ipAddressesList().get(0).ipAddress().getIp4Address(); Ethernet response = ARP.buildArpReply(ip4Address, MAC2, request); @@ -100,7 +98,7 @@ public class DefaultNeighbourMessageActionsTest { @Test public void forwardToConnectPoint() { - Ethernet request = createArpRequest(IP1); + Ethernet request = NeighbourTestUtils.createArpRequest(IP1); packetService.emit(outbound(request, CP2)); expectLastCall().once(); @@ -113,7 +111,7 @@ public class DefaultNeighbourMessageActionsTest { @Test public void forwardToInterface() { - Ethernet request = createArpRequest(IP1); + Ethernet request = NeighbourTestUtils.createArpRequest(IP1); Ethernet forwardedRequest = (Ethernet) request.clone(); forwardedRequest.setSourceMACAddress(INTF2.mac()); @@ -130,7 +128,7 @@ public class DefaultNeighbourMessageActionsTest { @Test public void flood() { - Ethernet request = createArpRequest(IP1); + Ethernet request = NeighbourTestUtils.createArpRequest(IP1); // Expect the packet to be emitted out all ports apart from the in port Sets.difference(Sets.newLinkedHashSet(EDGE_PORTS), Collections.singleton(CP1)) diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManagerTest.java b/core/net/src/test/java/org/onosproject/net/neighbour/impl/NeighbourResolutionManagerTest.java similarity index 95% rename from incubator/net/src/test/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManagerTest.java rename to core/net/src/test/java/org/onosproject/net/neighbour/impl/NeighbourResolutionManagerTest.java index 78459c2a26..030d496e11 100644 --- a/incubator/net/src/test/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManagerTest.java +++ b/core/net/src/test/java/org/onosproject/net/neighbour/impl/NeighbourResolutionManagerTest.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour.impl; +package org.onosproject.net.neighbour.impl; + +import java.util.Collection; import org.junit.Before; import org.junit.Test; @@ -27,26 +29,24 @@ import org.onosproject.TestApplicationId; import org.onosproject.cfg.ComponentConfigAdapter; import org.onosproject.core.ApplicationId; import org.onosproject.core.CoreService; -import org.onosproject.net.intf.Interface; -import org.onosproject.incubator.net.neighbour.NeighbourHandlerRegistration; -import org.onosproject.incubator.net.neighbour.NeighbourMessageContext; -import org.onosproject.incubator.net.neighbour.NeighbourMessageHandler; import org.onosproject.net.ConnectPoint; import org.onosproject.net.flow.TrafficSelector; import org.onosproject.net.host.HostService; +import org.onosproject.net.intf.Interface; +import org.onosproject.net.neighbour.NeighbourHandlerRegistration; +import org.onosproject.net.neighbour.NeighbourMessageContext; +import org.onosproject.net.neighbour.NeighbourMessageHandler; import org.onosproject.net.packet.DefaultInboundPacket; import org.onosproject.net.packet.DefaultOutboundPacket; import org.onosproject.net.packet.InboundPacket; -import org.onosproject.net.packet.PacketContextAdapter; import org.onosproject.net.packet.OutboundPacket; import org.onosproject.net.packet.PacketContext; +import org.onosproject.net.packet.PacketContextAdapter; import org.onosproject.net.packet.PacketPriority; import org.onosproject.net.packet.PacketProcessor; import org.onosproject.net.packet.PacketService; import org.onosproject.net.packet.PacketServiceAdapter; -import java.util.Collection; - import static org.easymock.EasyMock.anyInt; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.createMock; @@ -58,9 +58,9 @@ import static org.easymock.EasyMock.reset; import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.onosproject.incubator.net.neighbour.impl.DefaultNeighbourMessageContext.createContext; -import static org.onosproject.incubator.net.neighbour.impl.NeighbourTestUtils.createArpRequest; -import static org.onosproject.incubator.net.neighbour.impl.NeighbourTestUtils.intf; +import static org.onosproject.net.neighbour.impl.DefaultNeighbourMessageContext.createContext; +import static org.onosproject.net.neighbour.impl.NeighbourTestUtils.createArpRequest; +import static org.onosproject.net.neighbour.impl.NeighbourTestUtils.intf; /** * Unit tests for the NeighbourResolutionManager. diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/neighbour/impl/NeighbourTestUtils.java b/core/net/src/test/java/org/onosproject/net/neighbour/impl/NeighbourTestUtils.java similarity index 98% rename from incubator/net/src/test/java/org/onosproject/incubator/net/neighbour/impl/NeighbourTestUtils.java rename to core/net/src/test/java/org/onosproject/net/neighbour/impl/NeighbourTestUtils.java index ca347e6d3c..ed5ed0cb1a 100644 --- a/incubator/net/src/test/java/org/onosproject/incubator/net/neighbour/impl/NeighbourTestUtils.java +++ b/core/net/src/test/java/org/onosproject/net/neighbour/impl/NeighbourTestUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.incubator.net.neighbour.impl; +package org.onosproject.net.neighbour.impl; import org.onlab.packet.ARP; import org.onlab.packet.Ethernet; diff --git a/docs/internal-incubator b/docs/internal-incubator index 43cd676dbd..1f677a5be1 100644 --- a/docs/internal-incubator +++ b/docs/internal-incubator @@ -7,7 +7,6 @@ org.onosproject.incubator.store.tunnel.impl org.onosproject.incubator.net.config.impl org.onosproject.incubator.net.domain.impl org.onosproject.incubator.store.config.impl -org.onosproject.net.intf.impl org.onosproject.incubator.net.meter.impl org.onosproject.incubator.net.resource.label org.onosproject.incubator.store.meter.impl