zebra: remove redundant DEFUNs for labeled static routes

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

1 files changed, 1 insertions, 598 deletions

diff --git a/zebra/zebra_mpls_vty.c b/zebra/zebra_mpls_vty.c
index ed34831f8f..9d100bb7d0 100644
--- a/zebra/zebra_mpls_vty.c
+++ b/zebra/zebra_mpls_vty.c
@@ -283,570 +283,6 @@ DEFUN (no_mpls_label_bind,
 	return zebra_mpls_bind(vty, 0, argv[4]->arg, NULL);
 }
 
-/* Static route configuration.  */
-DEFUN (ip_route_label,
-       ip_route_label_cmd,
-       "ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg, NULL,
-				 argv[3]->arg, NULL, NULL, NULL, NULL,
-				 argv[5]->arg);
-}
-
-DEFUN (ip_route_tag_label,
-       ip_route_tag_label_cmd,
-       "ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> tag (1-4294967295) label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg, NULL,
-				 argv[3]->arg, NULL, argv[5]->arg, NULL, NULL,
-				 argv[7]->arg);
-}
-
-/* Mask as A.B.C.D format.  */
-DEFUN (ip_route_mask_label,
-       ip_route_mask_label_cmd,
-       "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg,
-				 argv[3]->arg, argv[4]->arg, NULL, NULL, NULL,
-				 NULL, argv[6]->arg);
-}
-
-DEFUN (ip_route_mask_tag_label,
-       ip_route_mask_tag_label_cmd,
-       "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> tag (1-4294967295) label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg,
-				 argv[3]->arg, argv[4]->arg, NULL, argv[6]->arg,
-				 NULL, NULL, argv[8]->arg);
-}
-
-/* Distance option value.  */
-DEFUN (ip_route_distance_label,
-       ip_route_distance_label_cmd,
-       "ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> (1-255) label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Distance value for this route\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg, NULL,
-				 argv[3]->arg, NULL, NULL, argv[4]->arg, NULL,
-				 argv[6]->arg);
-}
-
-DEFUN (ip_route_tag_distance_label,
-       ip_route_tag_distance_label_cmd,
-       "ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> tag (1-4294967295) (1-255) label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       "Distance value for this route\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg, NULL,
-				 argv[3]->arg, NULL, argv[5]->arg, argv[6]->arg,
-				 NULL, argv[8]->arg);
-}
-
-DEFUN (ip_route_mask_distance_label,
-       ip_route_mask_distance_label_cmd,
-       "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> (1-255) label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Distance value for this route\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg,
-				 argv[3]->arg, argv[4]->arg, NULL, NULL,
-				 argv[5]->arg, NULL, argv[7]->arg);
-}
-
-DEFUN (ip_route_mask_tag_distance_label,
-       ip_route_mask_tag_distance_label_cmd,
-       "ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> tag (1-4294967295) (1-255) label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       "Distance value for this route\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg,
-				 argv[3]->arg, argv[4]->arg, NULL, argv[6]->arg,
-				 argv[7]->arg, NULL, argv[9]->arg);
-}
-
-DEFUN (no_ip_route_label,
-       no_ip_route_label_cmd,
-       "no ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg, NULL,
-				 argv[4]->arg, NULL, NULL, NULL, NULL,
-				 argv[6]->arg);
-}
-
-DEFUN (no_ip_route_tag_label,
-       no_ip_route_tag_label_cmd,
-       "no ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> tag (1-4294967295) label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Tag of this route\n"
-       "Tag value\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg, NULL,
-				 argv[4]->arg, NULL, argv[6]->arg, NULL, NULL,
-				 argv[8]->arg);
-}
-
-DEFUN (no_ip_route_mask_label,
-       no_ip_route_mask_label_cmd,
-       "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg,
-				 argv[4]->arg, argv[5]->arg, NULL, NULL, NULL,
-				 NULL, argv[7]->arg);
-}
-
-DEFUN (no_ip_route_mask_tag_label,
-       no_ip_route_mask_tag_label_cmd,
-       "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> tag (1-4294967295) label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Tag of this route\n"
-       "Tag value\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg,
-				 argv[4]->arg, argv[5]->arg, NULL, argv[7]->arg,
-				 NULL, NULL, argv[9]->arg);
-}
-
-DEFUN (no_ip_route_distance_label,
-       no_ip_route_distance_label_cmd,
-       "no ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> (1-255) label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Distance value for this route\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg, NULL,
-				 argv[4]->arg, NULL, NULL, argv[5]->arg, NULL,
-				 argv[7]->arg);
-}
-
-DEFUN (no_ip_route_tag_distance_label,
-       no_ip_route_tag_distance_label_cmd,
-       "no ip route A.B.C.D/M <A.B.C.D|INTERFACE|null0> tag (1-4294967295) (1-255) label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Tag of this route\n"
-       "Tag value\n"
-       "Distance value for this route\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg, NULL,
-				 argv[4]->arg, NULL, argv[6]->arg, argv[7]->arg,
-				 NULL, argv[9]->arg);
-}
-
-DEFUN (no_ip_route_mask_distance_label,
-       no_ip_route_mask_distance_label_cmd,
-       "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> (1-255) label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Distance value for this route\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg,
-				 argv[4]->arg, argv[5]->arg, NULL, NULL,
-				 argv[6]->arg, NULL, argv[8]->arg);
-}
-
-DEFUN (no_ip_route_mask_tag_distance_label,
-       no_ip_route_mask_tag_distance_label_cmd,
-       "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> tag (1-4294967295) (1-255) label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Tag of this route\n"
-       "Tag value\n"
-       "Distance value for this route\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg,
-				 argv[4]->arg, argv[5]->arg, NULL, argv[7]->arg,
-				 argv[8]->arg, NULL, argv[10]->arg);
-}
-
-DEFUN (ipv6_route_label,
-       ipv6_route_label_cmd,
-       "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg, NULL,
-				NULL, NULL, NULL, NULL, argv[5]->arg);
-}
-
-DEFUN (ipv6_route_tag_label,
-       ipv6_route_tag_label_cmd,
-       "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> tag (1-4294967295) label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg, NULL,
-				NULL, argv[5]->arg, NULL, NULL, argv[7]->arg);
-}
-
-DEFUN (ipv6_route_ifname_label,
-       ipv6_route_ifname_label_cmd,
-       "ipv6 route X:X::X:X/M X:X::X:X INTERFACE label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg,
-				argv[4]->arg, NULL, NULL, NULL, NULL,
-				argv[6]->arg);
-}
-DEFUN (ipv6_route_ifname_tag_label,
-       ipv6_route_ifname_tag_label_cmd,
-       "ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag (1-4294967295) label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg,
-				argv[4]->arg, NULL, argv[6]->arg, NULL, NULL,
-				argv[8]->arg);
-}
-
-DEFUN (ipv6_route_pref_label,
-       ipv6_route_pref_label_cmd,
-       "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> (1-255) label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Distance value for this prefix\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg, NULL,
-				NULL, NULL, argv[4]->arg, NULL, argv[6]->arg);
-}
-
-DEFUN (ipv6_route_pref_tag_label,
-       ipv6_route_pref_tag_label_cmd,
-       "ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> tag (1-4294967295) (1-255) label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       "Distance value for this prefix\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg, NULL,
-				NULL, argv[5]->arg, argv[6]->arg, NULL,
-				argv[8]->arg);
-}
-
-DEFUN (ipv6_route_ifname_pref_label,
-       ipv6_route_ifname_pref_label_cmd,
-       "ipv6 route X:X::X:X/M X:X::X:X INTERFACE (1-255) label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Distance value for this prefix\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg,
-				argv[4]->arg, NULL, NULL, argv[5]->arg, NULL,
-				argv[7]->arg);
-}
-
-DEFUN (ipv6_route_ifname_pref_tag_label,
-       ipv6_route_ifname_pref_tag_label_cmd,
-       "ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag (1-4294967295) (1-255) label WORD",
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       "Distance value for this prefix\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg,
-				argv[4]->arg, NULL, argv[6]->arg, argv[7]->arg,
-				NULL, argv[9]->arg);
-}
-
-DEFUN (no_ipv6_route_label,
-       no_ipv6_route_label_cmd,
-       "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg, NULL,
-				NULL, NULL, NULL, NULL, argv[6]->arg);
-}
-
-DEFUN (no_ipv6_route_tag_label,
-       no_ipv6_route_tag_label_cmd,
-       "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> tag (1-4294967295) label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg, NULL,
-				NULL, argv[6]->arg, NULL, NULL, argv[8]->arg);
-}
-
-DEFUN (no_ipv6_route_ifname_label,
-       no_ipv6_route_ifname_label_cmd,
-       "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg,
-				argv[5]->arg, NULL, NULL, NULL, NULL,
-				argv[7]->arg);
-}
-
-DEFUN (no_ipv6_route_ifname_tag_label,
-       no_ipv6_route_ifname_tag_label_cmd,
-       "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag (1-4294967295) label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg,
-				argv[5]->arg, NULL, argv[7]->arg, NULL, NULL,
-				argv[9]->arg);
-}
-
-DEFUN (no_ipv6_route_pref_label,
-       no_ipv6_route_pref_label_cmd,
-       "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> (1-255) label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Distance value for this prefix\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg, NULL,
-				NULL, NULL, argv[5]->arg, NULL, argv[7]->arg);
-}
-
-DEFUN (no_ipv6_route_pref_tag_label,
-       no_ipv6_route_pref_tag_label_cmd,
-       "no ipv6 route X:X::X:X/M <X:X::X:X|INTERFACE> tag (1-4294967295) (1-255) label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       "Distance value for this prefix\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg, NULL,
-				NULL, argv[6]->arg, argv[7]->arg, NULL,
-				argv[9]->arg);
-}
-
-DEFUN (no_ipv6_route_ifname_pref_label,
-       no_ipv6_route_ifname_pref_label_cmd,
-       "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (1-255) label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Distance value for this prefix\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg,
-				argv[5]->arg, NULL, NULL, argv[6]->arg, NULL,
-				argv[8]->arg);
-}
-
-DEFUN (no_ipv6_route_ifname_pref_tag_label,
-       no_ipv6_route_ifname_pref_tag_label_cmd,
-       "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag (1-4294967295) (1-255) label WORD",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       "Distance value for this prefix\n"
-       MPLS_LABEL_HELPSTR)
-{
-	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg,
-				argv[5]->arg, NULL, argv[7]->arg, argv[8]->arg,
-				NULL, argv[10]->arg);
-}
-
 /* MPLS LSP configuration write function. */
 static int zebra_mpls_config(struct vty *vty)
 {
@@ -1024,44 +460,11 @@ void zebra_mpls_vty_init(void)
 
 	install_node(&mpls_node, zebra_mpls_config);
 
-	install_element(CONFIG_NODE, &ip_route_label_cmd);
-	install_element(CONFIG_NODE, &ip_route_tag_label_cmd);
-	install_element(CONFIG_NODE, &ip_route_mask_label_cmd);
-	install_element(CONFIG_NODE, &ip_route_mask_tag_label_cmd);
-	install_element(CONFIG_NODE, &no_ip_route_label_cmd);
-	install_element(CONFIG_NODE, &no_ip_route_tag_label_cmd);
-	install_element(CONFIG_NODE, &no_ip_route_mask_label_cmd);
-	install_element(CONFIG_NODE, &no_ip_route_mask_tag_label_cmd);
-	install_element(CONFIG_NODE, &ip_route_distance_label_cmd);
-	install_element(CONFIG_NODE, &ip_route_tag_distance_label_cmd);
-	install_element(CONFIG_NODE, &ip_route_mask_distance_label_cmd);
-	install_element(CONFIG_NODE, &ip_route_mask_tag_distance_label_cmd);
-	install_element(CONFIG_NODE, &no_ip_route_distance_label_cmd);
-	install_element(CONFIG_NODE, &no_ip_route_tag_distance_label_cmd);
-	install_element(CONFIG_NODE, &no_ip_route_mask_distance_label_cmd);
-	install_element(CONFIG_NODE, &no_ip_route_mask_tag_distance_label_cmd);
-
-	install_element(CONFIG_NODE, &ipv6_route_label_cmd);
-	install_element(CONFIG_NODE, &ipv6_route_ifname_label_cmd);
-	install_element(CONFIG_NODE, &no_ipv6_route_label_cmd);
-	install_element(CONFIG_NODE, &no_ipv6_route_ifname_label_cmd);
-	install_element(CONFIG_NODE, &ipv6_route_pref_label_cmd);
-	install_element(CONFIG_NODE, &ipv6_route_ifname_pref_label_cmd);
-	install_element(CONFIG_NODE, &no_ipv6_route_pref_label_cmd);
-	install_element(CONFIG_NODE, &no_ipv6_route_ifname_pref_label_cmd);
-	install_element(CONFIG_NODE, &ipv6_route_tag_label_cmd);
-	install_element(CONFIG_NODE, &ipv6_route_ifname_tag_label_cmd);
-	install_element(CONFIG_NODE, &ipv6_route_pref_tag_label_cmd);
-	install_element(CONFIG_NODE, &ipv6_route_ifname_pref_tag_label_cmd);
-	install_element(CONFIG_NODE, &no_ipv6_route_tag_label_cmd);
-	install_element(CONFIG_NODE, &no_ipv6_route_ifname_tag_label_cmd);
-	install_element(CONFIG_NODE, &no_ipv6_route_pref_tag_label_cmd);
-	install_element(CONFIG_NODE, &no_ipv6_route_ifname_pref_tag_label_cmd);
-
 	install_element(CONFIG_NODE, &mpls_transit_lsp_cmd);
 	install_element(CONFIG_NODE, &no_mpls_transit_lsp_cmd);
 	install_element(CONFIG_NODE, &no_mpls_transit_lsp_out_label_cmd);
 	install_element(CONFIG_NODE, &no_mpls_transit_lsp_all_cmd);
+
 	install_element(CONFIG_NODE, &mpls_label_bind_cmd);
 	install_element(CONFIG_NODE, &no_mpls_label_bind_cmd);