core: delete NetworkInterfaceInfo class
nfd::NetworkInterfaceInfo has been replaced by
ndn::net::NetworkInterface.
refs #4021
Change-Id: Ic023b935f47f99f3bd74bbd4dc6c0e5bb2b3bf1c
diff --git a/tests/core/network-interface-predicate.t.cpp b/tests/core/network-interface-predicate.t.cpp
index 3ec581b..9ae6c44 100644
--- a/tests/core/network-interface-predicate.t.cpp
+++ b/tests/core/network-interface-predicate.t.cpp
@@ -24,10 +24,10 @@
*/
#include "core/network-interface-predicate.hpp"
-#include "core/network-interface.hpp"
#include "tests/test-common.hpp"
+#include <ndn-cxx/net/ethernet.hpp>
#include <ndn-cxx/net/network-monitor-stub.hpp>
#include <boost/property_tree/info_parser.hpp>
#include <sstream>
@@ -41,36 +41,8 @@
NetworkInterfacePredicateFixture()
{
using namespace boost::asio::ip;
- interfaces.push_back(
- NetworkInterfaceInfo{0, "eth0",
- ethernet::Address::fromString("3e:15:c2:8b:65:00"),
- {address_v4::from_string("129.82.100.1")},
- {},
- address_v4::from_string("129.82.255.255"),
- IFF_UP});
- interfaces.push_back(
- NetworkInterfaceInfo{1, "eth1",
- ethernet::Address::fromString("3e:15:c2:8b:65:01"),
- {address_v4::from_string("192.168.2.1")},
- {},
- address_v4::from_string("192.168.2.255"),
- IFF_UP});
- interfaces.push_back(
- NetworkInterfaceInfo{2, "eth2",
- ethernet::Address::fromString("3e:15:c2:8b:65:02"),
- {address_v4::from_string("198.51.100.1")},
- {address_v6::from_string("2001:db8::1")},
- address_v4::from_string("198.51.100.255"),
- IFF_MULTICAST | IFF_BROADCAST | IFF_UP});
- interfaces.push_back(
- NetworkInterfaceInfo{3, "enp68s0f1",
- ethernet::Address::fromString("3e:15:c2:8b:65:03"),
- {address_v4::from_string("192.168.2.3")},
- {},
- address_v4::from_string("192.168.2.255"),
- IFF_UP});
-
using namespace ndn::net;
+ namespace ethernet = ndn::ethernet;
netifs.push_back(NetworkMonitorStub::makeNetworkInterface());
netifs.back()->setIndex(0);
@@ -131,7 +103,6 @@
protected:
NetworkInterfacePredicate predicate;
- std::vector<NetworkInterfaceInfo> interfaces;
std::vector<shared_ptr<ndn::net::NetworkInterface>> netifs;
};
@@ -141,11 +112,6 @@
{
parseConfig("");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), true);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), true);
@@ -158,11 +124,6 @@
"{\n"
"}");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), false);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), false);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), false);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), false);
@@ -176,11 +137,6 @@
" *\n"
"}");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), false);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), false);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), false);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), false);
@@ -195,11 +151,6 @@
" ifname eth1\n"
"}");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), false);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), false);
@@ -214,11 +165,6 @@
" ifname eth1\n"
"}");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), true);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), false);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), false);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), true);
@@ -232,11 +178,6 @@
" ifname enp*\n"
"}");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), true);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), false);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), false);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), false);
@@ -250,11 +191,6 @@
" ifname *th*\n"
"}");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), false);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), true);
@@ -268,11 +204,6 @@
" ifname eth**\n"
"}");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), false);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), true);
@@ -286,11 +217,6 @@
" ifname *\n"
"}");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), true);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), true);
@@ -304,11 +230,6 @@
" ifname eth?\n"
"}");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), false);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), true);
@@ -333,11 +254,6 @@
" ether 3e:15:c2:8b:65:01\n"
"}");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), false);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), false);
@@ -352,11 +268,6 @@
" ether 3e:15:c2:8b:65:01\n"
"}");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), true);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), false);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), false);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), true);
@@ -380,11 +291,6 @@
" subnet 192.168.0.0/16\n"
"}");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), true);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), false);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), false);
@@ -398,11 +304,6 @@
" subnet 192.168.0.0/16\n"
"}");
- BOOST_CHECK_EQUAL(predicate(interfaces[0]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[1]), false);
- BOOST_CHECK_EQUAL(predicate(interfaces[2]), true);
- BOOST_CHECK_EQUAL(predicate(interfaces[3]), false);
-
BOOST_CHECK_EQUAL(predicate(*netifs[0]), true);
BOOST_CHECK_EQUAL(predicate(*netifs[1]), false);
BOOST_CHECK_EQUAL(predicate(*netifs[2]), true);