vlan:Minor Fixes
=>Get the dhcp value from the conf File for the vlan interface.
=>Assign the mac address of the parnt interface to vlan interface.
=>Create the ipv6 child ip objects once create the vlan interface.
Change-Id: I1d73fb18f9d300cbdcf94c73f06df2ea4a1d019b
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>
diff --git a/ethernet_interface.cpp b/ethernet_interface.cpp
index 5eb6aa7..5c78f3a 100644
--- a/ethernet_interface.cpp
+++ b/ethernet_interface.cpp
@@ -353,7 +353,6 @@
{
writeConfigurationFile();
createIPAddressObjects();
-
}
return value;
@@ -366,10 +365,13 @@
std::string path = objPath;
path += "_" + std::to_string(id);
+ auto dhcpEnabled = getDHCPValue(manager.getConfDir().string(),
+ vlanInterfaceName);
+
auto vlanIntf = std::make_unique<phosphor::network::VlanInterface>(
bus,
path.c_str(),
- EthernetInterfaceIntf::dHCPEnabled(),
+ dhcpEnabled,
id,
*this,
manager);
@@ -401,10 +403,14 @@
// write the device file for the vlan interface.
vlanIntf->writeDeviceFile();
- this->vlanInterfaces.emplace(std::move(vlanInterfaceName),
+ this->vlanInterfaces.emplace(vlanInterfaceName,
std::move(vlanIntf));
// write the new vlan device entry to the configuration(network) file.
writeConfigurationFile();
+
+ // Create the dbus object for the link local ipv6 address.
+ vlanInterfaces[vlanInterfaceName]->createIPAddressObjects();
+
}
// Need to merge the below function with the code which writes the