From 3e09d4920bace28a3ba48ca65470ffb5a4f35561 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 22 May 2020 11:08:08 +0800 Subject: [PATCH] vpcagent: models: remove now boilerplate code --- pkg/vpcagent/models/modelset.go | 68 --------------------------------- 1 file changed, 68 deletions(-) diff --git a/pkg/vpcagent/models/modelset.go b/pkg/vpcagent/models/modelset.go index 91e9826075..50102ad6b1 100644 --- a/pkg/vpcagent/models/modelset.go +++ b/pkg/vpcagent/models/modelset.go @@ -57,14 +57,6 @@ func (set Vpcs) Copy() apihelper.IModelSet { return setCopy } -func (set Vpcs) IncludeDetails() bool { - return false -} - -func (set Vpcs) IncludeEmulated() bool { - return false -} - func (ms Vpcs) joinWires(subEntries Wires) bool { correct := true for _, subEntry := range subEntries { @@ -137,10 +129,6 @@ func (set Wires) Copy() apihelper.IModelSet { return setCopy } -func (set Wires) IncludeDetails() bool { - return false -} - func (set Wires) IncludeEmulated() bool { return true } @@ -180,14 +168,6 @@ func (set Guests) Copy() apihelper.IModelSet { return setCopy } -func (set Guests) IncludeDetails() bool { - return false -} - -func (set Guests) IncludeEmulated() bool { - return false -} - func (set Guests) initJoin() { for _, el := range set { el.SecurityGroups = SecurityGroups{} @@ -267,14 +247,6 @@ func (set Hosts) Copy() apihelper.IModelSet { return setCopy } -func (set Hosts) IncludeDetails() bool { - return false -} - -func (set Hosts) IncludeEmulated() bool { - return false -} - func (set Networks) ModelManager() mcclient_modulebase.IBaseManager { return &mcclient_modules.Networks } @@ -296,14 +268,6 @@ func (set Networks) Copy() apihelper.IModelSet { return setCopy } -func (set Networks) IncludeDetails() bool { - return false -} - -func (set Networks) IncludeEmulated() bool { - return false -} - func (ms Networks) joinGuestnetworks(subEntries Guestnetworks) bool { for _, m := range ms { m.Guestnetworks = Guestnetworks{} @@ -350,14 +314,6 @@ func (set Guestnetworks) Copy() apihelper.IModelSet { return setCopy } -func (set Guestnetworks) IncludeDetails() bool { - return false -} - -func (set Guestnetworks) IncludeEmulated() bool { - return false -} - func (set Guestnetworks) joinGuests(subEntries Guests) bool { for _, gn := range set { gId := gn.GuestId @@ -397,14 +353,6 @@ func (set SecurityGroups) Copy() apihelper.IModelSet { return setCopy } -func (set SecurityGroups) IncludeDetails() bool { - return false -} - -func (set SecurityGroups) IncludeEmulated() bool { - return false -} - func (ms SecurityGroups) joinSecurityGroupRules(subEntries SecurityGroupRules) bool { for _, m := range ms { m.SecurityGroupRules = SecurityGroupRules{} @@ -450,14 +398,6 @@ func (set SecurityGroupRules) Copy() apihelper.IModelSet { return setCopy } -func (set SecurityGroupRules) IncludeDetails() bool { - return false -} - -func (set SecurityGroupRules) IncludeEmulated() bool { - return false -} - func (set Guestsecgroups) ModelManager() mcclient_modulebase.IBaseManager { return &mcclient_modules.Serversecgroups } @@ -479,14 +419,6 @@ func (set Guestsecgroups) Copy() apihelper.IModelSet { return setCopy } -func (set Guestsecgroups) IncludeDetails() bool { - return false -} - -func (set Guestsecgroups) IncludeEmulated() bool { - return false -} - func (set Guestsecgroups) joinSecurityGroups(subEntries SecurityGroups) bool { for _, el := range set { secgroupId := el.SecgroupId