API for GRE (#1445)

* Add GRE VPP calls. Add GRE type and link to inteface message * add basic validation and support of create and delete operations for GRE * Rename things. Store addresses as net.IP * add GRE to interfaces dump * Add UNKNOWN to types of GRE tunnel * Support vpp1901 and vpp1908 * Test also removing of GRE tunnel
ligato · Sep 2, 2019 · 3814f0f · 3814f0f
1 parent d81386e
commit 3814f0f
Show file tree

Hide file tree

Showing 18 changed files with 1,888 additions and 121 deletions.
diff --git a/api/models/vpp/interfaces/interface.pb.go b/api/models/vpp/interfaces/interface.pb.go
diff --git a/api/models/vpp/interfaces/interface.proto b/api/models/vpp/interfaces/interface.proto
@@ -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.
@@ -97,6 +98,7 @@ message Interface {
         IPSecLink ipsec = 105;
         VmxNet3Link vmx_net3 = 106;
         BondLink bond = 107;
+        GreLink gre = 108;
     };
 };
 
@@ -226,3 +228,17 @@ message BondLink {
     }
     repeated BondedInterface bonded_interfaces = 12;
 }
+
+message GreLink {
+    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;
+}
diff --git a/plugins/vpp/binapi/vpp1901/gen.go b/plugins/vpp/binapi/vpp1901/gen.go
@@ -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

diff --git a/plugins/vpp/binapi/vpp1901/gre/gre.ba.go b/plugins/vpp/binapi/vpp1901/gre/gre.ba.go
diff --git a/plugins/vpp/binapi/vpp1904/gen.go b/plugins/vpp/binapi/vpp1904/gen.go
@@ -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