[ONOS-1284][ONOS-1869]the implementation of tunnel subsystem.It includes
test
commands, store, service. the store use eventually consistent.
Change-Id: Id54224ff65f3f2fa0a1d7adb072a2fe664987d18
diff --git a/cli/src/main/java/org/onosproject/cli/net/BorrowTunnelCommand.java b/cli/src/main/java/org/onosproject/cli/net/BorrowTunnelCommand.java
new file mode 100644
index 0000000..4a15d8e
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/BorrowTunnelCommand.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2014-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.cli.net;
+
+import java.util.Collection;
+import java.util.Optional;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onlab.packet.IpAddress;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.DefaultApplicationId;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.tunnel.DefaultOpticalTunnelEndPoint;
+import org.onosproject.net.tunnel.IpTunnelEndPoint;
+import org.onosproject.net.tunnel.OpticalLogicId;
+import org.onosproject.net.tunnel.OpticalTunnelEndPoint;
+import org.onosproject.net.tunnel.Tunnel;
+import org.onosproject.net.tunnel.TunnelEndPoint;
+import org.onosproject.net.tunnel.TunnelService;
+
+/**
+ * Borrows all tunnels between specific source tunnel end point and specific
+ * destination tunnel end point. Supports for IP address and optical as tunnel end point now. It's used by consumers.
+ */
+@Command(scope = "onos", name = "borrow-tunnels",
+description = "Borrows all tunnels between specific source tunnel end point"
+ + " and specific destination tunnel end point."
+ + " Supports for IP address and optical as tunnel end point now. It's used by consumers.")
+public class BorrowTunnelCommand extends AbstractShellCommand {
+ @Argument(index = 0, name = "consumerId", description = "consumer id means application id.",
+ required = true, multiValued = false)
+ String consumerId = null;
+ @Argument(index = 1, name = "src", description = "Source tunnel point."
+ + " Only supports for IpTunnelEndPoint and OpticalTunnelEndPoint as end point now."
+ + " If deletess a ODUK or OCH type tunnel, the formatter of this argument is DeviceId-PortNumber."
+ + " Otherwise src means IP address.", required = true, multiValued = false)
+ String src = null;
+ @Argument(index = 2, name = "dst", description = "Destination tunnel point."
+ + " Only supports for IpTunnelEndPoint and OpticalTunnelEndPoint as end point now."
+ + " If deletess a ODUK or OCH type tunnel, the formatter of this argument is DeviceId-PortNumber."
+ + " Otherwise dst means IP address.", required = true, multiValued = false)
+ String dst = null;
+
+ @Argument(index = 3, name = "type", description = "The type of tunnels,"
+ + " It includes MPLS, VLAN, VXLAN, GRE, ODUK, OCH", required = true, multiValued = false)
+ String type = null;
+ private static final String FMT = "src=%s, dst=%s,"
+ + "type=%s, state=%s, producerName=%s, tunnelName=%s,"
+ + "groupId=%s";
+
+ @Override
+ protected void execute() {
+ TunnelService service = get(TunnelService.class);
+ ApplicationId appId = new DefaultApplicationId(1, consumerId);
+ ProviderId producerName = new ProviderId("default",
+ "org.onosproject.provider.tunnel.default");
+ TunnelEndPoint srcPoint = null;
+ TunnelEndPoint dstPoint = null;
+ if ("MPLS".equals(type) || "VLAN".equals(type) || "VXLAN".equals(type)
+ || "GRE".equals(type)) {
+ srcPoint = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(src));
+ dstPoint = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(dst));
+ } else if ("ODUK".equals(type) || "OCH".equals(type)) {
+ String[] srcArray = src.split("-");
+ String[] dstArray = dst.split("-");
+ srcPoint = new DefaultOpticalTunnelEndPoint(
+ producerName,
+ Optional.of(DeviceId
+ .deviceId(srcArray[0])),
+ Optional.of(PortNumber
+ .portNumber(srcArray[1])),
+ null,
+ OpticalTunnelEndPoint.Type.LAMBDA,
+ OpticalLogicId
+ .logicId(0),
+ true);
+ dstPoint = new DefaultOpticalTunnelEndPoint(
+ producerName,
+ Optional.of(DeviceId
+ .deviceId(dstArray[0])),
+ Optional.of(PortNumber
+ .portNumber(dstArray[1])),
+ null,
+ OpticalTunnelEndPoint.Type.LAMBDA,
+ OpticalLogicId
+ .logicId(0),
+ true);
+ } else {
+ print("Illegal tunnel type. Please input MPLS, VLAN, VXLAN, GRE, ODUK or OCH.");
+ return;
+ }
+ Collection<Tunnel> tunnelSet = service.borrowTunnel(appId, srcPoint, dstPoint);
+ for (Tunnel tunnel : tunnelSet) {
+ print(FMT, tunnel.src(), tunnel.dst(), tunnel.type(),
+ tunnel.state(), tunnel.providerId(), tunnel.tunnelName(),
+ tunnel.groupId());
+ }
+ }
+
+}
diff --git a/cli/src/main/java/org/onosproject/cli/net/DeleteTunnelCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeleteTunnelCommand.java
new file mode 100644
index 0000000..cded33b
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/DeleteTunnelCommand.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2014-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.cli.net;
+
+import java.util.Optional;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onlab.packet.IpAddress;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.tunnel.DefaultOpticalTunnelEndPoint;
+import org.onosproject.net.tunnel.IpTunnelEndPoint;
+import org.onosproject.net.tunnel.OpticalLogicId;
+import org.onosproject.net.tunnel.OpticalTunnelEndPoint;
+import org.onosproject.net.tunnel.TunnelAdminService;
+import org.onosproject.net.tunnel.TunnelEndPoint;
+
+/**
+ * Supports for deleting all tunnels by using IP address and optical as tunnel
+ * end point now. It's used by consumers.
+ */
+@Command(scope = "onos", name = "delete-tunnels", description = "Supports for deleting all tunnels by using IP address"
+ + " and optical as tunnel end point now. It's used by consumers.")
+public class DeleteTunnelCommand extends AbstractShellCommand {
+ static String applicationId = "DEFAULT_APP_ID";
+ @Argument(index = 0, name = "src", description = "Source tunnel point."
+ + " Only supports for IpTunnelEndPoint and OpticalTunnelEndPoint as end point now."
+ + " If deletess a ODUK or OCH type tunnel, the formatter of this argument is DeviceId-PortNumber."
+ + " Otherwise src means IP address.", required = true, multiValued = false)
+ String src = null;
+ @Argument(index = 1, name = "dst", description = "Destination tunnel point."
+ + " Only supports for IpTunnelEndPoint and OpticalTunnelEndPoint as end point now."
+ + " If deletess a ODUK or OCH type tunnel, the formatter of this argument is DeviceId-PortNumber."
+ + " Otherwise dst means IP address.", required = true, multiValued = false)
+ String dst = null;
+
+ @Argument(index = 2, name = "type", description = "The type of tunnels,"
+ + " It includes MPLS, VLAN, VXLAN, GRE, ODUK, OCH", required = true, multiValued = false)
+ String type = null;
+
+ @Override
+ protected void execute() {
+ TunnelAdminService adminService = get(TunnelAdminService.class);
+ ProviderId producerName = new ProviderId("default",
+ "org.onosproject.provider.tunnel.default");
+ TunnelEndPoint srcPoint = null;
+ TunnelEndPoint dstPoint = null;
+ if ("MPLS".equals(type) || "VLAN".equals(type) || "VXLAN".equals(type) || "GRE".equals(type)) {
+ srcPoint = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(src));
+ dstPoint = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(dst));
+ } else if ("ODUK".equals(type) || "OCH".equals(type)) {
+ String[] srcArray = src.split("-");
+ String[] dstArray = dst.split("-");
+ srcPoint = new DefaultOpticalTunnelEndPoint(
+ producerName,
+ Optional.of(DeviceId
+ .deviceId(srcArray[0])),
+ Optional.of(PortNumber
+ .portNumber(srcArray[1])),
+ null,
+ OpticalTunnelEndPoint.Type.LAMBDA,
+ OpticalLogicId
+ .logicId(0),
+ true);
+ dstPoint = new DefaultOpticalTunnelEndPoint(
+ producerName,
+ Optional.of(DeviceId
+ .deviceId(dstArray[0])),
+ Optional.of(PortNumber
+ .portNumber(dstArray[1])),
+ null,
+ OpticalTunnelEndPoint.Type.LAMBDA,
+ OpticalLogicId
+ .logicId(0),
+ true);
+ } else {
+ print("Illegal tunnel type. Please input MPLS, VLAN, VXLAN, GRE, ODUK or OCH.");
+ return;
+ }
+
+ adminService.removeTunnels(srcPoint, dstPoint, producerName);
+ }
+
+}
diff --git a/cli/src/main/java/org/onosproject/cli/net/QueryTunnelCommand.java b/cli/src/main/java/org/onosproject/cli/net/QueryTunnelCommand.java
new file mode 100644
index 0000000..b4bc117
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/QueryTunnelCommand.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2014-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.cli.net;
+
+import java.util.Collection;
+import java.util.Optional;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onlab.packet.IpAddress;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.tunnel.DefaultOpticalTunnelEndPoint;
+import org.onosproject.net.tunnel.IpTunnelEndPoint;
+import org.onosproject.net.tunnel.OpticalLogicId;
+import org.onosproject.net.tunnel.OpticalTunnelEndPoint;
+import org.onosproject.net.tunnel.Tunnel;
+import org.onosproject.net.tunnel.TunnelEndPoint;
+import org.onosproject.net.tunnel.TunnelService;
+
+/**
+ * Supports for querying all tunnels by using IP address and optical as tunnel
+ * end point now. It's used by consumers.
+ */
+@Command(scope = "onos", name = "query-tunnels", description = "Supports for querying all tunnels by using IP address"
+ + " and optical as tunnel end point now."
+ + " It's used by consumers.")
+public class QueryTunnelCommand extends AbstractShellCommand {
+ @Argument(index = 0, name = "src", description = "Source tunnel point."
+ + " Only supports for IpTunnelEndPoint and OpticalTunnelEndPoint as end point now."
+ + " If deletess a ODUK or OCH type tunnel, the formatter of this argument is DeviceId-PortNumber."
+ + " Otherwise src means IP address.", required = true, multiValued = false)
+ String src = null;
+ @Argument(index = 1, name = "dst", description = "Destination tunnel point."
+ + " Only supports for IpTunnelEndPoint and OpticalTunnelEndPoint as end point now."
+ + " If deletess a ODUK or OCH type tunnel, the formatter of this argument is DeviceId-PortNumber."
+ + " Otherwise dst means IP address.", required = true, multiValued = false)
+ String dst = null;
+
+ @Argument(index = 2, name = "type", description = "The type of tunnels,"
+ + " It includes MPLS, VLAN, VXLAN, GRE, ODUK, OCH", required = true, multiValued = false)
+ String type = null;
+
+ private static final String FMT = "src=%s, dst=%s,"
+ + "type=%s, state=%s, producerName=%s, tunnelName=%s,"
+ + "groupId=%s";
+
+ @Override
+ protected void execute() {
+ TunnelService service = get(TunnelService.class);
+ ProviderId producerName = new ProviderId("default",
+ "org.onosproject.provider.tunnel.default");
+ TunnelEndPoint srcPoint = null;
+ TunnelEndPoint dstPoint = null;
+ if ("MPLS".equals(type) || "VLAN".equals(type) || "VXLAN".equals(type)
+ || "GRE".equals(type)) {
+ srcPoint = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(src));
+ dstPoint = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(dst));
+ } else if ("ODUK".equals(type) || "OCH".equals(type)) {
+ String[] srcArray = src.split("-");
+ String[] dstArray = dst.split("-");
+ srcPoint = new DefaultOpticalTunnelEndPoint(
+ producerName,
+ Optional.of(DeviceId
+ .deviceId(srcArray[0])),
+ Optional.of(PortNumber
+ .portNumber(srcArray[1])),
+ null,
+ OpticalTunnelEndPoint.Type.LAMBDA,
+ OpticalLogicId
+ .logicId(0),
+ true);
+ dstPoint = new DefaultOpticalTunnelEndPoint(
+ producerName,
+ Optional.of(DeviceId
+ .deviceId(dstArray[0])),
+ Optional.of(PortNumber
+ .portNumber(dstArray[1])),
+ null,
+ OpticalTunnelEndPoint.Type.LAMBDA,
+ OpticalLogicId
+ .logicId(0),
+ true);
+ } else {
+ print("Illegal tunnel type. Please input MPLS, VLAN, VXLAN, GRE, ODUK or OCH.");
+ return;
+ }
+ Collection<Tunnel> tunnelSet = service.queryTunnel(srcPoint, dstPoint);
+ for (Tunnel tunnel : tunnelSet) {
+ print(FMT, tunnel.src().toString(), tunnel.dst().toString(), tunnel.type(),
+ tunnel.state(), tunnel.providerId(), tunnel.tunnelName(),
+ tunnel.groupId());
+ }
+ }
+
+}
diff --git a/cli/src/main/java/org/onosproject/cli/net/QueryTunnelSubscriptionCommand.java b/cli/src/main/java/org/onosproject/cli/net/QueryTunnelSubscriptionCommand.java
new file mode 100644
index 0000000..c91dcce
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/QueryTunnelSubscriptionCommand.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014-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.cli.net;
+
+import java.util.Collection;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.DefaultApplicationId;
+import org.onosproject.net.tunnel.TunnelService;
+import org.onosproject.net.tunnel.TunnelSubscription;
+
+/**
+ * Query all tunnel subscriptions of consumer by consumer id.
+ * It's used by consumers.
+ */
+@Command(scope = "onos", name = "query-tunnel-subscriptions",
+ description = "Query all request orders of consumer by consumer id. It's used by consumers.")
+public class QueryTunnelSubscriptionCommand extends AbstractShellCommand {
+ @Argument(index = 0, name = "consumerId",
+ description = "consumer id means provider id",
+ required = true, multiValued = false)
+ String consumerId = null;
+ private static final String FMT = "appId=%s, src=%s, dst=%s,"
+ + "type=%s, tunnelId=%s";
+
+ @Override
+ protected void execute() {
+ TunnelService service = get(TunnelService.class);
+ ApplicationId applicationId = new DefaultApplicationId(1, consumerId);
+ Collection<TunnelSubscription> tunnelSet = service.queryTunnelSubscription(applicationId);
+ for (TunnelSubscription order : tunnelSet) {
+ print(FMT, order.consumerId(), order.src(), order.dst(),
+ order.type(), order.tunnelId());
+ }
+ }
+
+}
diff --git a/cli/src/main/java/org/onosproject/cli/net/ReturnTunnelCommand.java b/cli/src/main/java/org/onosproject/cli/net/ReturnTunnelCommand.java
new file mode 100644
index 0000000..c3111e8
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/ReturnTunnelCommand.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2014-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.cli.net;
+
+import java.util.Optional;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onlab.packet.IpAddress;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.DefaultApplicationId;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.tunnel.DefaultOpticalTunnelEndPoint;
+import org.onosproject.net.tunnel.IpTunnelEndPoint;
+import org.onosproject.net.tunnel.OpticalLogicId;
+import org.onosproject.net.tunnel.OpticalTunnelEndPoint;
+import org.onosproject.net.tunnel.TunnelEndPoint;
+import org.onosproject.net.tunnel.TunnelService;
+
+/**
+ * Returns all tunnels between specific source tunnel end point and specific
+ * destination tunnel end point. Supports for IP address and optical as tunnel
+ * end point now. It's used by consumers.
+ */
+@Command(scope = "onos", name = "return-tunnels",
+description = "Returns all tunnels between specific source tunnel end point and specific "
+ + " destination tunnel end point. Supports for IP address and optical as tunnel end point now."
+ + " It's used by consumers.")
+public class ReturnTunnelCommand extends AbstractShellCommand {
+ @Argument(index = 0, name = "consumerId", description = "consumer id means application id.",
+ required = true, multiValued = false)
+ String consumerId = null;
+ @Argument(index = 1, name = "src", description = "Source tunnel point."
+ + " Only supports for IpTunnelEndPoint and OpticalTunnelEndPoint as end point now."
+ + " If deletess a ODUK or OCH type tunnel, the formatter of this argument is DeviceId-PortNumber."
+ + " Otherwise src means IP address.", required = true, multiValued = false)
+ String src = null;
+ @Argument(index = 2, name = "dst", description = "Destination tunnel point."
+ + " Only supports for IpTunnelEndPoint and OpticalTunnelEndPoint as end point now."
+ + " If deletess a ODUK or OCH type tunnel, the formatter of this argument is DeviceId-PortNumber."
+ + " Otherwise dst means IP address.", required = true, multiValued = false)
+ String dst = null;
+
+ @Argument(index = 3, name = "type", description = "The type of tunnels,"
+ + " It includes MPLS, VLAN, VXLAN, GRE, ODUK, OCH", required = true, multiValued = false)
+ String type = null;
+
+ @Override
+ protected void execute() {
+ TunnelService service = get(TunnelService.class);
+ ApplicationId appId = new DefaultApplicationId(1, consumerId);
+ ProviderId producerName = new ProviderId("default",
+ "org.onosproject.provider.tunnel.default");
+ TunnelEndPoint srcPoint = null;
+ TunnelEndPoint dstPoint = null;
+ if ("MPLS".equals(type) || "VLAN".equals(type) || "VXLAN".equals(type)
+ || "GRE".equals(type)) {
+ srcPoint = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(src));
+ dstPoint = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(dst));
+ } else if ("ODUK".equals(type) || "OCH".equals(type)) {
+ String[] srcArray = src.split("-");
+ String[] dstArray = dst.split("-");
+ srcPoint = new DefaultOpticalTunnelEndPoint(
+ producerName,
+ Optional.of(DeviceId
+ .deviceId(srcArray[0])),
+ Optional.of(PortNumber
+ .portNumber(srcArray[1])),
+ null,
+ OpticalTunnelEndPoint.Type.LAMBDA,
+ OpticalLogicId
+ .logicId(0),
+ true);
+ dstPoint = new DefaultOpticalTunnelEndPoint(
+ producerName,
+ Optional.of(DeviceId
+ .deviceId(dstArray[0])),
+ Optional.of(PortNumber
+ .portNumber(dstArray[1])),
+ null,
+ OpticalTunnelEndPoint.Type.LAMBDA,
+ OpticalLogicId
+ .logicId(0),
+ true);
+ } else {
+ print("Illegal tunnel type. Please input MPLS, VLAN, VXLAN, GRE, ODUK or OCH.");
+ return;
+ }
+ service.returnTunnel(appId, srcPoint, dstPoint);
+ }
+
+}
diff --git a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index a5ab272..93afcd5 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -367,6 +367,22 @@
<command>
<action class="org.onosproject.cli.net.ApplyLabelResourceCommand"/>
</command>
+ <!-- tunnel commands -->
+ <command>
+ <action class="org.onosproject.cli.net.DeleteTunnelCommand"/>
+ </command>
+ <command>
+ <action class="org.onosproject.cli.net.BorrowTunnelCommand"/>
+ </command>
+ <command>
+ <action class="org.onosproject.cli.net.ReturnTunnelCommand"/>
+ </command>
+ <command>
+ <action class="org.onosproject.cli.net.QueryTunnelCommand"/>
+ </command>
+ <command>
+ <action class="org.onosproject.cli.net.QueryTunnelSubscriptionCommand"/>
+ </command>
</command-bundle>
<bean id="permAppNameCompleter" class="org.onosproject.cli.security.PermissionApplicationNameCompleter"/>