[ONOS-1959][ONOS-2007][ONOS-2008][ONOS-2009][ONOS-2010][ONOS-2011][ONOS-2016][ONOS-2017][ONOS-2018]
1.fix bug in query subscription command in Tunnel management
2.add RemoveTunnelByIdCommand
3.add UpdateTunnelBandWithCommand
4.add QueryAllTunnelsCommand
5.add queryAllTunnels api in TunnelService and TunnelStore
6.store the Path of the tunnel in the store
7.remove to check parameters iif they are null in the construtors of
DefaultTunnel.e.g
8.add the method of querying in SB
9.Fix the bug that the src/dst end point of Vlan-type tunnel is the
instance of OpticalTunnelEndPoint
10. invert the verb-noun into noun-verb for tunnel commands and label
commands

Change-Id: I90378b37c2bc73b58e6f8f234f009d64f07f758e
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 d92129a..5fbe61c 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -338,40 +338,37 @@
         </command>
         
         <command>
-            <action class="org.onosproject.cli.net.GetGlobalLabelResourceCommand"/>
+            <action class="org.onosproject.cli.net.GlobalLabelCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.cli.net.GetLabelResourceCommand"/>
+            <action class="org.onosproject.cli.net.LabelResourceCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.cli.net.CreateGlobalLabelResourcePoolCommand"/>
+            <action class="org.onosproject.cli.net.GlobalLabelPoolCreateCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.cli.net.CreateLabelResourcePoolCommand"/>
+            <action class="org.onosproject.cli.net.LabelPoolCreateCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.cli.net.DestroyGlobalLabelResourcePoolCommand"/>
+            <action class="org.onosproject.cli.net.GlobalLabelPoolDestoryCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.cli.net.DestroyGlobalLabelResourcePoolCommand"/>
+            <action class="org.onosproject.cli.net.LabelPoolDestroyCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.cli.net.ReleaseGlobalLabelResourceCommand"/>
+            <action class="org.onosproject.cli.net.GlobalLabelReleaseCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.cli.net.ReleaseLabelResourceCommand"/>
+            <action class="org.onosproject.cli.net.LabelReleaseCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.cli.net.ApplyGlobalLabelResourceCommand"/>
+            <action class="org.onosproject.cli.net.GlobalLabelApplyCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.cli.net.ApplyLabelResourceCommand"/>
+            <action class="org.onosproject.cli.net.LabelApplyCommand"/>
         </command>
         <!-- tunnel commands -->
         <command>
-            <action class="org.onosproject.cli.net.TunnelDeleteCommand"/>
-        </command>
-        <command>
             <action class="org.onosproject.cli.net.TunnelBorrowCommand"/>
         </command>
         <command>