From 4c0f3c9a00dc808b4db8949dde4d93a9f7658bcb Mon Sep 17 00:00:00 2001
From: asarfaty <asarfaty@vmware.com>
Date: Wed, 17 Feb 2021 14:05:14 +0200
Subject: [PATCH] V2T migration: fix api-repaly for ipv6 subnets

Change-Id: Ie967b2d0925141892a42a72c7d6d4da06230958a
---
 vmware_nsx/api_replay/utils.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vmware_nsx/api_replay/utils.py b/vmware_nsx/api_replay/utils.py
index 697f15bf0e..52a340c368 100644
--- a/vmware_nsx/api_replay/utils.py
+++ b/vmware_nsx/api_replay/utils.py
@@ -260,6 +260,11 @@ class PrepareObjectForMigration(object):
             for field in v6_fields_to_remove:
                 if field in body:
                     body.pop(field)
+        else:
+            # For ipv6 mode - remove those only if empty
+            for field in v6_fields_to_remove:
+                if field in body and body[field] is None:
+                    body.pop(field)
         return body
 
     def prepare_port(self, port, remove_qos=False, direct_call=False):