*** ietf-access-control-list@2018-01-16.yang.orig	Mon Jan 22 10:16:17 2018
--- ietf-access-control-list@2018-01-16.yang	Mon Jan 22 13:09:06 2018
***************
*** 440,457 ****
  
              choice l4 {
                container tcp {
!                 if-feature match-on-tcp;
                  uses packet-fields:acl-tcp-header-fields;
!                   description
                      "Rule set that matches TCP headers.";
!               }
! 
                container udp {
!                 if-feature match-on-udp;
!                 uses packet-fields:acl-udp-header-fields;
!                 description
!                   "Rule set that matches UDP headers.";
!               }
  
                container icmp {
                  if-feature match-on-icmp;
--- 440,482 ----
  
              choice l4 {
                container tcp {
! 		container source-port-range-or-operator {
! 		   uses packet-fields:port-range-or-operator;
! 		      description
! 		        "Source port definition.";
!                 }			
! 		container destination-port-range-or-operator {
! 		   uses packet-fields:port-range-or-operator;
! 		   description
!  		     "Destination port definition.";
! 		}
! 		container tcp-all {
!                    if-feature match-on-tcp;
                  uses packet-fields:acl-tcp-header-fields;
!                    description
                      "Rule set that matches TCP headers.";
!                 }
! 	      	description "TCP matchable characteristics";
! 	      }
                container udp {
! 		container source-port-range-or-operator {
! 		   uses packet-fields:port-range-or-operator;
! 		      description
! 		        "Source port definition.";
!                 }			
! 		container destination-port-range-or-operator {
! 		   uses packet-fields:port-range-or-operator;
! 		   description
!  		     "Destination port definition.";
! 		}
! 		container udp-all {
!                    if-feature match-on-udp;
!                    uses packet-fields:acl-udp-header-fields;
!                    description
!                      "Rule set that matches UDP headers.";
!                 }
! 	      	description "UDP matchable characteristics";
! 	      }
  
                container icmp {
                  if-feature match-on-icmp;