Merge pull request #530 from noironetworks/ovs-lib-includes

Update OVS lib includes
noironetworks · May 15, 2024 · 0402fb3 · 0402fb3
2 parents a752795 + f2d2cae
commit 0402fb3
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 16 deletions.
diff --git a/agent-ovs/lib/cmd.cpp b/agent-ovs/lib/cmd.cpp
@@ -9,7 +9,6 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>

diff --git a/agent-ovs/ovs/AdvertManager.cpp b/agent-ovs/ovs/AdvertManager.cpp
@@ -30,7 +30,7 @@
 #include "ovs-ofputil.h"
 
 // OVS lib
-#include <lib/util.h>
+#include <openvswitch/lib/util.h>
 #include <openvswitch/match.h>
 
 using std::string;

diff --git a/agent-ovs/ovs/FlowExecutor.cpp b/agent-ovs/ovs/FlowExecutor.cpp
@@ -15,7 +15,7 @@
 #include "ovs-ofputil.h"
 
 // OVS lib
-#include <lib/util.h>
+#include <openvswitch/lib/util.h>
 extern "C" {
 #include <openvswitch/ofp-msgs.h>
 #include <openvswitch/match.h>

diff --git a/agent-ovs/ovs/FlowReader.cpp b/agent-ovs/ovs/FlowReader.cpp
@@ -14,7 +14,7 @@
 #include "ovs-shim.h"
 #include "ovs-ofputil.h"
 
-#include <lib/util.h>
+#include <openvswitch/lib/util.h>
 extern "C" {
 #include <openvswitch/ofp-msgs.h>
 }

diff --git a/agent-ovs/ovs/InterfaceStatsManager.cpp b/agent-ovs/ovs/InterfaceStatsManager.cpp
@@ -16,7 +16,7 @@
 
 #include "ovs-ofputil.h"
 
-#include <lib/util.h>
+#include <openvswitch/lib/util.h>
 extern "C" {
 #include <openvswitch/ofp-msgs.h>
 #include <openvswitch/ofp-port.h>

diff --git a/agent-ovs/ovs/NatStatsManager.cpp b/agent-ovs/ovs/NatStatsManager.cpp
@@ -17,7 +17,7 @@
 #include "FlowConstants.h"
 
 #include "ovs-ofputil.h"
-#include <lib/util.h>
+#include <openvswitch/lib/util.h>
 extern "C" {
   #include <openvswitch/ofp-msgs.h>
 }

diff --git a/agent-ovs/ovs/OvsdbConnection.cpp b/agent-ovs/ovs/OvsdbConnection.cpp
@@ -15,7 +15,7 @@
 #endif
 
 extern "C" {
-#include <lib/dirs.h>
+#include <openvswitch/lib/dirs.h>
 }
 
 #include "ovs/include/OvsdbConnection.h"

diff --git a/agent-ovs/ovs/PacketInHandler.cpp b/agent-ovs/ovs/PacketInHandler.cpp
@@ -29,7 +29,7 @@
 // OVS lib
 #include "ovs-shim.h"
 #include "ovs-ofputil.h"
-#include <lib/util.h>
+#include <openvswitch/lib/util.h>
 
 #include <openvswitch/ofp-msgs.h>
 #include <openvswitch/match.h>

diff --git a/agent-ovs/ovs/PolicyStatsManager.cpp b/agent-ovs/ovs/PolicyStatsManager.cpp
@@ -18,7 +18,7 @@
 
 #include "ovs-ofputil.h"
 
-#include <lib/util.h>
+#include <openvswitch/lib/util.h>
 
 extern "C" {
 #include <openvswitch/ofp-msgs.h>

diff --git a/agent-ovs/ovs/PortMapper.cpp b/agent-ovs/ovs/PortMapper.cpp
@@ -13,7 +13,7 @@
 
 
 // OVS lib
-#include <lib/util.h>
+#include <openvswitch/lib/util.h>
 extern "C" {
 #include <openvswitch/ofp-msgs.h>
 #include <openvswitch/ofp-port.h>

diff --git a/agent-ovs/ovs/SwitchConnection.cpp b/agent-ovs/ovs/SwitchConnection.cpp
@@ -16,14 +16,14 @@
 #include <unistd.h>
 
 #include "ovs-ofputil.h"
-#include <lib/util.h>
+#include <openvswitch/lib/util.h>
 #include <openvswitch/poll-loop.h>
 #define HAVE_STRUCT_MMSGHDR_MSG_LEN
 #define HAVE_SENDMMSG
 
 extern "C" {
-#include <lib/dirs.h>
-#include <lib/socket-util.h>
+#include <openvswitch/lib/dirs.h>
+#include <openvswitch/lib/socket-util.h>
 #include <openvswitch/vconn.h>
 #include <openvswitch/ofp-msgs.h>
 #include <openvswitch/ofp-packet.h>

diff --git a/agent-ovs/ovs/ovs-shim.c b/agent-ovs/ovs/ovs-shim.c
@@ -12,8 +12,8 @@
 #include <openvswitch/ofp-actions.h>
 #include <openvswitch/ofp-port.h>
 #include <openvswitch/meta-flow.h>
-#include <lib/byte-order.h>
-#include <lib/dp-packet.h>
+#include <openvswitch/lib/byte-order.h>
+#include <openvswitch/lib/dp-packet.h>
 #include <openvswitch/ofp-msgs.h>
 
 void format_action(const struct ofpact* acts, size_t ofpacts_len,

diff --git a/agent-ovs/ovs/test/ContractStatsManager_test.cpp b/agent-ovs/ovs/test/ContractStatsManager_test.cpp
@@ -14,7 +14,7 @@
 #include <opflexagent/logging.h>
 #include <opflexagent/test/ModbFixture.h>
 #include "ovs-ofputil.h"
-#include <lib/util.h>
+#include <openvswitch/lib/util.h>
 #include "IntFlowManager.h"
 #include "ContractStatsManager.h"
 #include "TableState.h"