Code changes verified for no-trunk OVS deployment.

kubernetes · May 31, 2023 · 0490264 · 0490264
1 parent e88afe9
commit 0490264
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pkg/openstack/instances.go b/pkg/openstack/instances.go
@@ -766,6 +766,9 @@ func getSubInterfaces(interfaces []attachinterfaces.Interface, network *gophercl
 			klog.Errorf("It is not expected to see more than one trunk on a single port %s", iface.PortID)
 			return subports, err
 		}
+		if len(allTrunks) == 0 {
+			continue
+		}
 		// Get subports attached to the trunks
 		trunk := allTrunks[0]
 		klog.V(5).Infof("Subports for trunk %s: %v", trunk.ID, trunk.Subports)

diff --git a/pkg/openstack/openstack_test.go b/pkg/openstack/openstack_test.go
@@ -935,7 +935,7 @@ func TestNodeAddressesWithSubports(t *testing.T) {
 					"OS-EXT-IPS:type":         "fixed",
 				},
 			},
-			"mycluster-01-vlan703_network": []interface{}{
+			"mycluster-01-vlan702_network": []interface{}{
 				map[string]interface{}{
 					"OS-EXT-IPS-MAC:mac_addr": "fa:16:3e:36:b7:8f",
 					"version":                 float64(4),