You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Add a retry logic in Create Uniquer Bridge Network to avoid conflict (vmware#8156) (vmware#8184)
Fixesvmware#8061
Testing done:
1.run local-integration-test.sh with limit the lowerVLAN/upperVLAN to 217/220,
by creating portgroup VCH-0-218,VCH-0-220 in vCenter before the tests.
check debug.log to make sure the retry logic performs correctly.
2.run full regression in CI system to make sure no regression from the change.
(cherry picked from commit 3df36b3)
${vswitch}= Run Keyword If '%{HOST_TYPE}' == 'ESXi' Run govc host.vswitch.info -json | jq -r ".Vswitch[0].Name"
96
-
${rc}${output}= Run Keyword If '%{HOST_TYPE}' == 'ESXi' Run And Return Rc And Output govc host.portgroup.add -vlan=${vlan} -vswitch ${vswitch} VCH-%{DRONE_BUILD_NUMBER}-${vlan}
97
-
Run Keyword If '%{HOST_TYPE}' == 'ESXi' Should Be Equal As Integers ${rc}0
98
-
99
-
${dvs}= Run Keyword If '%{HOST_TYPE}' == 'VC' Run govc find -type DistributedVirtualSwitch | head -n1
100
-
${rc}${output}= Run Keyword If '%{HOST_TYPE}' == 'VC' Run And Return Rc And Output govc dvs.portgroup.add -vlan=${vlan} -dvs ${dvs} VCH-%{DRONE_BUILD_NUMBER}-${vlan}
101
-
Run Keyword If '%{HOST_TYPE}' == 'VC' Should Be Equal As Integers ${rc}0
102
-
Set Environment Variable BRIDGE_NETWORK VCH-%{DRONE_BUILD_NUMBER}-${vlan}
\ ${vswitch}= Run Keyword If '%{HOST_TYPE}' == 'ESXi' Run govc host.vswitch.info -json | jq -r ".Vswitch[0].Name"
98
+
\ ${rc}${output}= Run Keyword If '%{HOST_TYPE}' == 'ESXi' Run And Return Rc And Output govc host.portgroup.add -vlan=${vlan} -vswitch ${vswitch} VCH-%{DRONE_BUILD_NUMBER}-${vlan}
99
+
100
+
\ ${dvs}= Run Keyword If '%{HOST_TYPE}' == 'VC' Run govc find -type DistributedVirtualSwitch | head -n1
101
+
\ ${rc}${output}= Run Keyword If '%{HOST_TYPE}' == 'VC' Run And Return Rc And Output govc dvs.portgroup.add -vlan=${vlan} -dvs ${dvs} VCH-%{DRONE_BUILD_NUMBER}-${vlan}
102
+
\ Run Keyword If ${rc} == 0 Run Keyword And Return Set Environment Variable BRIDGE_NETWORK VCH-%{DRONE_BUILD_NUMBER}-${vlan}
0 commit comments