commit 6e8df63c13c9d0a343e8d14de61e2635df797efa
author Ratan Gupta <ratagupt@in.ibm.com> Sun Aug 13 09:41:58 2017 +0530
committer Patrick Williams <patrick@stwcx.xyz> Sun Aug 13 11:32:59 2017 +0000
tree c7de12a286f477b93ab365ea9bffef8a0cc3c81f
parent 56187e78088b7314e1cf0328ae92690a42a04152

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>

ethernet_interface.cpp

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

network_manager.cpp

diff --git a/network_manager.cpp b/network_manager.cpp
index 3916dfb..dd9a319 100644
--- a/network_manager.cpp
+++ b/network_manager.cpp
@@ -77,7 +77,7 @@
             uint32_t vlanInt = std::stoul(vlanid);
 
             interfaces[interface]->loadVLAN(vlanInt);
-            return;
+            continue;
         }
         // normal ethernet inetrface
         objPath /= intfInfo.first;

vlan_interface.cpp

diff --git a/vlan_interface.cpp b/vlan_interface.cpp
index 88e3c10..acf66db 100644
--- a/vlan_interface.cpp
+++ b/vlan_interface.cpp
@@ -32,6 +32,7 @@
 {
     id(vlanID);
     VlanIface::interfaceName(EthernetInterface::interfaceName());
+    mACAddress(parentInterface.mACAddress());
 
     Interfaces::emit_object_added();
 }