commit 82ed5cfd54df76207350925cb9da9e06777a3a6e
author Hugo Benichi <hugobenichi@google.com> Tue Sep 08 21:30:22 2020 +0900
committer Commit Bot <commit-bot@chromium.org> Tue Oct 20 07:29:01 2020 +0000
tree 2d642f94005dbe6a2dc8536b76fac04911bfe327
parent 7c3426701651ef3beceacf7f08be306124c923b5

patchpanel: make internal Datapath methods private

This patch moves Datapath internal methods from public to private in
preparation to remove those methods related to iptables setup.

BUG=b:161508179
TEST=unit tests

Change-Id: I98f9742d2b0845a805ef089e4f73a4583bb128b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2398356
Tested-by: Hugo Benichi <hugobenichi@google.com>
Commit-Queue: Hugo Benichi <hugobenichi@google.com>
Reviewed-by: Taoyu Li <taoyl@chromium.org>
Reviewed-by: Garrick Evans <garrick@chromium.org>

patchpanel/mock_datapath.h

diff --git a/patchpanel/mock_datapath.h b/patchpanel/mock_datapath.h
index 4a76c3d..ad1171c 100644
--- a/patchpanel/mock_datapath.h
+++ b/patchpanel/mock_datapath.h
@@ -41,18 +41,15 @@
                            const MacAddress* mac_addr,
                            const SubnetAddress* ipv4_addr,
                            const std::string& user));
-  MOCK_METHOD3(AddVirtualInterfacePair,
-               bool(const std::string& netns_name,
+  MOCK_METHOD8(ConnectVethPair,
+               bool(pid_t pid,
+                    const std::string& netns_name,
                     const std::string& veth_ifname,
-                    const std::string& peer_ifname));
-  MOCK_METHOD2(ToggleInterface, bool(const std::string& ifname, bool up));
-  MOCK_METHOD6(ConfigureInterface,
-               bool(const std::string& ifname,
-                    const MacAddress& mac_addr,
-                    uint32_t addr,
-                    uint32_t prefix_len,
-                    bool up,
-                    bool multicast));
+                    const std::string& peer_ifname,
+                    const MacAddress& remote_mac_addr,
+                    uint32_t remote_ipv4_addr,
+                    uint32_t remote_ipv4_prefix_len,
+                    bool remote_multicast_flag));
   MOCK_METHOD1(RemoveInterface, void(const std::string& ifname));
   MOCK_METHOD4(StartRoutingDevice,
                void(const std::string& ext_ifname,
@@ -64,9 +61,6 @@
                     const std::string& int_ifname,
                     uint32_t int_ipv4_addr,
                     TrafficSource source));
-  MOCK_METHOD1(AddOutboundIPv4, bool(const std::string& ifname));
-  MOCK_METHOD1(RemoveOutboundIPv4, void(const std::string& ifname));
-
   MOCK_METHOD3(MaskInterfaceFlags,
                bool(const std::string& ifname, uint16_t on, uint16_t off));
   MOCK_METHOD2(AddIPv6Forwarding,