From a1f62b04aafdd86719e464b2409f8ac2a3f2b0e7 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Tue, 7 Jul 2020 18:38:44 +0200 Subject: [PATCH] [#1043] Post rebase updates --- src/lib/dhcp/tests/iface_mgr_test_config.cc | 8 ++++---- src/lib/dhcp/tests/iface_mgr_test_config.h | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lib/dhcp/tests/iface_mgr_test_config.cc b/src/lib/dhcp/tests/iface_mgr_test_config.cc index 39618b7f0a..c0689c36eb 100644 --- a/src/lib/dhcp/tests/iface_mgr_test_config.cc +++ b/src/lib/dhcp/tests/iface_mgr_test_config.cc @@ -104,21 +104,21 @@ IfaceMgrTestConfig::createIface(const std::string &name, const int ifindex) { void IfaceMgrTestConfig::createIfaces() { // local loopback - addIface("lo", 0); + addIface("lo", LO_INDEX); addAddress("lo", IOAddress("127.0.0.1")); addAddress("lo", IOAddress("::1")); // eth0 - addIface("eth0", 1); + addIface("eth0", ETH0_INDEX); addAddress("eth0", IOAddress("10.0.0.1")); addAddress("eth0", IOAddress("fe80::3a60:77ff:fed5:cdef")); addAddress("eth0", IOAddress("2001:db8:1::1")); // eth1 - addIface("eth1", 2); + addIface("eth1", ETH1_INDEX); addAddress("eth1", IOAddress("192.0.2.3")); addAddress("eth1", IOAddress("192.0.2.5")); addAddress("eth1", IOAddress("fe80::3a60:77ff:fed5:abcd")); // eth1961 - addIface("eth1961", 3); + addIface("eth1961", ETH1961_INDEX); addAddress("eth1961", IOAddress("198.51.100.1")); addAddress("eth1961", IOAddress("fe80::3a60:77ff:fed5:9876")); diff --git a/src/lib/dhcp/tests/iface_mgr_test_config.h b/src/lib/dhcp/tests/iface_mgr_test_config.h index fa55ad3051..26167e8f2d 100644 --- a/src/lib/dhcp/tests/iface_mgr_test_config.h +++ b/src/lib/dhcp/tests/iface_mgr_test_config.h @@ -24,6 +24,9 @@ const uint32_t ETH0_INDEX = 1; /// @brief Index of the eth1 fake interface. const uint32_t ETH1_INDEX = 2; + +/// @brief Index of the eth1961 fake interface. +const uint32_t ETH1961_INDEX = 1962; //@} /// @@ -130,7 +133,7 @@ struct FlagInactive6 { /// - eth1 #2 /// - 192.0.2.3 /// - fe80::3a60:77ff:fed5:abcd -/// - eth1961 +/// - eth1961 #1962 /// - 198.51.100.1 /// - fe80::3a60:77ff:fed5:9876 /// -- 2.47.2