diff --git a/cmd/climc/shell/quotas.go b/cmd/climc/shell/quotas.go index 96996d28c8..aa2ea432b4 100644 --- a/cmd/climc/shell/quotas.go +++ b/cmd/climc/shell/quotas.go @@ -53,8 +53,8 @@ type RegionQuotaOptions struct { Port int64 `help:"Internal NIC count" json:"port,omitzero"` Eport int64 `help:"External NIC count" json:"eport,omitzero"` - Bw int64 `help:"Internal bandwidth in Mbps" json:"bw,omitzero"` - Ebw int64 `help:"External bandwidth in Mbps" json:"ebw,omitzero"` + // Bw int64 `help:"Internal bandwidth in Mbps" json:"bw,omitzero"` + // Ebw int64 `help:"External bandwidth in Mbps" json:"ebw,omitzero"` Eip int64 `help:"Elastic IP count" json:"eip,omitzero"` diff --git a/pkg/compute/models/guest_actions.go b/pkg/compute/models/guest_actions.go index c69a880f73..a2a431f1b1 100644 --- a/pkg/compute/models/guest_actions.go +++ b/pkg/compute/models/guest_actions.go @@ -2090,19 +2090,19 @@ func (self *SGuest) PerformAttachnetwork(ctx context.Context, userCred mcclient. if err != nil { return nil, err } - var inicCnt, enicCnt, ibw, ebw int + var inicCnt, enicCnt int if IsExitNetworkInfo(conf) { enicCnt = 1 - ebw = conf.BwLimit + // ebw = conf.BwLimit } else { inicCnt = 1 - ibw = conf.BwLimit + // ibw = conf.BwLimit } pendingUsage := &SRegionQuota{ Port: inicCnt, Eport: enicCnt, - Bw: ibw, - Ebw: ebw, + //Bw: ibw, + //Ebw: ebw, } keys, err := self.GetQuotaKeys() if err != nil { diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index b707b383fd..c02bfe4481 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -1478,9 +1478,9 @@ func getGuestResourceRequirements( regionReq := SRegionQuota{ Port: iNicCnt * count, Eport: eNicCnt * count, - Bw: iBw * count, - Ebw: eBw * count, - Eip: eipCnt * count, + //Bw: iBw * count, + //Ebw: eBw * count, + Eip: eipCnt * count, } keys := serverCreateInput2ComputeQuotaKeys(input, ownerId) req.SetKeys(keys) @@ -2590,10 +2590,10 @@ func (self *SGuest) attach2NetworkOnce( cancelUsage := SRegionQuota{} if network.IsExitNetwork() { cancelUsage.Eport = 1 - cancelUsage.Ebw = bwLimit + // cancelUsage.Ebw = bwLimit } else { cancelUsage.Port = 1 - cancelUsage.Bw = bwLimit + // cancelUsage.Bw = bwLimit } keys, err := self.GetRegionalQuotaKeys() if err != nil { @@ -4967,7 +4967,7 @@ func (self *SGuest) getGuestUsage(guestCount int) (SQuota, SRegionQuota, error) return usage, regionUsage, err } regionUsage.Port = netCount - regionUsage.Bw = self.getBandwidth(false) + // regionUsage.Bw = self.getBandwidth(false) eip, err := self.GetEip() if err != nil && errors.Cause(err) != sql.ErrNoRows { return usage, regionUsage, err diff --git a/pkg/compute/models/regionquota.go b/pkg/compute/models/regionquota.go index 6c7e47febc..1ba798bc3c 100644 --- a/pkg/compute/models/regionquota.go +++ b/pkg/compute/models/regionquota.go @@ -73,8 +73,8 @@ type SRegionQuota struct { Eip int `default:"-1" allow_zero:"true"` Port int `default:"-1" allow_zero:"true"` Eport int `default:"-1" allow_zero:"true"` - Bw int `default:"-1" allow_zero:"true"` - Ebw int `default:"-1" allow_zero:"true"` + // Bw int `default:"-1" allow_zero:"true"` + // Ebw int `default:"-1" allow_zero:"true"` Snapshot int `default:"-1" allow_zero:"true"` @@ -125,8 +125,8 @@ func (self *SRegionQuota) FetchSystemQuota() { self.Eip = defaultValue(options.Options.DefaultEipQuota) self.Port = defaultValue(options.Options.DefaultPortQuota) self.Eport = defaultValue(options.Options.DefaultEportQuota) - self.Bw = defaultValue(options.Options.DefaultBwQuota) - self.Ebw = defaultValue(options.Options.DefaultEbwQuota) + // self.Bw = defaultValue(options.Options.DefaultBwQuota) + // self.Ebw = defaultValue(options.Options.DefaultEbwQuota) self.Snapshot = defaultValue(options.Options.DefaultSnapshotQuota) self.Bucket = defaultValue(options.Options.DefaultBucketQuota) self.ObjectGB = defaultValue(options.Options.DefaultObjectGBQuota) @@ -182,8 +182,8 @@ func (self *SRegionQuota) FetchUsage(ctx context.Context) error { self.Eip = eipUsage.Total() self.Port = net.InternalNicCount + net.InternalVirtualNicCount + lbnic self.Eport = net.ExternalNicCount + net.ExternalVirtualNicCount - self.Bw = net.InternalBandwidth - self.Ebw = net.ExternalBandwidth + // self.Bw = net.InternalBandwidth + // self.Ebw = net.ExternalBandwidth snapshotCount, _ := TotalSnapshotCount(scope, ownerId, rangeObjs, providers, brands, regionKeys.CloudEnv) self.Snapshot = snapshotCount @@ -211,12 +211,12 @@ func (self *SRegionQuota) ResetNegative() { if self.Eport < 0 { self.Eport = 0 } - if self.Bw < 0 { - self.Bw = 0 - } - if self.Ebw < 0 { - self.Ebw = 0 - } + // if self.Bw < 0 { + // self.Bw = 0 + // } + // if self.Ebw < 0 { + // self.Ebw = 0 + // } if self.Snapshot < 0 { self.Snapshot = 0 } @@ -250,12 +250,12 @@ func (self *SRegionQuota) IsEmpty() bool { if self.Eport > 0 { return false } - if self.Bw > 0 { - return false - } - if self.Ebw > 0 { - return false - } + // if self.Bw > 0 { + // return false + // } + // if self.Ebw > 0 { + // return false + // } if self.Snapshot > 0 { return false } @@ -285,8 +285,8 @@ func (self *SRegionQuota) Add(quota quotas.IQuota) { self.Port = self.Port + quotas.NonNegative(squota.Port) self.Eip = self.Eip + quotas.NonNegative(squota.Eip) self.Eport = self.Eport + quotas.NonNegative(squota.Eport) - self.Bw = self.Bw + quotas.NonNegative(squota.Bw) - self.Ebw = self.Ebw + quotas.NonNegative(squota.Ebw) + // self.Bw = self.Bw + quotas.NonNegative(squota.Bw) + // self.Ebw = self.Ebw + quotas.NonNegative(squota.Ebw) self.Snapshot = self.Snapshot + quotas.NonNegative(squota.Snapshot) self.Bucket = self.Bucket + quotas.NonNegative(squota.Bucket) self.ObjectGB = self.ObjectGB + quotas.NonNegative(squota.ObjectGB) @@ -301,8 +301,8 @@ func (self *SRegionQuota) Sub(quota quotas.IQuota) { self.Port = nonNegative(self.Port - squota.Port) self.Eip = nonNegative(self.Eip - squota.Eip) self.Eport = nonNegative(self.Eport - squota.Eport) - self.Bw = nonNegative(self.Bw - squota.Bw) - self.Ebw = nonNegative(self.Ebw - squota.Ebw) + // self.Bw = nonNegative(self.Bw - squota.Bw) + // self.Ebw = nonNegative(self.Ebw - squota.Ebw) self.Snapshot = nonNegative(self.Snapshot - squota.Snapshot) self.Bucket = nonNegative(self.Bucket - squota.Bucket) self.ObjectGB = nonNegative(self.ObjectGB - squota.ObjectGB) @@ -324,12 +324,12 @@ func (self *SRegionQuota) Allocable(request quotas.IQuota) int { if self.Eport >= 0 && squota.Eport > 0 && (cnt < 0 || cnt > self.Eport/squota.Eport) { cnt = self.Eport / squota.Eport } - if self.Bw >= 0 && squota.Bw > 0 && (cnt < 0 || cnt > self.Bw/squota.Bw) { - cnt = self.Bw / squota.Bw - } - if self.Ebw >= 0 && squota.Ebw > 0 && (cnt < 0 || cnt > self.Ebw/squota.Ebw) { - cnt = self.Ebw / squota.Ebw - } + //if self.Bw >= 0 && squota.Bw > 0 && (cnt < 0 || cnt > self.Bw/squota.Bw) { + // cnt = self.Bw / squota.Bw + //} + //if self.Ebw >= 0 && squota.Ebw > 0 && (cnt < 0 || cnt > self.Ebw/squota.Ebw) { + // cnt = self.Ebw / squota.Ebw + //} if self.Snapshot >= 0 && squota.Snapshot > 0 && (cnt < 0 || cnt > self.Snapshot/squota.Snapshot) { cnt = self.Snapshot / squota.Snapshot } @@ -365,12 +365,12 @@ func (self *SRegionQuota) Update(quota quotas.IQuota) { if squota.Eport > 0 { self.Eport = squota.Eport } - if squota.Bw > 0 { - self.Bw = squota.Bw - } - if squota.Ebw > 0 { - self.Ebw = squota.Ebw - } + //if squota.Bw > 0 { + // self.Bw = squota.Bw + //} + //if squota.Ebw > 0 { + // self.Ebw = squota.Ebw + //} if squota.Snapshot > 0 { self.Snapshot = squota.Snapshot } @@ -407,12 +407,12 @@ func (used *SRegionQuota) Exceed(request quotas.IQuota, quota quotas.IQuota) err if quotas.Exceed(used.Eport, sreq.Eport, squota.Eport) { err.Add("eport", squota.Eport, used.Eport, sreq.Eport) } - if quotas.Exceed(used.Bw, sreq.Bw, squota.Bw) { - err.Add("bw", squota.Bw, used.Bw, sreq.Bw) - } - if quotas.Exceed(used.Bw, sreq.Ebw, squota.Ebw) { - err.Add("ebw", squota.Ebw, used.Ebw, sreq.Ebw) - } + //if quotas.Exceed(used.Bw, sreq.Bw, squota.Bw) { + // err.Add("bw", squota.Bw, used.Bw, sreq.Bw) + //} + //if quotas.Exceed(used.Bw, sreq.Ebw, squota.Ebw) { + // err.Add("ebw", squota.Ebw, used.Ebw, sreq.Ebw) + //} if quotas.Exceed(used.Snapshot, sreq.Snapshot, squota.Snapshot) { err.Add("snapshot", squota.Snapshot, used.Snapshot, sreq.Snapshot) } @@ -446,8 +446,8 @@ func (self *SRegionQuota) ToJSON(prefix string) jsonutils.JSONObject { ret.Add(jsonutils.NewInt(int64(self.Port)), keyName(prefix, "port")) ret.Add(jsonutils.NewInt(int64(self.Eip)), keyName(prefix, "eip")) ret.Add(jsonutils.NewInt(int64(self.Eport)), keyName(prefix, "eport")) - ret.Add(jsonutils.NewInt(int64(self.Bw)), keyName(prefix, "bw")) - ret.Add(jsonutils.NewInt(int64(self.Ebw)), keyName(prefix, "ebw")) + //ret.Add(jsonutils.NewInt(int64(self.Bw)), keyName(prefix, "bw")) + //ret.Add(jsonutils.NewInt(int64(self.Ebw)), keyName(prefix, "ebw")) ret.Add(jsonutils.NewInt(int64(self.Snapshot)), keyName(prefix, "snapshot")) ret.Add(jsonutils.NewInt(int64(self.Bucket)), keyName(prefix, "bucket")) ret.Add(jsonutils.NewInt(int64(self.ObjectGB)), keyName(prefix, "object_gb"))