[dts] [PATCH v2]framework: Delete NetDevice object after virtual machine shutdown

[dts] [PATCH v2]framework: Delete NetDevice object after virtual machine shutdown

[Lijuan Tu]

Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
---
 framework/virt_dut.py |  4 ++++
 nics/net_device.py    | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/framework/virt_dut.py b/framework/virt_dut.py
index 9bf75dc..df6c5fd 100644
--- a/framework/virt_dut.py
+++ b/framework/virt_dut.py
@@ -39,6 +39,7 @@ from settings import NICS, LOG_NAME_SEP, get_netdev
 from project_dpdk import DPDKdut
 from dut import Dut
 from net_device import GetNicObj
+from net_device import RemoveNicObj
 
 
 class VirtDut(DPDKdut):
@@ -77,8 +78,11 @@ class VirtDut(DPDKdut):
     def close(self):
         if self.session:
             self.session.close()
+            self.session = None
         if self.alt_session:
             self.alt_session.close()
+            self.alt_session = None
+        RemoveNicObj(self)
 
     def set_nic_type(self, nic_type):
         """
diff --git a/nics/net_device.py b/nics/net_device.py
index 73750f5..49b7a91 100644
--- a/nics/net_device.py
+++ b/nics/net_device.py
@@ -830,6 +830,14 @@ def get_from_list(host, bus_id, devfun_id):
                 return nic['port']
     return None
 
+def remove_from_list(host):
+    """
+    Remove network device object from global structure
+    Parameter will by host ip
+    """
+    for nic in NICS_LIST:
+        if host == nic['host']:
+            NICS_LIST.remove(nic)
 
 def GetNicObj(crb, bus_id, devfun_id):
     """
@@ -862,3 +870,9 @@ def GetNicObj(crb, bus_id, devfun_id):
 
     add_to_list(crb.crb['My IP'], obj)
     return obj
+
+def RemoveNicObj(crb):
+    """
+    Remove network device object.
+    """
+    remove_from_list(crb.crb['My IP'])
-- 
2.5.0

Re: [dts] [PATCH v2]framework: Delete NetDevice object after virtual machine shutdown

[Liu, Yong]

Applied. Thanks.

On 03/14/2016 03:21 PM, Lijuan Tu wrote:
> Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
> ---
>   framework/virt_dut.py |  4 ++++
>   nics/net_device.py    | 14 ++++++++++++++
>   2 files changed, 18 insertions(+)
>
> diff --git a/framework/virt_dut.py b/framework/virt_dut.py
> index 9bf75dc..df6c5fd 100644
> --- a/framework/virt_dut.py
> +++ b/framework/virt_dut.py
> @@ -39,6 +39,7 @@ from settings import NICS, LOG_NAME_SEP, get_netdev
>   from project_dpdk import DPDKdut
>   from dut import Dut
>   from net_device import GetNicObj
> +from net_device import RemoveNicObj
>   
>   
>   class VirtDut(DPDKdut):
> @@ -77,8 +78,11 @@ class VirtDut(DPDKdut):
>       def close(self):
>           if self.session:
>               self.session.close()
> +            self.session = None
>           if self.alt_session:
>               self.alt_session.close()
> +            self.alt_session = None
> +        RemoveNicObj(self)
>   
>       def set_nic_type(self, nic_type):
>           """
> diff --git a/nics/net_device.py b/nics/net_device.py
> index 73750f5..49b7a91 100644
> --- a/nics/net_device.py
> +++ b/nics/net_device.py
> @@ -830,6 +830,14 @@ def get_from_list(host, bus_id, devfun_id):
>                   return nic['port']
>       return None
>   
> +def remove_from_list(host):
> +    """
> +    Remove network device object from global structure
> +    Parameter will by host ip
> +    """
> +    for nic in NICS_LIST:
> +        if host == nic['host']:
> +            NICS_LIST.remove(nic)
>   
>   def GetNicObj(crb, bus_id, devfun_id):
>       """
> @@ -862,3 +870,9 @@ def GetNicObj(crb, bus_id, devfun_id):
>   
>       add_to_list(crb.crb['My IP'], obj)
>       return obj
> +
> +def RemoveNicObj(crb):
> +    """
> +    Remove network device object.
> +    """
> +    remove_from_list(crb.crb['My IP'])