2.6.0

cisco-ios.sublime-syntax

@@ -1352,6 +1352,23 @@ contexts:
       - include: pop_on_configure_terminal_context
 
   vrf:
+    - include: new_vrf_syntax
+    - include: old_vrf_syntax
+
+  old_vrf_syntax:
+    - match: '^\s*(ip)\s+(vrf)\s+(\S+)'
+      captures:
+        0: cisco.scope
+        1: variable.parameter
+        2: support.constant
+        3: string.unquoted
+      push:
+      - meta_content_scope: text.network.cisco.vrf
+      - include: vrf_address_family
+      - include: vrf_settings
+      - include: pop_on_configure_terminal_context
+
+  new_vrf_syntax:
     - match: '^\s*(vrf)\s+(definition)\s+(\S+)'
       captures:
         0: cisco.scope
@@ -1361,7 +1378,11 @@ contexts:
       push:
       - meta_content_scope: text.network.cisco.vrf
       - include: vrf_address_family
-      - match: >
+      - include: vrf_settings
+      - include: pop_on_configure_terminal_context
+
+  vrf_settings:
+      - match: |
           (?xi)
           ^\s*
           (?:
@@ -1376,7 +1397,6 @@ contexts:
           4: support.constant               # route-target
           5: entity.other.attribute-name    # route-target import/export/both
           6: constant.numeric               # route-target id
-      - include: pop_on_configure_terminal_context
 
 
   vrf_address_family:

docs/conf.py

@@ -56,7 +56,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.5.0'
+version = '2.6.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 

messages.json

@@ -4,4 +4,5 @@
     "2.2.0": "messages/2.2.0.md",
     "2.4.0": "messages/2.4.0.md",
     "2.5.0": "messages/2.5.0.md",
+    "2.6.0": "messages/2.6.0.md",
 }

messages/2.6.0.md

@@ -10,6 +10,8 @@
 
         - BGP Neighbor remote-as xxx shutdown
 
+        - Legacy "ip vrf xxx" syntax
+
 ## Bugfixes
 
 - Cisco IOS

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.0
+current_version = 2.6.0
 commit = False
 tag = False
 allow-dirty = True

tests/syntax_test_cisco_ios.cisco-ios

@@ -82,6 +82,13 @@ configure terminal
    deny ip any any
    permit icmp any any
 
+  ip vrf NAME
+    description management
+    rd 1.2.3.4:5
+    route-target export 1.2.3.4:5
+    route-target import 1.2.3.4:5
+  exit
+
   vrf definition NAME
     description management
     rd 1.2.3.4:5