Merge pull request #11431 from zexi/automated-cherry-pick-of-#11430-upstream-release-3.7

Automated cherry pick of #11430: fix(region): clean schedule cache when host add or delete netif

pkg/baremetal/manager.go

@@ -2369,8 +2369,9 @@ func (s *SBaremetalServer) GetDiskConfig() ([]*api.BaremetalDiskConfig, error) {
 
 	if len(layouts) != 0 {
 		firstDisk := layouts[0]
-		// convert to normal order if first disk is PCIE driver
-		if firstDisk.Conf.Driver == baremetal.DISK_DRIVER_PCIE {
+		// convert to normal order if first disk is Linux or PCIE driver
+		driver := firstDisk.Conf.Driver
+		if utils.IsInStringArray(driver, []string{baremetal.DISK_DRIVER_LINUX, baremetal.DISK_DRIVER_PCIE}) {
 			return baremetal.GetLayoutDiskConfig(layouts), nil
 		}
 	}

pkg/compute/models/hosts.go

@@ -4300,6 +4300,7 @@ func (self *SHost) addNetif(ctx context.Context, userCred mcclient.TokenCredenti
 			return httperrors.NewBadRequestError("%v", err)
 		}
 	}
+	self.ClearSchedDescCache()
 	return nil
 }
 
@@ -4612,6 +4613,7 @@ func (self *SHost) RemoveNetif(ctx context.Context, userCred mcclient.TokenCrede
 			}
 		}
 	}
+	self.ClearSchedDescCache()
 	return nil
 }