VPP-61 Patch1/2 - Remove NSH from VPP

- Had issues with original patch and CSIT, breaking into
-- Makefile and API changes
-- Follow up patch removing NSH directory

Change-Id: I6c2f49a74d59b97ce4ea43799cc6f01f5cb1d5a2
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

diff --git a/vnet/etc/scripts/leftpeer/leftpeer-nsh.conf b/vnet/etc/scripts/leftpeer/leftpeer-nsh.conf
deleted file mode 100644 (file)
index 6397a38..0000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-nsh.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-comment { vpe_phase2 configuration }
-
-comment { local client facing interface on vlan 100  }
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-comment { tunnel to rightpeer on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-nsh gre tunnel src 6.0.3.1 dst 6.0.3.3 c1 1 c2 2 c3 3 c4 4 spi 1133 si 0 next-ip4
-set int ip address nsh_gre_tunnel0 6.0.4.1/24
-set int state nsh_gre_tunnel0 up
-
-nsh gre tunnel src 6.0.3.3 dst 6.0.3.1 c1 1 c2 2 c3 3 c4 4 spi 3311 si 0 next-ip4
-set int stat nsh_gre_tunnel1 up

diff --git a/vnet/etc/scripts/leftpeer/leftpeer-vxnsh.conf b/vnet/etc/scripts/leftpeer/leftpeer-vxnsh.conf
deleted file mode 100644 (file)
index 69bd9d9..0000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-vxnsh.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-comment { vpe_phase2 configuration }
-
-comment { local client facing interface on vlan 100  }
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-comment { tunnel to rightpeer on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-nsh vxlan tunnel src 6.0.3.1 dst 6.0.3.3 c1 1 c2 2 c3 3 c4 4 vni 11 spi 1133 si 0 next-ip4
-set int ip address nsh_vxlan_gpe_tunnel0 6.0.4.1/24
-set int state nsh_vxlan_gpe_tunnel0 up
-
-nsh vxlan tunnel src 6.0.3.3 dst 6.0.3.1 c1 1 c2 2 c3 3 c4 4 vni 33 spi 3311 si 0 next-ip4
-set int stat nsh_vxlan_gpe_tunnel1 up

diff --git a/vnet/etc/scripts/rightpeer/rightpeer-nsh.conf b/vnet/etc/scripts/rightpeer/rightpeer-nsh.conf
deleted file mode 100644 (file)
index 76c1203..0000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-nsh.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-comment { vpe_phase1d configuration }
-
-comment { local client facing interface }
-comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
-
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to leftpeer }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-nsh gre tunnel src 6.0.3.3 dst 6.0.3.1 c1 1 c2 2 c3 3 c4 4 spi 3311 si 0 next-ip4
-set int ip address nsh_gre_tunnel0 6.0.2.3/24
-set int state nsh_gre_tunnel0 up
-
-nsh gre tunnel src 6.0.3.1 dst 6.0.3.3 c1 1 c2 2 c3 3 c4 4 spi 1133 si 0 next-ip4
-set int state nsh_gre_tunnel1 up
-

diff --git a/vnet/etc/scripts/rightpeer/rightpeer-vxnsh.conf b/vnet/etc/scripts/rightpeer/rightpeer-vxnsh.conf
deleted file mode 100644 (file)
index 45b0b7e..0000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-vxnsh.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-comment { vpe_phase1d configuration }
-
-comment { local client facing interface }
-comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
-
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to leftpeer }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-nsh vxlan tunnel src 6.0.3.3 dst 6.0.3.1 c1 1 c2 2 c3 3 c4 4 vni 33 spi 3311 si 0 next-ip4
-set int ip address nsh_vxlan_gpe_tunnel0 6.0.2.3/24
-set int state nsh_vxlan_gpe_tunnel0 up
-
-nsh vxlan tunnel src 6.0.3.1 dst 6.0.3.3 c1 1 c2 2 c3 3 c4 4 vni 11 spi 1133 si 0 next-ip4
-set int state nsh_vxlan_gpe_tunnel1 up

diff --git a/vpp/api/custom_dump.c b/vpp/api/custom_dump.c
index ba41b1f..47c9f66 100644 (file)
--- a/vpp/api/custom_dump.c
+++ b/vpp/api/custom_dump.c
@@ -26,8 +26,6 @@
 #include <vnet/l2tp/l2tp.h>
 #include <vnet/l2/l2_input.h>
 #include <vnet/sr/sr_packet.h>
-//#include <vnet/nsh-gre/nsh_gre.h> //alagalah testing nsh-gre removal
-#include <vnet/nsh/nsh.h> //alagalah testing nsh-gre removal
 #include <vnet/vxlan-gpe/vxlan_gpe.h>
 #include <vlib/vlib.h>
 #include <vlib/unix/unix.h>

diff --git a/vpp/api/vpe.api b/vpp/api/vpe.api
index a61c260..021cd0c 100644 (file)
--- a/vpp/api/vpe.api
+++ b/vpp/api/vpe.api
@@ -2030,35 +2030,6 @@ manual_java define show_version_reply {
    u8 build_directory[256];
 };
 
-define nsh_gre_add_del_tunnel {
-    u32 client_index;
-    u32 context;
-    u32 src;
-    u32 dst;
-    u32 encap_vrf_id;
-    u32 decap_vrf_id;
-    u32 decap_next_index;
-    u8 tlv_len_in_words;
-    u8 is_add;
-    u8 ver_o_c;
-    u8 length;
-    u8 md_type;
-    u8 next_protocol;
-    /* in network byte order */
-    u32 spi_si;
-    u32 c1;
-    u32 c2;
-    u32 c3;
-    u32 c4;
-    u32 tlvs[0];
-};
-
-define nsh_gre_add_del_tunnel_reply {
-    u32 context;
-    i32 retval;
-    u32 sw_if_index;
-};
-
 /** \brief Vhost-user interface details structure (fix this)
     @param sw_if_index - index of the interface
     @param interface_name - name of interface
@@ -2157,29 +2128,6 @@ define vxlan_gpe_add_del_tunnel_reply {
     u32 sw_if_index;
 };
 
-define nsh_add_del_entry {
-    u32 client_index;
-    u32 context;
-    u8 tlv_len_in_words;
-    u8 is_add;
-    u8 ver_o_c;
-    u8 length;
-    u8 md_type;
-    u8 next_protocol;
-    /* in network byte order */
-    u32 nsp_nsi;
-    u32 c1;
-    u32 c2;
-    u32 c3;
-    u32 c4;
-    u32 tlvs[0];
-};
-
-define nsh_add_del_entry_reply {
-    u32 context;
-    i32 retval;
-    u32 sw_if_index;
-};
 
 /** \brief add or delete locator_set
     @param client_index - opaque cookie to identify the sender