review comments

batfish · Nov 18, 2020 · eb25d43 · eb25d43
1 parent 8c13adb
commit eb25d43
Show file tree

Hide file tree

Showing 7 changed files with 149 additions and 262 deletions.
diff --git a/projects/batfish/src/main/antlr4/org/batfish/grammar/cisco_xr/CiscoXr_qos.g4 b/projects/batfish/src/main/antlr4/org/batfish/grammar/cisco_xr/CiscoXr_qos.g4
@@ -641,121 +641,82 @@ os_service
    SERVICE service_specifier NEWLINE
 ;
 
-pm_class
+pm_end_policy_map
 :
-   num = DEC? CLASS
-   (
-      TYPE
-      (
-         CONTROL_PLANE
-         | NETWORK_QOS
-         | PBR
-         | QOS
-         | QUEUING
-      ) name = variable_permissive
-      | name = variable_permissive
-   ) NEWLINE
-   (
-      pmc_null
-      | pmc_police
-      | pmc_service_policy
-   )*
+   END_POLICY_MAP NEWLINE
 ;
 
-pm_end_policy_map
+pm_type_accounting
 :
-   END_POLICY_MAP NEWLINE
+   TYPE ACCOUNTING mapname = variable NEWLINE
+   pm_type_null_tail*
 ;
 
-pmtcs_event
+pm_type_null_tail
 :
-   EVENT null_rest_of_line
-   (
-      pmtcse_class
-   )*
+     (
+         CLASS
+         | DESCRIPTION
+     )  null_rest_of_line
 ;
 
-pmtcse_class
+pm_type_control_subscriber
 :
-   CLASS
+   TYPE CONTROL SUBSCRIBER mapname = variable NEWLINE
    (
-      CLASS_DEFAULT
-      | TYPE CONTROL SUBSCRIBER classname = variable
-   )
-   pmtcsec_do?
-   NEWLINE
-   pmtcsec_tail*
+      pmtcs_event
+      | pm_type_null_tail
+   )*
 ;
 
-pm_null
+pm_type_pbr
 :
-   NO?
-   (
-      CIR
-      | DESCRIPTION
-   ) null_rest_of_line
+   TYPE PBR mapname = variable NEWLINE
+   pm_type_null_tail*
 ;
 
-pm_parameters
+pm_type_performance_traffic
 :
-   PARAMETERS NEWLINE
-   (
-      pmp_null
-   )*
+   TYPE PERFORMANCE_TRAFFIC mapname = variable NEWLINE
+   pm_type_null_tail*
 ;
 
-pm_tail
+pm_type_qos
 :
-  pm_class
-  | pm_null
-  | pm_parameters
+   (TYPE QOS)? mapname = variable NEWLINE
+   pm_type_null_tail*
 ;
 
-pmc_null
+pm_type_redirect
 :
-   NO?
-   (
-      BANDWIDTH
-      | CONGESTION_CONTROL
-      | DBL
-      | DROP
-      | FAIR_QUEUE
-      | INSPECT
-      | MTU
-      | PASS
-      | PAUSE
-      | PRIORITY
-      | QUEUE_BUFFERS
-      | QUEUE_LIMIT
-      | RANDOM_DETECT
-      | SET
-      | SHAPE
-      | TRUST
-      | USER_STATISTICS
-   ) null_rest_of_line
+   TYPE REDIRECT mapname = variable NEWLINE
+   pm_type_null_tail*
 ;
 
-pmc_police
+pm_type_traffic
 :
-   POLICE null_rest_of_line
-   (
-      pmcp_null
-   )*
+   TYPE TRAFFIC mapname = variable NEWLINE
+   pm_type_null_tail*
 ;
 
-pmc_service_policy
+pmtcs_event
 :
-   SERVICE_POLICY name = variable NEWLINE
+   EVENT null_rest_of_line
+   (
+      pmtcse_class
+   )*
 ;
 
-pmcp_null
+pmtcse_class
 :
-   NO?
+   CLASS
    (
-      CONFORM_ACTION
-      | EXCEED_ACTION
-      | VIOLATE_ACTION
-   ) null_rest_of_line
+      CLASS_DEFAULT
+      | TYPE CONTROL SUBSCRIBER classname = variable
+   )
+   pmtcsec_do?
+   NEWLINE
+   pmtcsec_tail*
 ;
 
 pmtcsec_do
@@ -769,32 +730,27 @@ pmtcsec_tail
 :
   DEC
   (
-     ACTIVATE DYNAMIC_TEMPLATE dtname = variable
-     | AUTHENTICATE
-     | AUTHORIZE
-     | DEACTIVATE
-     | DISCONNECT
-     | MONITOR
-     | SET_TIMER
-     | STOP_TIMER
-  ) null_rest_of_line
+     pmtcsec_activate
+     | pmtcsec_null
+  )
 ;
 
-pmp_null
+pmtcsec_activate
 :
-   NO?
-   (
-      ID_MISMATCH
-      | ID_RANDOMIZATION
-      | MESSAGE_LENGTH
-      | PROTOCOL_VIOLATION
-      | TCP_INSPECTION
-   ) null_rest_of_line
+  ACTIVATE DYNAMIC_TEMPLATE dtname = variable NEWLINE
 ;
 
-pmtcs_tail
+pmtcsec_null
 :
-  pmtcs_event
+  (
+   AUTHENTICATE
+   | AUTHORIZE
+   | DEACTIVATE
+   | DISCONNECT
+   | MONITOR
+   | SET_TIMER
+   | STOP_TIMER
+) null_rest_of_line
 ;
 
 qm_null
@@ -868,21 +824,13 @@ s_policy_map
 :
    POLICY_MAP
    (
-      mapname = variable NEWLINE pm_tail*
-      |
-      TYPE
-      (
-          CONTROL SUBSCRIBER mapname = variable NEWLINE pmtcs_tail
-          |
-          (
-              ACCOUNTING
-              | PBR
-              | PERFORMANCE_TRAFFIC
-              | QOS
-              | REDIRECT
-              | TRAFFIC
-          ) mapname = variable NEWLINE pm_tail*
-      )
+      pm_type_accounting
+      | pm_type_control_subscriber
+      | pm_type_pbr
+      | pm_type_performance_traffic
+      | pm_type_qos
+      | pm_type_redirect
+      | pm_type_traffic
    )
    pm_end_policy_map?
 ;