vtysh: remove exit-vrf for vtysh -m

How It's Made:

- vtysh -m is for frr-reload.py to know when a context ends. This is
  done by executing commands against the CLI graph, checking for walkup,
  and putting the appropriate context exit if walkup is necessary. Thus
  the default case for walking up from a vrf context is fine, and
  doesn't need a specific exit-vrf command. Remove that.

- exit-vrf needs to be explicitly printed at the end of vrf config
  printing. We already do this.

- vtysh's special snowflake config prettiness logic needs to know that
  exit-vrf goes with the vrf block and needs to be explicitly told not
  place this in alphabetical order in that block. We also already do
  this.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2018-04-12 16:44:03 -04:00
parent c319e19dbd
commit 371fdacc47

View File

@ -671,8 +671,6 @@ int vtysh_mark_file(const char *filename)
} else if ((prev_node == BGP_EVPN_VNI_NODE)
&& (tried == 1)) {
fprintf(outputfile, "exit-vni\n");
} else if (prev_node == VRF_NODE && (tried == 1)) {
fprintf(outputfile, "exit-vrf\n");
} else if ((prev_node == KEYCHAIN_KEY_NODE)
&& (tried == 1)) {
fprintf(outputfile, "exit\n");