Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add policy forwarding for next hop match and GUE encapsulation action #1203

Closed
wants to merge 14 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion release/models/aft/.spec.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
- name: openconfig-aft
docs:
- yang/aft/openconfig-aft.yang
- yang/aft/openconfig-aft-types.yang
- yang/aft/openconfig-aft-summary.yang
build:
- yang/network-instance/openconfig-network-instance.yang
Expand Down
24 changes: 12 additions & 12 deletions release/models/aft/openconfig-aft-common.yang
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ submodule openconfig-aft-common {
import openconfig-inet-types { prefix "oc-inet"; }
import openconfig-mpls-types { prefix "oc-mplst"; }
import openconfig-policy-types { prefix "oc-pol-types"; }
import openconfig-aft-types { prefix "oc-aftt"; }
import openconfig-types { prefix oc-types; }
import openconfig-evpn-types { prefix "oc-evpn-types"; }

organization
Expand Down Expand Up @@ -303,7 +303,7 @@ submodule openconfig-aft-common {
}

container gre {
when "../state/type = 'oc-aftt:GRE'";
when "../state/type = 'oc-types:GRE'";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since there is a relocation of types to a separate model - the openconfig-version and revision must be updated to reflect this backwards incompatible change

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, but I don't see why we need to make this change. Why not leave these in AFT types?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The next PR from @danameme will use them in policy-forwarding

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's used in policy-forwarding in this same PR.

description
"Container of nodes for GRE encapsulation.";

Expand All @@ -316,7 +316,7 @@ submodule openconfig-aft-common {
}

container ipv4 {
when "../state/type = 'oc-aftt:IPV4'";
when "../state/type = 'oc-types:IPV4'";
description
"Container of nodes for UDP in IPv4 encapsulation. When this
container is used, an IPv4 packet with no transport header
Expand All @@ -331,7 +331,7 @@ submodule openconfig-aft-common {
}

container ipv6 {
when "../state/type = 'oc-aftt:IPV6'";
when "../state/type = 'oc-types:IPV6'";
description
"Container of nodes for UDP in IPv6 encapsulation. When this
container is used, an IPv6 packet with no transport header
Expand All @@ -346,7 +346,7 @@ submodule openconfig-aft-common {
}

container mpls {
when "../state/type = 'oc-aftt:MPLS'";
when "../state/type = 'oc-types:MPLS'";
description
"Container of nodes for MPLS encapsulation.";

Expand All @@ -359,7 +359,7 @@ submodule openconfig-aft-common {
}

container udp-v4 {
when "../state/type = 'oc-aftt:UDPV4'";
when "../state/type = 'oc-types:UDPV4'";
description
"Container of nodes for UDP in IPv4 encapsulation. When this
container is used, an IPv4 header with a UDP header is added
Expand All @@ -375,7 +375,7 @@ submodule openconfig-aft-common {
}

container udp-v6 {
when "../state/type = 'oc-aftt:UDPV6'";
when "../state/type = 'oc-types:UDPV6'";
description
"Container of nodes for UDP in IPv6 encapsulation. When this
container is used, an IPv6 header with a UDP header is added
Expand All @@ -391,7 +391,7 @@ submodule openconfig-aft-common {
}

container vxlan {
when "../state/type = 'oc-aftt:VXLAN'";
when "../state/type = 'oc-types:VXLAN'";
description
"Container of nodes for VXLAN encapsulation.";

Expand Down Expand Up @@ -422,7 +422,7 @@ submodule openconfig-aft-common {
}

leaf type {
type oc-aftt:encapsulation-header-type;
type oc-types:encapsulation-header-type;
description
"Defines which type of packet header should be used.";
}
Expand Down Expand Up @@ -571,7 +571,7 @@ submodule openconfig-aft-common {
}

leaf encapsulate-header {
type oc-aftt:encapsulation-header-type;
type oc-types:encapsulation-header-type;
description
"When forwarding a packet to the specified next-hop the local
system performs an encapsulation of the packet - adding the
Expand All @@ -584,7 +584,7 @@ submodule openconfig-aft-common {
}

leaf decapsulate-header {
type oc-aftt:encapsulation-header-type;
type oc-types:encapsulation-header-type;
description
"When forwarding a packet to the specified next-hop, the local
system performs a decapsulation of the packet - removing the
Expand Down Expand Up @@ -774,7 +774,7 @@ submodule openconfig-aft-common {
uses aft-common-install-protocol;

leaf decapsulate-header {
type oc-aftt:encapsulation-header-type;
type oc-types:encapsulation-header-type;
description
"When forwarding a packet to the specified next-hop, the local
system performs a decapsulation of the packet - removing the
Expand Down
107 changes: 0 additions & 107 deletions release/models/aft/openconfig-aft-types.yang

This file was deleted.

Loading
Loading