lib: move ip node above vrf node for config order

VRF static route commands adopt global static config if static config is
placed after a vrf context with no separator, workaround by always
writing static route config before vrf config

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/lib/command.c b/lib/command.c
index 2744061b5a1ed3b4a52fa67040cade0047d1dd58..e0701aa412bae391e41c7d462e0258a5ec82e420 100644 (file)
--- a/lib/command.c
+++ b/lib/command.c
@@ -85,6 +85,7 @@ const char *node_names[] = {
        "keychain",                 // KEYCHAIN_NODE,
        "keychain key",             // KEYCHAIN_KEY_NODE,
        "logical-router",          // LOGICALROUTER_NODE,
+       "static ip",                // IP_NODE,
        "vrf",                      // VRF_NODE,
        "interface",                // INTERFACE_NODE,
        "nexthop-group",            // NH_GROUP_NODE,
@@ -119,7 +120,6 @@ const char *node_names[] = {
        "ldp l2vpn",                // LDP_L2VPN_NODE,
        "ldp",                      // LDP_PSEUDOWIRE_NODE,
        "isis",                     // ISIS_NODE,
-       "static ip",                // IP_NODE,
        "ipv4 access list",      // ACCESS_NODE,
        "ipv4 prefix list",      // PREFIX_NODE,
        "ipv6 access list",      // ACCESS_IPV6_NODE,

diff --git a/lib/command.h b/lib/command.h
index f18de3417cae810bbe0df47f87d7614cf025bd42..9ba53e0907441176c639024b7c73ccc06c51fda2 100644 (file)
--- a/lib/command.h
+++ b/lib/command.h
@@ -85,6 +85,7 @@ enum node_type {
        KEYCHAIN_NODE,           /* Key-chain node. */
        KEYCHAIN_KEY_NODE,       /* Key-chain key node. */
        LOGICALROUTER_NODE,      /* Logical-Router node. */
+       IP_NODE,                 /* Static ip route node. */
        VRF_NODE,                /* VRF mode node. */
        INTERFACE_NODE,          /* Interface mode node. */
        NH_GROUP_NODE,           /* Nexthop-Group mode node. */
@@ -119,7 +120,6 @@ enum node_type {
        LDP_L2VPN_NODE,          /* LDP L2VPN node */
        LDP_PSEUDOWIRE_NODE,     /* LDP Pseudowire node */
        ISIS_NODE,               /* ISIS protocol mode */
-       IP_NODE,                 /* Static ip route node. */
        ACCESS_NODE,             /* Access list node. */
        PREFIX_NODE,             /* Prefix list node. */
        ACCESS_IPV6_NODE,       /* Access list node. */