tunnel: Common types for IP tunnels

Type: refactor

Signed-off-by: Neale Ranns <nranns@cisco.com>
Change-Id: I18dcdb7af3e327f6cacdbcb1e52b89f13d6ba6e2
diff --git a/test/test_gre.py b/test/test_gre.py
index f4b4ee2..f8c4100 100644
--- a/test/test_gre.py
+++ b/test/test_gre.py
@@ -1014,8 +1014,8 @@
             gre_if = VppGreInterface(self,
                                      itf.local_ip4,
                                      "0.0.0.0",
-                                     mode=(VppEnum.vl_api_gre_tunnel_mode_t.
-                                           GRE_API_TUNNEL_MODE_MP))
+                                     mode=(VppEnum.vl_api_tunnel_mode_t.
+                                           TUNNEL_API_MODE_MP))
             gre_if.add_vpp_config()
             gre_if.admin_up()
             gre_if.config_ip4()
@@ -1117,8 +1117,8 @@
             gre_if = VppGreInterface(self,
                                      itf.local_ip6,
                                      "::",
-                                     mode=(VppEnum.vl_api_gre_tunnel_mode_t.
-                                           GRE_API_TUNNEL_MODE_MP))
+                                     mode=(VppEnum.vl_api_tunnel_mode_t.
+                                           TUNNEL_API_MODE_MP))
             gre_if.add_vpp_config()
             gre_if.admin_up()
             gre_if.config_ip6()