From 41e61b9ae8c03a3da5f8ee6172799cb2fdcb5b35 Mon Sep 17 00:00:00 2001
From: Gary Kotton <gkotton@vmware.com>
Date: Sun, 21 Jan 2018 18:30:08 +0200
Subject: [PATCH] NSX|V: ensure that only LAG is configured and not standby

In the event that there is a LAG only configure the LAG
and no standby.

Change-Id: Ieacf386ce9a8ca02d795e53c7ddab9d1356ecf88
---
 vmware_nsx/dvs/dvs.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/vmware_nsx/dvs/dvs.py b/vmware_nsx/dvs/dvs.py
index 5ed3271e9f..bc18caad8d 100644
--- a/vmware_nsx/dvs/dvs.py
+++ b/vmware_nsx/dvs/dvs.py
@@ -437,8 +437,11 @@ class DvsManager(VCManagerBase):
                                            self._session.vim,
                                            dvs_moref,
                                            "config.uplinkPortPolicy")
-        standby = list(set(uplinks.uplinkPortName) - set(ports))
-        policy.uplinkPortOrder.standbyUplinkPort = standby
+        # VC does not support LAG and normal uplinks. So need to check
+        # if we need to configure standby links
+        if set(ports) & set(uplinks.uplinkPortName):
+            standby = list(set(uplinks.uplinkPortName) - set(ports))
+            policy.uplinkPortOrder.standbyUplinkPort = standby
 
     def update_port_group_spec_name(self, pg_spec, name):
         pg_spec.name = name