[#1043] Post rebase updates

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"));
 

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
 ///