updates

heyglen · May 9, 2018 · daef935 · daef935
1 parent 67325a1
commit daef935
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 54 deletions.
diff --git a/cisco-nxos.sublime-syntax b/cisco-nxos.sublime-syntax
@@ -92,7 +92,7 @@ variables:
       (?:policy-map)|
       (?:port-channel)|
       (?:rmon)|
-      (?:route-map)|
+      (?:route-map\s+\S+\s+(permit|deny))|
       (?:router\s+)|
       (?:service)|
       (?:snmp-server)|
@@ -156,6 +156,7 @@ variables:
       (?:vrf)|
       (?:address-family)|
       (?:template\s+peer)|
+      (?:neighbor\s+\S+)|
       (?:{{configure_terminal_ctx_words}})
     )
   bgp_vrf_ctx_words: |
@@ -1215,24 +1216,35 @@ contexts:
         (?xi)
         (?:
           (next-hop-self)|
+          (?:(inherit)\s+(peer-policy)\s+(\S+)\s+(\d+))|
           (?:(inherit)\s+(peer)\s+(\S+))|
           (send-community)|
           (?:(maximum-prefix)\s+(\d+)(?:\s+(\d+))?(?:\s+(restart)\s+(\d+))?(?:\s+(warning-only))?)|
-          (soft-reconfiguration\s+inbound)
+          (soft-reconfiguration\s+inbound)|
+          (?:((?:prefix-list)|(?:route-map))\s+(\S+)\s+(in|out))|
+          (?:(bfd))
         )
       captures:
         1: support.constant              # Next-hop-self
-        2: support.constant              # Inherit peer policy
-        3: support.constant              # Inherit peer policy
-        4: string.unquoted               # Inherit peer policy
-        5: support.constant              # Send community
-        6: support.constant              # maximum-prefix
-        7: constant.numeric              # maximum-prefix number
-        8: constant.numeric              # maximum-prefix number threshold
-        9: support.constant              # maximum-prefix restart
-        10: constant.numeric             # maximum-prefix restart interval
-        11: support.constant             # maximum-prefix warning-only
-        12: support.constant             # soft-reconfiguration inbound
+        2: support.constant             # inherit
+        3: support.constant             # inherit peer-policy
+        4: string.unquoted              # inherit peer-policy name
+        5: constant.numeric              # inherit peer-policy name number
+        6: support.constant              # Inherit peer policy
+        7: support.constant              # Inherit peer policy
+        8: string.unquoted               # Inherit peer policy
+        9: support.constant              # Send community
+        10: support.constant              # maximum-prefix
+        11: constant.numeric              # maximum-prefix number
+        12: constant.numeric              # maximum-prefix number threshold
+        13: support.constant              # maximum-prefix restart
+        14: constant.numeric             # maximum-prefix restart interval
+        15: support.constant             # maximum-prefix warning-only
+        16: support.constant             # soft-reconfiguration inbound
+        17: support.constant             # prefix-list|route-map
+        18: string.unquoted              # prefix-list|route-map name
+        19: support.constant             # prefix-list|route-map name direction
+        20: support.constant             # bfd
 
   bgp_session_settings:
       - match: |
@@ -1286,7 +1298,7 @@ contexts:
     - match: '(neighbor)\s+({{ip}})'
       captures:
         0: cicso.scope
-        1: support.constant
+        1: variable.parameter
         2: constant.numeric
       push:
         - meta_content_scope: text.network.cisco.bgp.vrf.bgp_ipv4_address_family.neighbor

diff --git a/cisco/asa/asa.sublime-completions b/cisco/asa/asa.sublime-completions
@@ -1,39 +0,0 @@
-{
-    "scope": "text.network.cisco.asa text.network.cisco.configure_terminal & -(text.network.cisco.asa text.network.cisco.configure_terminal text.network.cisco) & -asa.acl_entry & -text.network.cisco.asa.access_list.incomplete & -text.nextwork.cisco.asa.object_group.incomplete & -text.network.cisco.partial",
-    "completions": [
-        "nameif ",
-        { 
-            "trigger": "terminal\twidth",
-            "contents": "terminal width ${1:511}"
-        },
-        { 
-            "trigger": "terminal\tpager",
-            "contents": "terminal pager ${1:0}"
-        },
-        { 
-            "trigger": "changeto\tcontext",
-            "contents": "changeto context ${1:name}$0"
-        },
-        { 
-            "trigger": "show\trun object-group", 
-            "contents": "show run object-group ${1:name}"
-        },
-        { 
-            "trigger": "write\tnet", 
-            "contents": "write net$0"
-        },
-        { 
-            "trigger": "changeto\tsystem", 
-            "contents": "changeto system$0"
-        },
-        { 
-            "trigger": "packet-tracer\ttcp",
-            "contents": "packet-tracer input ${1:inside} tcp ${2:1.2.3.4} 1024 ${3:1.2.3.4} ${4:443}\n$0"
-        },
-        { 
-            "trigger": "packet-tracer\tudp",
-            "contents": "packet-tracer input ${1:inside} udp ${2:1.2.3.4} 1024 ${3:1.2.3.4} ${4:161}\n$0"
-        },
-    ]
-}
-

diff --git a/messages/2.13.0.md b/messages/2.13.0.md
@@ -0,0 +1,17 @@
+# [2.13.0] - 2018-05-09
+
+## Added
+
+- Cisco NXOS
+
+  - Highlighting
+
+    - BGP address-family inherit peer-policy
+
+    - BGP bfd
+
+## Fixed
+
+  - Cisco NXOS
+
+    - Context incorrectly changed to config-t on route-map & neighbor statements in BGP
diff --git a/tests/syntax_test_cisco_nxos.cisco-nxos b/tests/syntax_test_cisco_nxos.cisco-nxos
@@ -185,6 +185,8 @@ router bgp 1
     maximum-prefix 1 2
     maximum-prefix 1 2 restart 3
     soft-reconfiguration inbound
+  neighbor 1.2.3.4
+    no shutdown
   address-family ipv4 unicast
     network 1.2.3.0/24
     network 1.2.3.0/24
@@ -195,7 +197,7 @@ router bgp 1
       password 3 secret_password
       next-hop-self
       no shutdown
-
+      route-map NAME out
   address-family ipv6 unicast
     neighbor ::
       inherit peer NAME
@@ -209,6 +211,8 @@ router bgp 1
     router-id 123
     log-neighbor-changes
     address-family ipv4 unicast
+      inherit peer-policy eBGP-policy 10
+      route-map Core-Metric-out out
       network 1.2.3.0/24
       network 1.2.3.0/24
       neighbor 1.2.3.4