Flow: Rename IPFIX exporter.

Change-Id: I9363cf54b73f7cfd8622af6f1cb250438ea0d3b6
Signed-off-by: Ole Troan <ot@cisco.com>

diff --git a/src/plugins/flowprobe/flowprobe.h b/src/plugins/flowprobe/flowprobe.h
index 02ee053..92c3f90 100644 (file)
--- 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 b435506..1397f9e 100755 (executable)
--- 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 7434768..36d71d2 100644 (file)
--- 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 fce997a..ae8ed1e 100644 (file)
--- 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 91cbb4b..2b3a4de 100644 (file)
--- 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 70d8d6b..b4b940e 100644 (file)
--- 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>
 

diff --git a/src/vnet.am b/src/vnet.am
index 058948d..adf9339 100644 (file)
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -828,26 +828,26 @@ API_FILES += vnet/srmpls/sr_mpls.api
 # IPFIX / netflow v10
 ########################################
 libvnet_la_SOURCES +=                          \
- vnet/flow/flow_report.c                       \
- vnet/flow/flow_api.c
+ vnet/ipfix-export/flow_report.c                       \
+ vnet/ipfix-export/flow_api.c
 
 nobase_include_HEADERS +=                      \
- vnet/flow/flow_report.h                       \
- vnet/flow/ipfix_info_elements.h               \
- vnet/flow/ipfix_packet.h                      \
- vnet/flow/flow.api.h
+ vnet/ipfix-export/flow_report.h                       \
+ vnet/ipfix-export/ipfix_info_elements.h               \
+ vnet/ipfix-export/ipfix_packet.h                      \
+ vnet/ipfix-export/ipfix_export.api.h
 
-API_FILES += vnet/flow/flow.api
+API_FILES += vnet/ipfix-export/ipfix_export.api
 
 ########################################
 # IPFIX classify code
 ########################################
 
 libvnet_la_SOURCES +=                          \
-  vnet/flow/flow_report_classify.c
+  vnet/ipfix-export/flow_report_classify.c
 
 nobase_include_HEADERS +=                      \
-  vnet/flow/flow_report_classify.h
+  vnet/ipfix-export/flow_report_classify.h
 
 ########################################
 # lawful intercept

diff --git a/src/vnet/flow/flow_api.c b/src/vnet/ipfix-export/flow_api.c
similarity index 98%
rename from src/vnet/flow/flow_api.c
rename to src/vnet/ipfix-export/flow_api.c
index d1eb2c0..e6446ef 100644 (file)
--- a/src/vnet/flow/flow_api.c
+++ b/src/vnet/ipfix-export/flow_api.c
@@ -24,8 +24,8 @@
 #include <vnet/api_errno.h>
 
 #include <vnet/fib/fib_table.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 <vnet/vnet_msg_enum.h>
 
@@ -358,7 +358,7 @@ static void
 setup_message_id_table (api_main_t * am)
 {
 #define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_flow;
+  foreach_vl_msg_name_crc_ipfix_export;
 #undef _
 }
 

diff --git a/src/vnet/flow/flow_report.c b/src/vnet/ipfix-export/flow_report.c
similarity index 99%
rename from src/vnet/flow/flow_report.c
rename to src/vnet/ipfix-export/flow_report.c
index 4b89072..793eeda 100644 (file)
--- a/src/vnet/flow/flow_report.c
+++ b/src/vnet/ipfix-export/flow_report.c
@@ -15,7 +15,7 @@
 /*
  * flow_report.c
  */
-#include <vnet/flow/flow_report.h>
+#include <vnet/ipfix-export/flow_report.h>
 #include <vnet/api_errno.h>
 
 flow_report_main_t flow_report_main;

diff --git a/src/vnet/flow/flow_report.h b/src/vnet/ipfix-export/flow_report.h
similarity index 98%
rename from src/vnet/flow/flow_report.h
rename to src/vnet/ipfix-export/flow_report.h
index b26345b..b45ce06 100644 (file)
--- a/src/vnet/flow/flow_report.h
+++ b/src/vnet/ipfix-export/flow_report.h
@@ -29,7 +29,7 @@
 #include <vppinfra/hash.h>
 #include <vppinfra/cache.h>
 
-#include <vnet/flow/ipfix_packet.h>
+#include <vnet/ipfix-export/ipfix_packet.h>
 
 /* Used to build the rewrite */
 typedef struct

diff --git a/src/vnet/flow/flow_report_classify.c b/src/vnet/ipfix-export/flow_report_classify.c
similarity index 99%
rename from src/vnet/flow/flow_report_classify.c
rename to src/vnet/ipfix-export/flow_report_classify.c
index 163ce10..46813ee 100644 (file)
--- a/src/vnet/flow/flow_report_classify.c
+++ b/src/vnet/ipfix-export/flow_report_classify.c
@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#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 <vnet/api_errno.h>
 
 /* Common prefix of tcp and udp headers

diff --git a/src/vnet/flow/flow_report_classify.h b/src/vnet/ipfix-export/flow_report_classify.h
similarity index 100%
rename from src/vnet/flow/flow_report_classify.h
rename to src/vnet/ipfix-export/flow_report_classify.h

diff --git a/src/vnet/flow/flow.api b/src/vnet/ipfix-export/ipfix_export.api
similarity index 100%
rename from src/vnet/flow/flow.api
rename to src/vnet/ipfix-export/ipfix_export.api

diff --git a/src/vnet/flow/ipfix_info_elements.h b/src/vnet/ipfix-export/ipfix_info_elements.h
similarity index 100%
rename from src/vnet/flow/ipfix_info_elements.h
rename to src/vnet/ipfix-export/ipfix_info_elements.h

diff --git a/src/vnet/flow/ipfix_packet.h b/src/vnet/ipfix-export/ipfix_packet.h
similarity index 99%
rename from src/vnet/flow/ipfix_packet.h
rename to src/vnet/ipfix-export/ipfix_packet.h
index a50d86e..8b026e4 100644 (file)
--- a/src/vnet/flow/ipfix_packet.h
+++ b/src/vnet/ipfix-export/ipfix_packet.h
@@ -15,7 +15,7 @@
 #ifndef __included_ipfix_packet_h__
 #define __included_ipfix_packet_h__
 
-#include <vnet/flow/ipfix_info_elements.h>
+#include <vnet/ipfix-export/ipfix_info_elements.h>
 
 /* From RFC-7011:
  * https://tools.ietf.org/html/rfc7011

diff --git a/src/vnet/vnet_all_api_h.h b/src/vnet/vnet_all_api_h.h
index 5c7c486..9d416e9 100644 (file)
--- a/src/vnet/vnet_all_api_h.h
+++ b/src/vnet/vnet_all_api_h.h
@@ -59,7 +59,7 @@
 #include <vnet/srv6/sr.api.h>
 #include <vnet/srmpls/sr_mpls.api.h>
 #include <vnet/classify/classify.api.h>
-#include <vnet/flow/flow.api.h>
+#include <vnet/ipfix-export/ipfix_export.api.h>
 #include <vnet/dhcp/dhcp.api.h>
 #include <vnet/cop/cop.api.h>
 #include <vnet/policer/policer.api.h>