Automatic merge from release/2.7.0 -> release/2.8.0

* commit '6ad0de9608050bbdb8ad88fd7a4241a9be07307f':
  fix: to make it consistent, change cloudproviderregion auto_sync to enable_auto_sync
This commit is contained in:
周有松
2019-03-08 17:41:34 +08:00
+2 -2
View File
@@ -110,9 +110,9 @@ func (self *SCloudproviderregion) getExtraDetails(extra *jsonutils.JSONDict) *js
extra.Add(jsonutils.NewString(account.Id), "cloudaccount_id")
extra.Add(jsonutils.NewString(account.Name), "cloudaccount")
if account.EnableAutoSync {
extra.Add(jsonutils.JSONTrue, "auto_sync")
extra.Add(jsonutils.JSONTrue, "enable_auto_sync")
} else {
extra.Add(jsonutils.JSONFalse, "auto_sync")
extra.Add(jsonutils.JSONFalse, "enable_auto_sync")
}
extra.Add(jsonutils.NewInt(int64(self.getSyncIntervalSeconds(account))), "sync_interval_seconds")
return extra