Adds a Segment Routing CLI to remove a tunnel (srtunnel-remove).
Change-Id: Ie702a0cbe4c4ef7f9a956ca3a5335b2337a68c31
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PolicyRemoveCommand.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PolicyRemoveCommand.java
index aa56112..b4f3b35 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PolicyRemoveCommand.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PolicyRemoveCommand.java
@@ -23,7 +23,7 @@
import org.onosproject.segmentrouting.TunnelPolicy;
/**
- * Command to add a new policy.
+ * Command to remove a policy.
*/
@Command(scope = "onos", name = "srpolicy-remove",
description = "Remove a policy")
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/TunnelRemoveCommand.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/TunnelRemoveCommand.java
new file mode 100644
index 0000000..f5c9f58
--- /dev/null
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/TunnelRemoveCommand.java
@@ -0,0 +1,48 @@
+/*
+ * 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.segmentrouting.cli;
+
+
+import com.google.common.collect.Lists;
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.segmentrouting.DefaultTunnel;
+import org.onosproject.segmentrouting.SegmentRoutingService;
+import org.onosproject.segmentrouting.Tunnel;
+
+/**
+ * Command to remove a tunnel.
+ */
+@Command(scope = "onos", name = "srtunnel-remove",
+ description = "Remove a tunnel")
+public class TunnelRemoveCommand extends AbstractShellCommand {
+
+ @Argument(index = 0, name = "tunnel ID",
+ description = "tunnel ID",
+ required = true, multiValued = false)
+ String tunnelId;
+
+ @Override
+ protected void execute() {
+
+ SegmentRoutingService srService =
+ AbstractShellCommand.get(SegmentRoutingService.class);
+
+ Tunnel tunnel = new DefaultTunnel(tunnelId, Lists.newArrayList());
+ srService.removeTunnel(tunnel);
+ }
+}
\ No newline at end of file
diff --git a/apps/segmentrouting/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/apps/segmentrouting/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 4e76daa..3e47bf8 100644
--- a/apps/segmentrouting/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/apps/segmentrouting/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -31,6 +31,9 @@
<command>
<action class="org.onosproject.segmentrouting.cli.TunnelAddCommand"/>
</command>
+ <command>
+ <action class="org.onosproject.segmentrouting.cli.TunnelRemoveCommand"/>
+ </command>
</command-bundle>
</blueprint>