From a9855ef839ab99d7e66b9dd8d706b14cc8cd77dd Mon Sep 17 00:00:00 2001
From: Ole Troan <ot@cisco.com>
Date: Wed, 2 May 2018 12:45:10 +0200
Subject: Flow: Rename IPFIX exporter.

Change-Id: I9363cf54b73f7cfd8622af6f1cb250438ea0d3b6
Signed-off-by: Ole Troan <ot@cisco.com>
---
 src/plugins/flowprobe/flowprobe.h              | 4 ++--
 src/plugins/ioam/analyse/ioam_summary_export.h | 2 +-
 src/plugins/ioam/export-common/ioam_export.h   | 2 +-
 src/plugins/ioam/ipfixcollector/node.c         | 2 +-
 src/plugins/ioam/udp-ping/udp_ping_export.c    | 2 +-
 src/plugins/nat/nat_ipfix_logging.c            | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/flowprobe/flowprobe.h b/src/plugins/flowprobe/flowprobe.h
index 02ee053c911..92c3f9063a3 100644
--- a/src/plugins/flowprobe/flowprobe.h
+++ b/src/plugins/flowprobe/flowprobe.h
@@ -23,8 +23,8 @@
 
 #include <vppinfra/hash.h>
 #include <vppinfra/error.h>
-#include <vnet/flow/flow_report.h>
-#include <vnet/flow/flow_report_classify.h>
+#include <vnet/ipfix-export/flow_report.h>
+#include <vnet/ipfix-export/flow_report_classify.h>
 #include <vppinfra/tw_timer_2t_1w_2048sl.h>
 
 /* Default timers in seconds */
diff --git a/src/plugins/ioam/analyse/ioam_summary_export.h b/src/plugins/ioam/analyse/ioam_summary_export.h
index b435506187d..1397f9e8bd4 100755
--- a/src/plugins/ioam/analyse/ioam_summary_export.h
+++ b/src/plugins/ioam/analyse/ioam_summary_export.h
@@ -16,7 +16,7 @@
 #define __included_ip6_ioam_flow_report_h__
 
 #include <ioam/analyse/ioam_analyse.h>
-#include <vnet/flow/flow_report.h>
+#include <vnet/ipfix-export/flow_report.h>
 
 #define foreach_ioam_ipfix_info_element           \
 _(ioamPacketSent, 5239, u32)                     \
diff --git a/src/plugins/ioam/export-common/ioam_export.h b/src/plugins/ioam/export-common/ioam_export.h
index 74347683e10..36d71d26716 100644
--- a/src/plugins/ioam/export-common/ioam_export.h
+++ b/src/plugins/ioam/export-common/ioam_export.h
@@ -22,7 +22,7 @@
 #include <vnet/ip/ip6_packet.h>
 #include <vnet/ip/ip6_hop_by_hop.h>
 #include <vnet/udp/udp.h>
-#include <vnet/flow/ipfix_packet.h>
+#include <vnet/ipfix-export/ipfix_packet.h>
 
 #include <vppinfra/pool.h>
 #include <vppinfra/hash.h>
diff --git a/src/plugins/ioam/ipfixcollector/node.c b/src/plugins/ioam/ipfixcollector/node.c
index fce997aedb7..ae8ed1e4092 100644
--- a/src/plugins/ioam/ipfixcollector/node.c
+++ b/src/plugins/ioam/ipfixcollector/node.c
@@ -18,7 +18,7 @@
 #include <vnet/pg/pg.h>
 #include <vppinfra/error.h>
 #include <ioam/ipfixcollector/ipfixcollector.h>
-#include <vnet/flow/ipfix_packet.h>
+#include <vnet/ipfix-export/ipfix_packet.h>
 
 #define foreach_ipfix_collector_error \
 _(PROCESSED, "Number of IP-Fix packets processed") \
diff --git a/src/plugins/ioam/udp-ping/udp_ping_export.c b/src/plugins/ioam/udp-ping/udp_ping_export.c
index 91cbb4bd157..2b3a4de11a4 100644
--- a/src/plugins/ioam/udp-ping/udp_ping_export.c
+++ b/src/plugins/ioam/udp-ping/udp_ping_export.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <vnet/flow/flow_report.h>
+#include <vnet/ipfix-export/flow_report.h>
 #include <ioam/analyse/ioam_summary_export.h>
 #include <vnet/api_errno.h>
 #include <ioam/udp-ping/udp_ping.h>
diff --git a/src/plugins/nat/nat_ipfix_logging.c b/src/plugins/nat/nat_ipfix_logging.c
index 70d8d6b1c62..b4b940e7f92 100644
--- a/src/plugins/nat/nat_ipfix_logging.c
+++ b/src/plugins/nat/nat_ipfix_logging.c
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <vnet/flow/flow_report.h>
+#include <vnet/ipfix-export/flow_report.h>
 #include <vlibmemory/api.h>
 #include <nat/nat_ipfix_logging.h>
 
-- 
cgit 1.2.3-korg