Inject and remove static routes.
Change-Id: I8be1414978fd0b5dfb7186aeb86d100087502748
diff --git a/apps/routing-api/src/main/java/org/onosproject/routing/StaticRoutingService.java b/apps/routing-api/src/main/java/org/onosproject/routing/StaticRoutingService.java
new file mode 100644
index 0000000..7d75f5c
--- /dev/null
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/StaticRoutingService.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015 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;
+
+/**
+ * Convenience interface to obtain the FIB listener.
+ */
+public interface StaticRoutingService {
+
+ FibListener getFibListener();
+}
diff --git a/apps/routing/src/main/java/org/onosproject/routing/cli/AddRouteCommand.java b/apps/routing/src/main/java/org/onosproject/routing/cli/AddRouteCommand.java
new file mode 100644
index 0000000..452a145
--- /dev/null
+++ b/apps/routing/src/main/java/org/onosproject/routing/cli/AddRouteCommand.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015 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.cli;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onlab.packet.IpAddress;
+import org.onlab.packet.IpPrefix;
+import org.onlab.packet.MacAddress;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.routing.FibEntry;
+import org.onosproject.routing.FibListener;
+import org.onosproject.routing.FibUpdate;
+import org.onosproject.routing.StaticRoutingService;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+@Command(scope = "onos", name = "add-route", description = "Installs static route")
+public class AddRouteCommand extends AbstractShellCommand {
+
+ @Argument(index = 0, name = "prefix IP MAC",
+ description = "prefix nexthopIP nexthopMAC",
+ required = true, multiValued = true)
+ String[] fibEntryString = null;
+
+ @Override
+ protected void execute() {
+ StaticRoutingService routingService = get(StaticRoutingService.class);
+
+ if (fibEntryString.length < 3) {
+ return;
+ }
+
+ IpPrefix prefix = IpPrefix.valueOf(fibEntryString[0]);
+ IpAddress nextHopIp = IpAddress.valueOf(fibEntryString[1]);
+ MacAddress nextHopMac = MacAddress.valueOf(fibEntryString[2]);
+ FibEntry fibEntry = new FibEntry(prefix, nextHopIp, nextHopMac);
+ FibUpdate fibUpdate = new FibUpdate(FibUpdate.Type.UPDATE, fibEntry);
+
+ FibListener fibListener = routingService.getFibListener();
+ fibListener.update(Arrays.asList(fibUpdate), Collections.emptyList());
+ }
+}
diff --git a/apps/routing/src/main/java/org/onosproject/routing/cli/RemoveRouteCommand.java b/apps/routing/src/main/java/org/onosproject/routing/cli/RemoveRouteCommand.java
new file mode 100644
index 0000000..3e216f9
--- /dev/null
+++ b/apps/routing/src/main/java/org/onosproject/routing/cli/RemoveRouteCommand.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015 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.cli;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onlab.packet.IpAddress;
+import org.onlab.packet.IpPrefix;
+import org.onlab.packet.MacAddress;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.routing.FibEntry;
+import org.onosproject.routing.FibListener;
+import org.onosproject.routing.FibUpdate;
+import org.onosproject.routing.StaticRoutingService;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+@Command(scope = "onos", name = "remove-route", description = "Removes static route")
+public class RemoveRouteCommand extends AbstractShellCommand {
+ @Argument(index = 0, name = "prefix IP MAC",
+ description = "prefix nexthopIP nexthopMAC",
+ required = true, multiValued = true)
+ String[] fibEntryString = null;
+
+ @Override
+ protected void execute() {
+ StaticRoutingService routingService = get(StaticRoutingService.class);
+
+ if (fibEntryString.length < 3) {
+ return;
+ }
+
+ IpPrefix prefix = IpPrefix.valueOf(fibEntryString[0]);
+ IpAddress nextHopIp = IpAddress.valueOf(fibEntryString[1]);
+ MacAddress nextHopMac = MacAddress.valueOf(fibEntryString[2]);
+ FibEntry fibEntry = new FibEntry(prefix, nextHopIp, nextHopMac);
+ FibUpdate fibUpdate = new FibUpdate(FibUpdate.Type.DELETE, fibEntry);
+
+ FibListener fibListener = routingService.getFibListener();
+ fibListener.update(Collections.emptyList(), Arrays.asList(fibUpdate));
+ }
+}
diff --git a/apps/routing/src/main/java/org/onosproject/routing/impl/StaticRouter.java b/apps/routing/src/main/java/org/onosproject/routing/impl/StaticRouter.java
new file mode 100644
index 0000000..29526ff
--- /dev/null
+++ b/apps/routing/src/main/java/org/onosproject/routing/impl/StaticRouter.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2015 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.impl;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
+import org.onlab.packet.IpAddress;
+import org.onlab.packet.MacAddress;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.routing.FibListener;
+import org.onosproject.routing.IntentRequestListener;
+import org.onosproject.routing.RouteEntry;
+import org.onosproject.routing.RoutingService;
+import org.onosproject.routing.StaticRoutingService;
+
+import java.util.Collection;
+
+/**
+ * Static router maintains handle to FIB listener.
+ *
+ * TODO: implement getRoutes methods
+ */
+@Component(immediate = true, enabled = false)
+@Service
+public class StaticRouter implements RoutingService, StaticRoutingService {
+ private FibListener fibListener;
+
+ @Override
+ public void start() {
+
+ }
+
+ @Override
+ public void addFibListener(FibListener fibListener) {
+ this.fibListener = fibListener;
+ }
+
+ @Override
+ public void addIntentRequestListener(IntentRequestListener intentRequestListener) {
+
+ }
+
+ @Override
+ public void stop() {
+
+ }
+
+ @Override
+ public Collection<RouteEntry> getRoutes4() {
+ return null;
+ }
+
+ @Override
+ public Collection<RouteEntry> getRoutes6() {
+ return null;
+ }
+
+ @Override
+ public LocationType getLocationType(IpAddress ipAddress) {
+ return null;
+ }
+
+ @Override
+ public RouteEntry getLongestMatchableRouteEntry(IpAddress ipAddress) {
+ return null;
+ }
+
+ @Override
+ public ConnectPoint getEgressConnectPoint(IpAddress dstIpAddress) {
+ return null;
+ }
+
+ @Override
+ public void packetReactiveProcessor(IpAddress dstIpAddress, IpAddress srcIpAddress,
+ ConnectPoint srcConnectPoint, MacAddress srcMacAddress) {
+
+ }
+
+ @Override
+ public FibListener getFibListener() {
+ return fibListener;
+ }
+
+}
diff --git a/apps/routing/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/apps/routing/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 5ef971d..2026943 100644
--- a/apps/routing/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/apps/routing/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -25,5 +25,11 @@
<command>
<action class="org.onosproject.routing.cli.RoutesListCommand"/>
</command>
+ <command>
+ <action class="org.onosproject.routing.cli.AddRouteCommand"/>
+ </command>
+ <command>
+ <action class="org.onosproject.routing.cli.RemoveRouteCommand"/>
+ </command>
</command-bundle>
</blueprint>