ip link/addr: Add support for vrf keyword

Add vrf keyword to 'ip link' and 'ip addr' commands (common list code).

Allows:
1. Adding a link to a VRF
       $ ip link set NAME vrf NAME

   Removing a link from a VRF still uses 'ip link set NAME nomaster'

2. Showing links associated with a VRF:
       $ ip link show vrf NAME

3. List addresses associated with links in a VRF
       $ ip -br addr show vrf red

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 02bc9029d6b20b20a861e5cf435e03ed7039a527..88e966222e3d82fe37b2f8fba9e5f3171200310f 100644 (file)
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -80,7 +80,7 @@ static void usage(void)
        fprintf(stderr, "                            [ to PREFIX ] [ FLAG-LIST ] [ label LABEL ] [up]\n");
        fprintf(stderr, "       ip address [ show [ dev IFNAME ] [ scope SCOPE-ID ] [ master DEVICE ]\n");
        fprintf(stderr, "                         [ type TYPE ] [ to PREFIX ] [ FLAG-LIST ]\n");
-       fprintf(stderr, "                         [ label LABEL ] [up] ]\n");
+       fprintf(stderr, "                         [ label LABEL ] [up] [ vrf NAME ] ]\n");
        fprintf(stderr, "       ip address {showdump|restore}\n");
        fprintf(stderr, "IFADDR := PREFIX | ADDR peer PREFIX\n");
        fprintf(stderr, "          [ broadcast ADDR ] [ anycast ADDR ]\n");
@@ -1620,6 +1620,16 @@ static int ipaddr_list_flush_or_save(int argc, char **argv, int action)
                        if (!ifindex)
                                invarg("Device does not exist\n", *argv);
                        filter.master = ifindex;
+               } else if (strcmp(*argv, "vrf") == 0) {
+                       int ifindex;
+
+                       NEXT_ARG();
+                       ifindex = ll_name_to_index(*argv);
+                       if (!ifindex)
+                               invarg("Not a valid VRF name\n", *argv);
+                       if (!name_is_vrf(*argv))
+                               invarg("Not a valid VRF name\n", *argv);
+                       filter.master = ifindex;
                } else if (strcmp(*argv, "type") == 0) {
                        int soff;
 

diff --git a/ip/iplink.c b/ip/iplink.c
index b1f8a37922f5113f285894f80377dde3bc209a2c..f2a2e13cf0c5b6d32961ac446e4d3d1c269b9484 100644 (file)
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -82,11 +82,11 @@ void iplink_usage(void)
        fprintf(stderr, "                                  [ query_rss { on | off} ]\n");
        fprintf(stderr, "                                  [ state { auto | enable | disable} ] ]\n");
        fprintf(stderr, "                                  [ trust { on | off} ] ]\n");
-       fprintf(stderr, "                         [ master DEVICE ]\n");
+       fprintf(stderr, "                         [ master DEVICE ][ vrf NAME ]\n");
        fprintf(stderr, "                         [ nomaster ]\n");
        fprintf(stderr, "                         [ addrgenmode { eui64 | none | stable_secret | random } ]\n");
        fprintf(stderr, "                         [ protodown { on | off } ]\n");
-       fprintf(stderr, "       ip link show [ DEVICE | group GROUP ] [up] [master DEV] [type TYPE]\n");
+       fprintf(stderr, "       ip link show [ DEVICE | group GROUP ] [up] [master DEV] [vrf NAME] [type TYPE]\n");
 
        if (iplink_have_newlink()) {
                fprintf(stderr, "       ip link help [ TYPE ]\n");
@@ -603,6 +603,17 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
                                invarg("Device does not exist\n", *argv);
                        addattr_l(&req->n, sizeof(*req), IFLA_MASTER,
                                  &ifindex, 4);
+               } else if (strcmp(*argv, "vrf") == 0) {
+                       int ifindex;
+
+                       NEXT_ARG();
+                       ifindex = ll_name_to_index(*argv);
+                       if (!ifindex)
+                               invarg("Not a valid VRF name\n", *argv);
+                       if (!name_is_vrf(*argv))
+                               invarg("Not a valid VRF name\n", *argv);
+                       addattr_l(&req->n, sizeof(*req), IFLA_MASTER,
+                                 &ifindex, sizeof(ifindex));
                } else if (matches(*argv, "nomaster") == 0) {
                        int ifindex = 0;
 

diff --git a/man/man8/ip-address.8.in b/man/man8/ip-address.8.in
index 3cbe4181f7e36ea964ffeab6c9434f678ede2ac7..7cb9271731339d44bdcf364521bdf650dd5fc3a9 100644 (file)
--- a/man/man8/ip-address.8.in
+++ b/man/man8/ip-address.8.in
@@ -45,6 +45,8 @@ ip-address \- protocol address management
 .IR DEVICE " ] [ "
 .B  type
 .IR TYPE " ] [ "
+.B vrf
+.IR NAME " ] [ "
 .BR up " ] ]"
 
 .ti -8
@@ -279,6 +281,10 @@ is a usual shell style pattern.
 .BI master " DEVICE"
 only list interfaces enslaved to this master device.
 
+.TP
+.BI vrf " NAME "
+only list interfaces enslaved to this vrf.
+
 .TP
 .BI type " TYPE"
 only list interfaces of the given type.

diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index 375b4d081408ed086bbfca2a654e4a185e41081d..ad18f7555d0a50bcee4df76cb8caa81c204f6498 100644 (file)
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@ -154,6 +154,9 @@ ip-link \- network device configuration
 .br
 .RB "[ " nomaster " ]"
 .br
+.RB "[ " vrf
+.IR NAME " ]"
+.br
 .RB "[ " addrgenmode " { " eui64 " | " none " | " stable_secret " | " random " } ]"
 
 
@@ -167,6 +170,8 @@ ip-link \- network device configuration
 .IR DEVICE " ] ["
 .B type
 .IR TYPE " ]"
+.B vrf
+.IR NAME " ]"
 
 .ti -8
 .B ip link help
@@ -1255,6 +1260,11 @@ only display running interfaces.
 .I DEVICE
 specifies the master device which enslaves devices to show.
 
+.TP
+.BI vrf " NAME "
+.I NAME
+speficies the VRF which enslaves devices to show.
+
 .TP
 .BI type " TYPE "
 .I TYPE