Implemented control plane redirect for control traffic.
Modified SoftRouterPipeline to support new flow objectives.
Change-Id: Ia93bc927832444ba1f7cf20b276e4866789c9d30
diff --git a/apps/routing-api/src/main/java/org/onosproject/routing/RoutingService.java b/apps/routing-api/src/main/java/org/onosproject/routing/RoutingService.java
index 7399ed7..9c61010 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routing/RoutingService.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/RoutingService.java
@@ -17,6 +17,7 @@
import org.onlab.packet.IpAddress;
import org.onosproject.routing.config.BgpConfig;
+import org.onosproject.routing.config.RouterConfig;
import java.util.Collection;
@@ -28,6 +29,7 @@
String ROUTER_APP_ID = "org.onosproject.router";
Class<BgpConfig> CONFIG_CLASS = BgpConfig.class;
+ Class<RouterConfig> ROUTER_CONFIG_CLASS = RouterConfig.class;
/**
* Starts the routing service.
diff --git a/apps/routing-api/src/main/java/org/onosproject/routing/config/BgpConfig.java b/apps/routing-api/src/main/java/org/onosproject/routing/config/BgpConfig.java
index 6085c60..209b0fb 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routing/config/BgpConfig.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/config/BgpConfig.java
@@ -42,8 +42,6 @@
public static final String NAME = "name";
public static final String PEERS = "peers";
- // TODO add methods for updating config
-
/**
* Gets the set of configured BGP speakers.
*
diff --git a/apps/routing-api/src/main/java/org/onosproject/routing/config/RouterConfig.java b/apps/routing-api/src/main/java/org/onosproject/routing/config/RouterConfig.java
new file mode 100644
index 0000000..7bd2b99
--- /dev/null
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/config/RouterConfig.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2016 Open Networking Laboratory
+ *
+ * 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.routing.config;
+
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.config.Config;
+
+/**
+ * Routing configuration.
+ */
+public class RouterConfig extends Config<ApplicationId> {
+
+ public static final String CP_CONNECT_POINT = "controlPlaneConnectPoint";
+
+ /**
+ * Returns the routing control plane connect point.
+ *
+ * @return control plane connect point
+ */
+ public ConnectPoint getControlPlaneConnectPoint() {
+ return ConnectPoint.deviceConnectPoint(object.path(CP_CONNECT_POINT).asText());
+ }
+}