Move routing from incubator to a separate app
Change-Id: I961d10af99c572b1f8d9b3d37c6f52dd04422007
diff --git a/apps/route-service/api/src/main/java/org/onosproject/routeservice/ResolvedRoute.java b/apps/route-service/api/src/main/java/org/onosproject/routeservice/ResolvedRoute.java
new file mode 100644
index 0000000..828827d
--- /dev/null
+++ b/apps/route-service/api/src/main/java/org/onosproject/routeservice/ResolvedRoute.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2016-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.routeservice;
+
+import org.onlab.packet.IpAddress;
+import org.onlab.packet.IpPrefix;
+import org.onlab.packet.MacAddress;
+import org.onlab.packet.VlanId;
+import org.onosproject.net.ConnectPoint;
+
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+
+/**
+ * Represents a route with the next hop MAC address resolved.
+ */
+public class ResolvedRoute {
+
+ private final Route route;
+ private final MacAddress nextHopMac;
+ private final VlanId nextHopVlan;
+ private final ConnectPoint location;
+
+ /**
+ * Creates a new resolved route.
+ *
+ * @param route input route
+ * @param nextHopMac next hop MAC address
+ * @param location connect point where the next hop connects to
+ */
+ public ResolvedRoute(Route route, MacAddress nextHopMac, ConnectPoint location) {
+ this(route, nextHopMac, VlanId.NONE, location);
+ }
+
+ /**
+ * Creates a new resolved route.
+ *
+ * @param route input route
+ * @param nextHopMac next hop MAC address
+ * @param nextHopVlan next hop VLAN ID
+ * @param location connect point where the next hop connects to
+ */
+ public ResolvedRoute(Route route, MacAddress nextHopMac, VlanId nextHopVlan,
+ ConnectPoint location) {
+ this.route = route;
+ this.nextHopMac = nextHopMac;
+ this.nextHopVlan = nextHopVlan;
+ this.location = location;
+ }
+
+ /**
+ * Returns the original route.
+ *
+ * @return route
+ */
+ public Route route() {
+ return route;
+ }
+
+ /**
+ * Returns the IP prefix.
+ *
+ * @return IP prefix
+ */
+ public IpPrefix prefix() {
+ return route.prefix();
+ }
+
+ /**
+ * Returns the next hop IP address.
+ *
+ * @return IP address
+ */
+ public IpAddress nextHop() {
+ return route.nextHop();
+ }
+
+ /**
+ * Returns the next hop MAC address.
+ *
+ * @return MAC address
+ */
+ public MacAddress nextHopMac() {
+ return nextHopMac;
+ }
+
+ /**
+ * Returns the next hop VLAN ID.
+ *
+ * @return VLAN ID
+ */
+ public VlanId nextHopVlan() {
+ return nextHopVlan;
+ }
+
+ /**
+ * Returns the next hop location.
+ *
+ * @return connect point where the next hop attaches to
+ */
+ public ConnectPoint location() {
+ return location;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(route, nextHopMac, nextHopVlan, location);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ }
+
+ if (!(other instanceof ResolvedRoute)) {
+ return false;
+ }
+
+ ResolvedRoute that = (ResolvedRoute) other;
+
+ return Objects.equals(this.route, that.route) &&
+ Objects.equals(this.nextHopMac, that.nextHopMac) &&
+ Objects.equals(this.nextHopVlan, that.nextHopVlan) &&
+ Objects.equals(this.location, that.location);
+ }
+
+ @Override
+ public String toString() {
+ return toStringHelper(this)
+ .add("route", route)
+ .add("nextHopMac", nextHopMac)
+ .add("nextHopVlan", nextHopVlan)
+ .add("location", location)
+ .toString();
+ }
+}