[ovs-dev] [PATCH ovn] Include ovn header files from lib/ instead of ovn/lib/

nusiddiq at redhat.com nusiddiq at redhat.com
Fri Jul 26 17:57:42 UTC 2019


From: Numan Siddique <nusiddiq at redhat.com>

If we don't change this, we will be including the header files from ovs
subtree - ovs/ovn/lib/

Signed-off-by: Numan Siddique <nusiddiq at redhat.com>
---
 controller-vtep/binding.c             |  2 +-
 controller-vtep/gateway.c             |  2 +-
 controller-vtep/ovn-controller-vtep.c |  4 ++--
 controller-vtep/ovn-controller-vtep.h |  2 +-
 controller-vtep/vtep.c                |  2 +-
 controller/bfd.c                      |  2 +-
 controller/binding.c                  |  4 ++--
 controller/chassis.c                  |  4 ++--
 controller/encaps.c                   |  2 +-
 controller/ha-chassis.c               |  2 +-
 controller/lflow.c                    |  6 +++---
 controller/lport.c                    |  2 +-
 controller/ofctrl.c                   |  2 +-
 controller/ovn-controller.c           | 12 ++++++------
 controller/ovn-controller.h           |  2 +-
 controller/physical.c                 |  6 +++---
 controller/pinctrl.c                  | 10 +++++-----
 northd/ovn-northd.c                   | 14 +++++++-------
 tests/test-ovn.c                      |  4 ++--
 utilities/ovn-nbctl.c                 |  6 +++---
 utilities/ovn-sbctl.c                 |  4 ++--
 utilities/ovn-trace.c                 |  8 ++++----
 22 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/controller-vtep/binding.c b/controller-vtep/binding.c
index 9cbfadc71..83377157e 100644
--- a/controller-vtep/binding.c
+++ b/controller-vtep/binding.c
@@ -21,7 +21,7 @@
 #include "lib/util.h"
 #include "openvswitch/vlog.h"
 #include "ovn-controller-vtep.h"
-#include "ovn/lib/ovn-sb-idl.h"
+#include "lib/ovn-sb-idl.h"
 #include "vtep/vtep-idl.h"
 
 VLOG_DEFINE_THIS_MODULE(binding);
diff --git a/controller-vtep/gateway.c b/controller-vtep/gateway.c
index 619c3c49a..636dab365 100644
--- a/controller-vtep/gateway.c
+++ b/controller-vtep/gateway.c
@@ -21,7 +21,7 @@
 #include "lib/sset.h"
 #include "lib/util.h"
 #include "openvswitch/vlog.h"
-#include "ovn/lib/ovn-sb-idl.h"
+#include "lib/ovn-sb-idl.h"
 #include "vtep/vtep-idl.h"
 #include "ovn-controller-vtep.h"
 
diff --git a/controller-vtep/ovn-controller-vtep.c b/controller-vtep/ovn-controller-vtep.c
index 292a3f464..ec4d8c1b6 100644
--- a/controller-vtep/ovn-controller-vtep.c
+++ b/controller-vtep/ovn-controller-vtep.c
@@ -34,8 +34,8 @@
 #include "util.h"
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
-#include "ovn/lib/ovn-sb-idl.h"
-#include "ovn/lib/ovn-util.h"
+#include "lib/ovn-sb-idl.h"
+#include "lib/ovn-util.h"
 #include "vtep/vtep-idl.h"
 
 #include "binding.h"
diff --git a/controller-vtep/ovn-controller-vtep.h b/controller-vtep/ovn-controller-vtep.h
index 435a730d9..0eacdbe30 100644
--- a/controller-vtep/ovn-controller-vtep.h
+++ b/controller-vtep/ovn-controller-vtep.h
@@ -17,7 +17,7 @@
 #ifndef OVN_CONTROLLER_VTEP_H
 #define OVN_CONTROLLER_VTEP_H 1
 
-#include "ovn/lib/ovn-sb-idl.h"
+#include "lib/ovn-sb-idl.h"
 
 struct ovsdb_idl;
 struct ovsdb_idl_txn;
diff --git a/controller-vtep/vtep.c b/controller-vtep/vtep.c
index a72b149eb..e2baca5a7 100644
--- a/controller-vtep/vtep.c
+++ b/controller-vtep/vtep.c
@@ -25,7 +25,7 @@
 #include "lib/util.h"
 #include "ovn-controller-vtep.h"
 #include "openvswitch/vlog.h"
-#include "ovn/lib/ovn-sb-idl.h"
+#include "lib/ovn-sb-idl.h"
 #include "vtep/vtep-idl.h"
 
 VLOG_DEFINE_THIS_MODULE(vtep);
diff --git a/controller/bfd.c b/controller/bfd.c
index 22db00af7..10cd5fcd2 100644
--- a/controller/bfd.c
+++ b/controller/bfd.c
@@ -24,7 +24,7 @@
 #include "lib/util.h"
 #include "lib/vswitch-idl.h"
 #include "openvswitch/vlog.h"
-#include "ovn/lib/ovn-sb-idl.h"
+#include "lib/ovn-sb-idl.h"
 #include "ovn-controller.h"
 
 VLOG_DEFINE_THIS_MODULE(ovn_bfd);
diff --git a/controller/binding.c b/controller/binding.c
index ace0f811b..c52acec11 100644
--- a/controller/binding.c
+++ b/controller/binding.c
@@ -27,8 +27,8 @@
 #include "lib/vswitch-idl.h"
 #include "openvswitch/hmap.h"
 #include "openvswitch/vlog.h"
-#include "ovn/lib/chassis-index.h"
-#include "ovn/lib/ovn-sb-idl.h"
+#include "lib/chassis-index.h"
+#include "lib/ovn-sb-idl.h"
 #include "ovn-controller.h"
 
 VLOG_DEFINE_THIS_MODULE(binding);
diff --git a/controller/chassis.c b/controller/chassis.c
index 04b98d86c..8d9f7c8d0 100644
--- a/controller/chassis.c
+++ b/controller/chassis.c
@@ -24,8 +24,8 @@
 #include "openvswitch/dynamic-string.h"
 #include "openvswitch/vlog.h"
 #include "openvswitch/ofp-parse.h"
-#include "ovn/lib/chassis-index.h"
-#include "ovn/lib/ovn-sb-idl.h"
+#include "lib/chassis-index.h"
+#include "lib/ovn-sb-idl.h"
 #include "ovn-controller.h"
 #include "lib/util.h"
 
diff --git a/controller/encaps.c b/controller/encaps.c
index d4a436df3..db48b707a 100644
--- a/controller/encaps.c
+++ b/controller/encaps.c
@@ -21,7 +21,7 @@
 #include "lib/util.h"
 #include "lib/vswitch-idl.h"
 #include "openvswitch/vlog.h"
-#include "ovn/lib/ovn-sb-idl.h"
+#include "lib/ovn-sb-idl.h"
 #include "ovn-controller.h"
 
 VLOG_DEFINE_THIS_MODULE(encaps);
diff --git a/controller/ha-chassis.c b/controller/ha-chassis.c
index 498e5ce5a..6d9426a5c 100644
--- a/controller/ha-chassis.c
+++ b/controller/ha-chassis.c
@@ -18,7 +18,7 @@
 #include "ha-chassis.h"
 #include "lib/sset.h"
 #include "openvswitch/vlog.h"
-#include "ovn/lib/ovn-sb-idl.h"
+#include "lib/ovn-sb-idl.h"
 
 VLOG_DEFINE_THIS_MODULE(ha_chassis);
 
diff --git a/controller/lflow.c b/controller/lflow.c
index 1aafafb33..d0335a83a 100644
--- a/controller/lflow.c
+++ b/controller/lflow.c
@@ -26,9 +26,9 @@
 #include "ovn-controller.h"
 #include "ovn/actions.h"
 #include "ovn/expr.h"
-#include "ovn/lib/ovn-l7.h"
-#include "ovn/lib/ovn-sb-idl.h"
-#include "ovn/lib/extend-table.h"
+#include "lib/ovn-l7.h"
+#include "lib/ovn-sb-idl.h"
+#include "lib/extend-table.h"
 #include "packets.h"
 #include "physical.h"
 #include "simap.h"
diff --git a/controller/lport.c b/controller/lport.c
index cc5c5fbb2..792c825af 100644
--- a/controller/lport.c
+++ b/controller/lport.c
@@ -19,7 +19,7 @@
 #include "lport.h"
 #include "hash.h"
 #include "openvswitch/vlog.h"
-#include "ovn/lib/ovn-sb-idl.h"
+#include "lib/ovn-sb-idl.h"
 VLOG_DEFINE_THIS_MODULE(lport);
 
 const struct sbrec_port_binding *
diff --git a/controller/ofctrl.c b/controller/ofctrl.c
index 043abd69d..4d24a8bce 100644
--- a/controller/ofctrl.c
+++ b/controller/ofctrl.c
@@ -41,7 +41,7 @@
 #include "openvswitch/vlog.h"
 #include "ovn-controller.h"
 #include "ovn/actions.h"
-#include "ovn/lib/extend-table.h"
+#include "lib/extend-table.h"
 #include "openvswitch/poll-loop.h"
 #include "physical.h"
 #include "openvswitch/rconn.h"
diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c
index cf6c8ae79..12c919a76 100644
--- a/controller/ovn-controller.c
+++ b/controller/ovn-controller.c
@@ -42,12 +42,12 @@
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
 #include "ovn/actions.h"
-#include "ovn/lib/chassis-index.h"
-#include "ovn/lib/extend-table.h"
-#include "ovn/lib/ip-mcast-index.h"
-#include "ovn/lib/mcast-group-index.h"
-#include "ovn/lib/ovn-sb-idl.h"
-#include "ovn/lib/ovn-util.h"
+#include "lib/chassis-index.h"
+#include "lib/extend-table.h"
+#include "lib/ip-mcast-index.h"
+#include "lib/mcast-group-index.h"
+#include "lib/ovn-sb-idl.h"
+#include "lib/ovn-util.h"
 #include "patch.h"
 #include "physical.h"
 #include "pinctrl.h"
diff --git a/controller/ovn-controller.h b/controller/ovn-controller.h
index 078c9eabe..be34a24c0 100644
--- a/controller/ovn-controller.h
+++ b/controller/ovn-controller.h
@@ -18,7 +18,7 @@
 #define OVN_CONTROLLER_H 1
 
 #include "simap.h"
-#include "ovn/lib/ovn-sb-idl.h"
+#include "lib/ovn-sb-idl.h"
 
 struct ovsrec_bridge_table;
 
diff --git a/controller/physical.c b/controller/physical.c
index 316d3738c..5c2f74eae 100644
--- a/controller/physical.c
+++ b/controller/physical.c
@@ -34,9 +34,9 @@
 #include "openvswitch/vlog.h"
 #include "openvswitch/ofp-parse.h"
 #include "ovn-controller.h"
-#include "ovn/lib/chassis-index.h"
-#include "ovn/lib/ovn-sb-idl.h"
-#include "ovn/lib/ovn-util.h"
+#include "lib/chassis-index.h"
+#include "lib/ovn-sb-idl.h"
+#include "lib/ovn-util.h"
 #include "physical.h"
 #include "openvswitch/shash.h"
 #include "simap.h"
diff --git a/controller/pinctrl.c b/controller/pinctrl.c
index d857067a5..ebbb52a0b 100644
--- a/controller/pinctrl.c
+++ b/controller/pinctrl.c
@@ -43,11 +43,11 @@
 #include "ovn-controller.h"
 #include "ovn/actions.h"
 #include "ovn/lex.h"
-#include "ovn/lib/acl-log.h"
-#include "ovn/lib/ip-mcast-index.h"
-#include "ovn/lib/mcast-group-index.h"
-#include "ovn/lib/ovn-l7.h"
-#include "ovn/lib/ovn-util.h"
+#include "lib/acl-log.h"
+#include "lib/ip-mcast-index.h"
+#include "lib/mcast-group-index.h"
+#include "lib/ovn-l7.h"
+#include "lib/ovn-util.h"
 #include "ovn/logical-fields.h"
 #include "openvswitch/poll-loop.h"
 #include "openvswitch/rconn.h"
diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c
index eb6c47cad..bed2993c2 100644
--- a/northd/ovn-northd.c
+++ b/northd/ovn-northd.c
@@ -28,13 +28,13 @@
 #include "openvswitch/hmap.h"
 #include "openvswitch/json.h"
 #include "ovn/lex.h"
-#include "ovn/lib/chassis-index.h"
-#include "ovn/lib/ip-mcast-index.h"
-#include "ovn/lib/mcast-group-index.h"
-#include "ovn/lib/ovn-l7.h"
-#include "ovn/lib/ovn-nb-idl.h"
-#include "ovn/lib/ovn-sb-idl.h"
-#include "ovn/lib/ovn-util.h"
+#include "lib/chassis-index.h"
+#include "lib/ip-mcast-index.h"
+#include "lib/mcast-group-index.h"
+#include "lib/ovn-l7.h"
+#include "lib/ovn-nb-idl.h"
+#include "lib/ovn-sb-idl.h"
+#include "lib/ovn-util.h"
 #include "ovn/actions.h"
 #include "ovn/logical-fields.h"
 #include "packets.h"
diff --git a/tests/test-ovn.c b/tests/test-ovn.c
index 0b9e8246e..829e8de4a 100644
--- a/tests/test-ovn.c
+++ b/tests/test-ovn.c
@@ -32,8 +32,8 @@
 #include "ovn/expr.h"
 #include "ovn/lex.h"
 #include "ovn/logical-fields.h"
-#include "ovn/lib/ovn-l7.h"
-#include "ovn/lib/extend-table.h"
+#include "lib/ovn-l7.h"
+#include "lib/extend-table.h"
 #include "ovs-thread.h"
 #include "ovstest.h"
 #include "openvswitch/shash.h"
diff --git a/utilities/ovn-nbctl.c b/utilities/ovn-nbctl.c
index 98a8faa0b..ad999dd96 100644
--- a/utilities/ovn-nbctl.c
+++ b/utilities/ovn-nbctl.c
@@ -26,9 +26,9 @@
 #include "fatal-signal.h"
 #include "jsonrpc.h"
 #include "openvswitch/json.h"
-#include "ovn/lib/acl-log.h"
-#include "ovn/lib/ovn-nb-idl.h"
-#include "ovn/lib/ovn-util.h"
+#include "lib/acl-log.h"
+#include "lib/ovn-nb-idl.h"
+#include "lib/ovn-util.h"
 #include "packets.h"
 #include "openvswitch/poll-loop.h"
 #include "process.h"
diff --git a/utilities/ovn-sbctl.c b/utilities/ovn-sbctl.c
index dd6585a3e..9a9b6f0ec 100644
--- a/utilities/ovn-sbctl.c
+++ b/utilities/ovn-sbctl.c
@@ -41,8 +41,8 @@
 #include "openvswitch/shash.h"
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
-#include "ovn/lib/ovn-sb-idl.h"
-#include "ovn/lib/ovn-util.h"
+#include "lib/ovn-sb-idl.h"
+#include "lib/ovn-util.h"
 #include "ovsdb-data.h"
 #include "ovsdb-idl.h"
 #include "openvswitch/poll-loop.h"
diff --git a/utilities/ovn-trace.c b/utilities/ovn-trace.c
index 044eb1cc2..9368d959d 100644
--- a/utilities/ovn-trace.c
+++ b/utilities/ovn-trace.c
@@ -36,10 +36,10 @@
 #include "ovn/expr.h"
 #include "ovn/lex.h"
 #include "ovn/logical-fields.h"
-#include "ovn/lib/acl-log.h"
-#include "ovn/lib/ovn-l7.h"
-#include "ovn/lib/ovn-sb-idl.h"
-#include "ovn/lib/ovn-util.h"
+#include "lib/acl-log.h"
+#include "lib/ovn-l7.h"
+#include "lib/ovn-sb-idl.h"
+#include "lib/ovn-util.h"
 #include "ovsdb-idl.h"
 #include "openvswitch/poll-loop.h"
 #include "stream-ssl.h"
-- 
2.21.0



More information about the dev mailing list