Merge pull request #18952 from swordqiu/automated-cherry-pick-of-#18951-upstream-release-3.11

Automated cherry pick of #18951: fix: ignore vm virtual ip changes
This commit is contained in:
Zexi Li
2023-12-12 09:34:27 +08:00
committed by GitHub
+5 -4
View File
@@ -114,6 +114,8 @@ type GuestnetworkBaseDesc struct {
} `json:"vpc"`
Networkaddresses jsonutils.JSONObject `json:"networkaddresses"`
VirtualIps []string `json:"virtual_ips"`
}
type GuestnetworkJsonDesc struct {
@@ -123,10 +125,9 @@ type GuestnetworkJsonDesc struct {
NumQueues int `json:"num_queues"`
Vectors *int `json:"vectors"`
VirtualIps []string `json:"virtual_ips"`
ExternalId string `json:"external_id"`
TeamWith string `json:"team_with"`
Manual *bool `json:"manual"`
ExternalId string `json:"external_id"`
TeamWith string `json:"team_with"`
Manual *bool `json:"manual"`
UpscriptPath string `json:"upscript_path"`
DownscriptPath string `json:"downscript_path"`