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.

Sign up for GitHub

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

Jump to bottom

API for GRE #1445

Merged
merged 8 commits into from
Sep 2, 2019
Merged

API for GRE #1445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d8aa75f
Add GRE VPP calls. Add GRE type and link to inteface message
rewenset Aug 23, 2019
922d5dd
add basic validation and support of create and delete operations for GRE
rewenset Aug 23, 2019
cd0dc98
Merge dev. Fix conflicts
rewenset Aug 23, 2019
0949292
Rename things. Store addresses as net.IP
rewenset Aug 23, 2019
9a5719c
add GRE to interfaces dump
rewenset Aug 27, 2019
4832a99
Add UNKNOWN to types of GRE tunnel
rewenset Aug 28, 2019
e1a973e
Support vpp1901 and vpp1908
rewenset Aug 28, 2019
103def0
Test also removing of GRE tunnel
rewenset Aug 29, 2019
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
390 changes: 269 additions & 121 deletions api/models/vpp/interfaces/interface.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions api/models/vpp/interfaces/interface.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ message Interface {
IPSEC_TUNNEL = 8;
VMXNET3_INTERFACE = 9;
BOND_INTERFACE = 10;
GRE_TUNNEL = 11;
};

// Name is mandatory field representing logical name for the interface.
Expand Down Expand Up @@ -97,6 +98,7 @@ message Interface {
IPSecLink ipsec = 105;
VmxNet3Link vmx_net3 = 106;
BondLink bond = 107;
GreLink gre = 108;
};
};

Expand Down Expand Up @@ -226,3 +228,17 @@ message BondLink {
}
repeated BondedInterface bonded_interfaces = 12;
}

message GreLink {
ondrej-fabry marked this conversation as resolved.
Show resolved Hide resolved
enum Type {
UNKNOWN = 0;
L3 = 1; // L3 GRE (i.e. this tunnel is in L3 mode)
TEB = 2; // Transparent Ethernet Bridging - the tunnel is in L2 mode
ERSPAN = 3; // ERSPAN - the tunnel is for port mirror SPAN output
};
Type tunnel_type = 1;
string src_addr = 2;
string dst_addr = 3;
uint32 outer_fib_id = 4;
uint32 session_id = 5;
}
1 change: 1 addition & 0 deletions plugins/vpp/binapi/vpp1901/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ package vpp1901
//go:generate binapi-generator --input-file=/usr/share/vpp/api/bfd.api.json
//go:generate binapi-generator --input-file=/usr/share/vpp/api/bond.api.json
//go:generate binapi-generator --input-file=/usr/share/vpp/api/dhcp.api.json
//go:generate binapi-generator --input-file=/usr/share/vpp/api/gre.api.json
//go:generate binapi-generator --input-file=/usr/share/vpp/api/interface.api.json
//go:generate binapi-generator --input-file=/usr/share/vpp/api/ip.api.json
//go:generate binapi-generator --input-file=/usr/share/vpp/api/ipsec.api.json
Expand Down
182 changes: 182 additions & 0 deletions plugins/vpp/binapi/vpp1901/gre/gre.ba.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions plugins/vpp/binapi/vpp1904/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package vpp1904
//go:generate binapigen --input-file=/usr/share/vpp/api/core/bfd.api.json
//go:generate binapigen --input-file=/usr/share/vpp/api/core/bond.api.json
//go:generate binapigen --input-file=/usr/share/vpp/api/core/dhcp.api.json
//go:generate binapigen --input-file=/usr/share/vpp/api/core/gre.api.json
//go:generate binapigen --input-file=/usr/share/vpp/api/core/interface.api.json
//go:generate binapigen --input-file=/usr/share/vpp/api/core/ip.api.json
//go:generate binapigen --input-file=/usr/share/vpp/api/core/ipsec.api.json
Expand Down
Loading