From fb26b0c3899eb3677b6ea6d3d4875fa4bdc68505 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Wed, 27 May 2020 12:21:22 +0800 Subject: [PATCH] vet: composite literal uses unkeyed fields --- cmd/climc/shell/compute/scaling_policy.go | 2 +- cmd/climc/shell/compute/servernetworks.go | 2 +- pkg/apigateway/handler/resource.go | 20 ++++++-- pkg/compute/models/snapshotpolicycache.go | 8 ++- pkg/esxi/handler/handlers.go | 5 +- .../guestman/guesthandlers/guesthandler.go | 51 +++++++++++++++---- .../guestman/guesthandlers/guestimport.go | 13 ++++- .../storageman/diskhandlers/diskhandler.go | 17 +++++-- pkg/logger/models/actionlog.go | 6 ++- pkg/mcclient/modules/mod_projects.go | 47 ++++++++++++----- pkg/multicloud/esxi/devtools.go | 16 ++++-- .../huawei/client/modules/manager_base.go | 7 ++- pkg/notify/cache/usercache.go | 6 ++- pkg/scheduler/models/pending_usage.go | 5 +- pkg/util/dhcp/server.go | 32 ++++++------ 15 files changed, 177 insertions(+), 60 deletions(-) diff --git a/cmd/climc/shell/compute/scaling_policy.go b/cmd/climc/shell/compute/scaling_policy.go index 863c8a1370..d73b56fff6 100644 --- a/cmd/climc/shell/compute/scaling_policy.go +++ b/cmd/climc/shell/compute/scaling_policy.go @@ -101,7 +101,7 @@ func init() { ScalingGroup: args.ScalingGroup, TriggerType: args.TriggerType, Timer: api.ScalingTimerCreateInput{ - args.TimingExecTime, + ExecTime: args.TimingExecTime, }, CycleTimer: api.ScalingCycleTimerCreateInput{ CycleType: args.CycleCycleType, diff --git a/cmd/climc/shell/compute/servernetworks.go b/cmd/climc/shell/compute/servernetworks.go index 2e49f3ce30..c4ccfb6426 100644 --- a/cmd/climc/shell/compute/servernetworks.go +++ b/cmd/climc/shell/compute/servernetworks.go @@ -155,7 +155,7 @@ func init() { NETDESC []string `help:"Network description"` } R(&ServerAttachNetworkOptions{}, "server-attach-network", "Attach a server to a virtual network", func(s *mcclient.ClientSession, args *ServerAttachNetworkOptions) error { - input := compute.AttachNetworkInput{[]*compute.NetworkConfig{}} + input := compute.AttachNetworkInput{} for i := 0; i < len(args.NETDESC); i++ { conf, err := cmdline.ParseNetworkConfig(args.NETDESC[i], -1) if err != nil { diff --git a/pkg/apigateway/handler/resource.go b/pkg/apigateway/handler/resource.go index cc54fdc040..00d057b610 100644 --- a/pkg/apigateway/handler/resource.go +++ b/pkg/apigateway/handler/resource.go @@ -325,7 +325,10 @@ func (f *ResourceHandlers) listInContextsHandler(ctx context.Context, w http.Res module3 := req.Mod3() session := req.Session() query := req.Query() - obj, e := module3.ListInContexts(session, query, []modulebase.ManagerContext{{module, req.ResID()}, {module2, req.ResID2()}}) + obj, e := module3.ListInContexts(session, query, []modulebase.ManagerContext{ + {InstanceManager: module, InstanceId: req.ResID()}, + {InstanceManager: module2, InstanceId: req.ResID2()}, + }) if e != nil { httperrors.GeneralServerError(w, e) } else { @@ -659,7 +662,10 @@ func (f *ResourceHandlers) updateInContextsHandler(ctx context.Context, w http.R return } - obj, e := req.Mod3().PutInContexts(req.Session(), req.ResID3(), req.Body(), []modulebase.ManagerContext{{req.Mod1(), req.ResID()}, {req.Mod2(), req.ResID2()}}) + obj, e := req.Mod3().PutInContexts(req.Session(), req.ResID3(), req.Body(), []modulebase.ManagerContext{ + {InstanceManager: req.Mod1(), InstanceId: req.ResID()}, + {InstanceManager: req.Mod2(), InstanceId: req.ResID2()}, + }) if e != nil { httperrors.GeneralServerError(w, e) } else { @@ -679,7 +685,10 @@ func (f *ResourceHandlers) patchInContextsHandler(ctx context.Context, w http.Re session := req.Session() body := req.Body() - obj, e := module3.PatchInContexts(session, req.ResID3(), body, []modulebase.ManagerContext{{module, req.ResID()}, {module2, req.ResID2()}}) + obj, e := module3.PatchInContexts(session, req.ResID3(), body, []modulebase.ManagerContext{ + {InstanceManager: module, InstanceId: req.ResID()}, + {InstanceManager: module2, InstanceId: req.ResID2()}, + }) if e != nil { httperrors.GeneralServerError(w, e) } else { @@ -794,7 +803,10 @@ func (f *ResourceHandlers) deleteInContextsHandler(ctx context.Context, w http.R query := req.Query() body := req.Body() - obj, e := module3.DeleteInContextsWithParam(session, req.ResID3(), query, body, []modulebase.ManagerContext{{module, req.ResID()}, {module2, req.ResID2()}}) + obj, e := module3.DeleteInContextsWithParam(session, req.ResID3(), query, body, []modulebase.ManagerContext{ + {InstanceManager: module, InstanceId: req.ResID()}, + {InstanceManager: module2, InstanceId: req.ResID2()}, + }) if e != nil { httperrors.GeneralServerError(w, e) } else { diff --git a/pkg/compute/models/snapshotpolicycache.go b/pkg/compute/models/snapshotpolicycache.go index caae139ac5..b409215f8f 100644 --- a/pkg/compute/models/snapshotpolicycache.go +++ b/pkg/compute/models/snapshotpolicycache.go @@ -69,8 +69,12 @@ func init() { func NewSSnapshotPolicyCache(snapshotpolicyId, cloudregionId, externalId string) *SSnapshotPolicyCache { cache := SSnapshotPolicyCache{ // SnapshotpolicyId: snapshotpolicyId, - SCloudregionResourceBase: SCloudregionResourceBase{cloudregionId}, - SExternalizedResourceBase: db.SExternalizedResourceBase{externalId}, + SCloudregionResourceBase: SCloudregionResourceBase{ + CloudregionId: cloudregionId, + }, + SExternalizedResourceBase: db.SExternalizedResourceBase{ + ExternalId: externalId, + }, } cache.SnapshotpolicyId = snapshotpolicyId cache.SetModelManager(SnapshotPolicyCacheManager, &cache) diff --git a/pkg/esxi/handler/handlers.go b/pkg/esxi/handler/handlers.go index dae2ba362e..1a68037717 100644 --- a/pkg/esxi/handler/handlers.go +++ b/pkg/esxi/handler/handlers.go @@ -128,7 +128,10 @@ func savePrepareHandler(ctx context.Context, w http.ResponseWriter, r *http.Requ httperrors.GeneralServerError(w, err) return } - hostutils.DelayTask(ctx, disk.PrepareSaveToGlance, storageman.PrepareSaveToGlanceParams{taskId, diskInfo}) + hostutils.DelayTask(ctx, disk.PrepareSaveToGlance, storageman.PrepareSaveToGlanceParams{ + TaskId: taskId, + DiskInfo: diskInfo, + }) hostutils.ResponseOk(ctx, w) } diff --git a/pkg/hostman/guestman/guesthandlers/guesthandler.go b/pkg/hostman/guestman/guesthandlers/guesthandler.go index 540b4c6e77..e5a62306d0 100644 --- a/pkg/hostman/guestman/guesthandlers/guesthandler.go +++ b/pkg/hostman/guestman/guesthandlers/guesthandler.go @@ -136,7 +136,11 @@ func guestCreate(ctx context.Context, sid string, body jsonutils.JSONObject) (in } hostutils.DelayTaskWithWorker(ctx, guestman.GetGuestManager().GuestCreate, - &guestman.SGuestDeploy{sid, body, true}, + &guestman.SGuestDeploy{ + Sid: sid, + Body: body, + IsInit: true, + }, guestman.NbdWorker, ) return nil, nil @@ -149,7 +153,11 @@ func guestDeploy(ctx context.Context, sid string, body jsonutils.JSONObject) (in } hostutils.DelayTaskWithWorker(ctx, guestman.GetGuestManager().GuestDeploy, - &guestman.SGuestDeploy{sid, body, false}, + &guestman.SGuestDeploy{ + Sid: sid, + Body: body, + IsInit: false, + }, guestman.NbdWorker, ) return nil, nil @@ -196,7 +204,10 @@ func guestSync(ctx context.Context, sid string, body jsonutils.JSONObject) (inte if !guestman.GetGuestManager().IsGuestExist(sid) { return nil, httperrors.NewNotFoundError("Guest %s not found", sid) } - hostutils.DelayTask(ctx, guestman.GetGuestManager().GuestSync, &guestman.SBaseParms{sid, body}) + hostutils.DelayTask(ctx, guestman.GetGuestManager().GuestSync, &guestman.SBaseParms{ + Sid: sid, + Body: body, + }) return nil, nil } @@ -224,7 +235,11 @@ func guestIoThrottle(ctx context.Context, sid string, body jsonutils.JSONObject) if err != nil { return nil, httperrors.NewMissingParameterError("iops") } - hostutils.DelayTaskWithoutReqctx(ctx, guestman.GetGuestManager().GuestIoThrottle, &guestman.SGuestIoThrottle{sid, bps, iops}) + hostutils.DelayTaskWithoutReqctx(ctx, guestman.GetGuestManager().GuestIoThrottle, &guestman.SGuestIoThrottle{ + Sid: sid, + BPS: bps, + IOPS: iops, + }) return nil, nil } @@ -234,7 +249,10 @@ func guestSrcPrepareMigrate(ctx context.Context, sid string, body jsonutils.JSON } liveMigrate := jsonutils.QueryBoolean(body, "live_migrate", false) hostutils.DelayTask(ctx, guestman.GetGuestManager().SrcPrepareMigrate, - &guestman.SSrcPrepareMigrate{sid, liveMigrate}) + &guestman.SSrcPrepareMigrate{ + Sid: sid, + LiveMigrate: liveMigrate, + }) return nil, nil } @@ -359,7 +377,11 @@ func guestDriveMirror(ctx context.Context, sid string, body jsonutils.JSONObject return nil, httperrors.NewMissingParameterError("desc") } hostutils.DelayTaskWithoutReqctx(ctx, guestman.GetGuestManager().StartDriveMirror, - &guestman.SDriverMirror{sid, backupNbdServerUri, desc}) + &guestman.SDriverMirror{ + Sid: sid, + NbdServerUri: backupNbdServerUri, + Desc: desc, + }) return nil, nil } @@ -383,7 +405,11 @@ func guestHotplugCpuMem(ctx context.Context, sid string, body jsonutils.JSONObje addCpuCount, _ := body.Int("add_cpu") addMemSize, _ := body.Int("add_mem") hostutils.DelayTaskWithoutReqctx(ctx, guestman.GetGuestManager().HotplugCpuMem, - &guestman.SGuestHotplugCpuMem{sid, addCpuCount, addMemSize}) + &guestman.SGuestHotplugCpuMem{ + Sid: sid, + AddCpuCount: addCpuCount, + AddMemSize: addMemSize, + }) return nil, nil } @@ -411,7 +437,10 @@ func guestReloadDiskSnapshot(ctx context.Context, sid string, body jsonutils.JSO return nil, httperrors.NewNotFoundError("Disk not found") } - hostutils.DelayTask(ctx, guestman.GetGuestManager().ReloadDiskSnapshot, &guestman.SReloadDisk{sid, disk}) + hostutils.DelayTask(ctx, guestman.GetGuestManager().ReloadDiskSnapshot, &guestman.SReloadDisk{ + Sid: sid, + Disk: disk, + }) return nil, nil } @@ -443,7 +472,11 @@ func guestSnapshot(ctx context.Context, sid string, body jsonutils.JSONObject) ( return nil, httperrors.NewNotFoundError("Disk not found") } - hostutils.DelayTask(ctx, guestman.GetGuestManager().DoSnapshot, &guestman.SDiskSnapshot{sid, snapshotId, disk}) + hostutils.DelayTask(ctx, guestman.GetGuestManager().DoSnapshot, &guestman.SDiskSnapshot{ + Sid: sid, + SnapshotId: snapshotId, + Disk: disk, + }) return nil, nil } diff --git a/pkg/hostman/guestman/guesthandlers/guestimport.go b/pkg/hostman/guestman/guesthandlers/guestimport.go index 131c45959e..e7bdb5fb30 100644 --- a/pkg/hostman/guestman/guesthandlers/guestimport.go +++ b/pkg/hostman/guestman/guesthandlers/guestimport.go @@ -94,7 +94,12 @@ func guestCreateFromLibvirt(ctx context.Context, sid string, body jsonutils.JSON } hostutils.DelayTask(ctx, guestman.GetGuestManager().GuestCreateFromLibvirt, - &guestman.SGuestCreateFromLibvirt{sid, monitorPath, guestDesc, disksPath}) + &guestman.SGuestCreateFromLibvirt{ + Sid: sid, + MonitorPath: monitorPath, + GuestDesc: guestDesc, + DisksPath: disksPath, + }) return nil, nil } @@ -118,6 +123,10 @@ func guestCreateFromEsxi(ctx context.Context, sid string, body jsonutils.JSONObj return nil, httperrors.NewMissingParameterError("esxi_access_info") } hostutils.DelayTask(ctx, guestman.GetGuestManager().GuestCreateFromEsxi, - &guestman.SGuestCreateFromEsxi{sid, guestDesc, disksAccessInfo}) + &guestman.SGuestCreateFromEsxi{ + Sid: sid, + GuestDesc: guestDesc, + EsxiAccessInfo: disksAccessInfo, + }) return nil, nil } diff --git a/pkg/hostman/storageman/diskhandlers/diskhandler.go b/pkg/hostman/storageman/diskhandlers/diskhandler.go index 4c013abf8a..b36a57a0f7 100644 --- a/pkg/hostman/storageman/diskhandlers/diskhandler.go +++ b/pkg/hostman/storageman/diskhandlers/diskhandler.go @@ -242,7 +242,12 @@ func diskCreate(ctx context.Context, storage storageman.IStorage, diskId string, return nil, httperrors.NewMissingParameterError("disk") } hostutils.DelayTask(ctx, storage.CreateDiskByDiskinfo, - &storageman.SDiskCreateByDiskinfo{diskId, disk, diskInfo, storage}) + &storageman.SDiskCreateByDiskinfo{ + DiskId: diskId, + Disk: disk, + DiskInfo: diskInfo, + Storage: storage, + }) return nil, nil } @@ -284,7 +289,10 @@ func diskReset(ctx context.Context, storage storageman.IStorage, diskId string, if err != nil { return nil, httperrors.NewMissingParameterError("snapshot_id") } - hostutils.DelayTask(ctx, disk.ResetFromSnapshot, &storageman.SDiskReset{snapshotId, body}) + hostutils.DelayTask(ctx, disk.ResetFromSnapshot, &storageman.SDiskReset{ + SnapshotId: snapshotId, + Input: body, + }) return nil, nil } @@ -315,6 +323,9 @@ func diskCleanupSnapshots(ctx context.Context, storage storageman.IStorage, disk if err != nil { return nil, httperrors.NewMissingParameterError("delete_snapshots") } - hostutils.DelayTask(ctx, disk.CleanupSnapshots, &storageman.SDiskCleanupSnapshots{convertSnapshots, deleteSnapshots}) + hostutils.DelayTask(ctx, disk.CleanupSnapshots, &storageman.SDiskCleanupSnapshots{ + ConvertSnapshots: convertSnapshots, + DeleteSnapshots: deleteSnapshots, + }) return nil, nil } diff --git a/pkg/logger/models/actionlog.go b/pkg/logger/models/actionlog.go index 300231c480..016c1bcb8f 100644 --- a/pkg/logger/models/actionlog.go +++ b/pkg/logger/models/actionlog.go @@ -57,7 +57,11 @@ var logQueue = make(chan *SActionlog, 50) func init() { InitActionWhiteList() - ActionLog = &SActionlogManager{db.SOpsLogManager{db.NewModelBaseManager(SActionlog{}, "action_tbl", "action", "actions")}} + ActionLog = &SActionlogManager{ + SOpsLogManager: db.SOpsLogManager{ + SModelBaseManager: db.NewModelBaseManager(SActionlog{}, "action_tbl", "action", "actions"), + }, + } ActionLog.SetVirtualObject(ActionLog) } diff --git a/pkg/mcclient/modules/mod_projects.go b/pkg/mcclient/modules/mod_projects.go index 802bcd8e2f..144adb6899 100644 --- a/pkg/mcclient/modules/mod_projects.go +++ b/pkg/mcclient/modules/mod_projects.go @@ -36,12 +36,18 @@ var ( func (this *ProjectManagerV3) _join(s *mcclient.ClientSession, pid, uid, rid, resource string) error { if resource == "users" { - _, err := RolesV3.PutInContexts(s, rid, nil, []modulebase.ManagerContext{{&Projects, pid}, {&UsersV3, uid}}) + _, err := RolesV3.PutInContexts(s, rid, nil, []modulebase.ManagerContext{ + {InstanceManager: &Projects, InstanceId: pid}, + {InstanceManager: &UsersV3, InstanceId: uid}, + }) if err != nil { return err } } else if resource == "groups" { - _, err := RolesV3.PutInContexts(s, rid, nil, []modulebase.ManagerContext{{&Projects, pid}, {&Groups, uid}}) + _, err := RolesV3.PutInContexts(s, rid, nil, []modulebase.ManagerContext{ + {InstanceManager: &Projects, InstanceId: pid}, + {InstanceManager: &Groups, InstanceId: uid}, + }) if err != nil { return err } @@ -52,9 +58,15 @@ func (this *ProjectManagerV3) _join(s *mcclient.ClientSession, pid, uid, rid, re func (this *ProjectManagerV3) _leave(s *mcclient.ClientSession, pid string, resource string, uid string, rid string) error { var err error if resource == "users" { - _, err = RolesV3.DeleteInContexts(s, rid, nil, []modulebase.ManagerContext{{&Projects, pid}, {&UsersV3, uid}}) + _, err = RolesV3.DeleteInContexts(s, rid, nil, []modulebase.ManagerContext{ + {InstanceManager: &Projects, InstanceId: pid}, + {InstanceManager: &UsersV3, InstanceId: uid}, + }) } else if resource == "groups" { - _, err = RolesV3.DeleteInContexts(s, rid, nil, []modulebase.ManagerContext{{&Projects, pid}, {&Groups, uid}}) + _, err = RolesV3.DeleteInContexts(s, rid, nil, []modulebase.ManagerContext{ + {InstanceManager: &Projects, InstanceId: pid}, + {InstanceManager: &Groups, InstanceId: uid}, + }) } if err != nil { return err @@ -194,9 +206,9 @@ func (this *ProjectManagerV3) DoProjectBatchJoin(s *mcclient.ClientSession, para rid, nil, []modulebase.ManagerContext{ - {&Projects, - pid}, - {&UsersV3, id}}) + {InstanceManager: &Projects, InstanceId: pid}, + {InstanceManager: &UsersV3, InstanceId: id}, + }) if err != nil { return nil, err } @@ -206,9 +218,9 @@ func (this *ProjectManagerV3) DoProjectBatchJoin(s *mcclient.ClientSession, para rid, nil, []modulebase.ManagerContext{ - {&Projects, - pid}, - {&Groups, id}}) + {InstanceManager: &Projects, InstanceId: pid}, + {InstanceManager: &Groups, InstanceId: id}, + }) if err != nil { return nil, err } @@ -243,12 +255,18 @@ func (this *ProjectManagerV3) DoProjectBatchDeleteUserGroup(s *mcclient.ClientSe res_type, _ := item.GetString("res_type") if res_type == "user" { - _, err := RolesV3.DeleteInContexts(s, role_id, nil, []modulebase.ManagerContext{{&Projects, pid}, {&UsersV3, id}}) + _, err := RolesV3.DeleteInContexts(s, role_id, nil, []modulebase.ManagerContext{ + {InstanceManager: &Projects, InstanceId: pid}, + {InstanceManager: &UsersV3, InstanceId: id}, + }) if err != nil { return nil, err } } else if res_type == "group" { - _, err := RolesV3.DeleteInContexts(s, role_id, nil, []modulebase.ManagerContext{{&Projects, pid}, {&Groups, id}}) + _, err := RolesV3.DeleteInContexts(s, role_id, nil, []modulebase.ManagerContext{ + {InstanceManager: &Projects, InstanceId: pid}, + {InstanceManager: &Groups, InstanceId: id}, + }) if err != nil { return nil, err } @@ -282,7 +300,10 @@ func (this *ProjectManagerV3) FetchId(s *mcclient.ClientSession, project string, } func (this *ProjectManagerV3) JoinProject(s *mcclient.ClientSession, rid, pid, uid string) error { - _, err := RolesV3.PutInContexts(s, rid, nil, []modulebase.ManagerContext{{&Projects, pid}, {&UsersV3, uid}}) + _, err := RolesV3.PutInContexts(s, rid, nil, []modulebase.ManagerContext{ + {InstanceManager: &Projects, InstanceId: pid}, + {InstanceManager: &UsersV3, InstanceId: uid}, + }) if err != nil { return err } diff --git a/pkg/multicloud/esxi/devtools.go b/pkg/multicloud/esxi/devtools.go index eb74105cf1..8d650a28bf 100644 --- a/pkg/multicloud/esxi/devtools.go +++ b/pkg/multicloud/esxi/devtools.go @@ -114,7 +114,11 @@ func NewCDROMDev(path string, key, ctlKey int32) types.BaseVirtualDevice { connectable := types.VirtualDeviceConnectInfo{AllowGuestControl: true, Status: "untried"} if len(path) != 0 { - device.Backing = &types.VirtualCdromIsoBackingInfo{types.VirtualDeviceFileBackingInfo{FileName: path}} + device.Backing = &types.VirtualCdromIsoBackingInfo{ + VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{ + FileName: path, + }, + } connectable.StartConnected = true } else { device.Backing = &types.VirtualCdromRemoteAtapiBackingInfo{} @@ -205,8 +209,14 @@ func NewVNICDev(host *SHost, mac, driver string, vlanId int32, key, ctlKey, inde nic.AddressType = "Generated" } if driver == "e1000" { - return &types.VirtualE1000{nic}, nil + return &types.VirtualE1000{ + VirtualEthernetCard: nic, + }, nil } - return &types.VirtualVmxnet3{types.VirtualVmxnet{nic}}, nil + return &types.VirtualVmxnet3{ + VirtualVmxnet: types.VirtualVmxnet{ + VirtualEthernetCard: nic, + }, + }, nil } diff --git a/pkg/multicloud/huawei/client/modules/manager_base.go b/pkg/multicloud/huawei/client/modules/manager_base.go index 0657473a2d..6828fb7a05 100644 --- a/pkg/multicloud/huawei/client/modules/manager_base.go +++ b/pkg/multicloud/huawei/client/modules/manager_base.go @@ -99,7 +99,12 @@ func (self *SBaseManager) _list(request requests.IRequest, responseKey string) ( offset, _ = strconv.Atoi(v) } - return &responses.ListResult{rets, int(total), limit, offset}, nil + return &responses.ListResult{ + Data: rets, + Total: int(total), + Limit: limit, + Offset: offset, + }, nil } func (self *SBaseManager) _do(request requests.IRequest, responseKey string) (jsonutils.JSONObject, error) { diff --git a/pkg/notify/cache/usercache.go b/pkg/notify/cache/usercache.go index 774c1fd4e9..160de8a664 100644 --- a/pkg/notify/cache/usercache.go +++ b/pkg/notify/cache/usercache.go @@ -40,8 +40,10 @@ func (user *SUser) GetModelManager() db.IModelManager { var UserCacheManager *SUserCacheManager func init() { - dbUserCacheManager := db.SUserCacheManager{db.NewKeystoneCacheObjectManager(db.SUser{}, "users_cache_tbl", "user", - "users")} + dbUserCacheManager := db.SUserCacheManager{ + SKeystoneCacheObjectManager: db.NewKeystoneCacheObjectManager( + db.SUser{}, "users_cache_tbl", "user", "users"), + } UserCacheManager = &SUserCacheManager{ dbUserCacheManager, } diff --git a/pkg/scheduler/models/pending_usage.go b/pkg/scheduler/models/pending_usage.go index 0aad72da81..24b74be166 100644 --- a/pkg/scheduler/models/pending_usage.go +++ b/pkg/scheduler/models/pending_usage.go @@ -328,7 +328,10 @@ func NewPendingUsageBySchedInfo(hostId string, req *api.SchedInfo) *SPendingUsag // but in the future, info may increase group := &computemodels.SGroup{} group.Id = groupId - u.InstanceGroupUsage[groupId] = &api.CandidateGroup{group, 1} + u.InstanceGroupUsage[groupId] = &api.CandidateGroup{ + SGroup: group, + ReferCount: 1, + } } return u diff --git a/pkg/util/dhcp/server.go b/pkg/util/dhcp/server.go index 1508212a2b..fe2b05450b 100644 --- a/pkg/util/dhcp/server.go +++ b/pkg/util/dhcp/server.go @@ -61,22 +61,22 @@ func NewDHCPServer3(address string, port int) (*DHCPServer, error) { func NewDHCPServer2(iface string, dhcpServerPort, dhcpRelayPort uint16) (*DHCPServer, *Conn, error) { // ip and udp and port 67 and port 68 bpf := []bpf.RawInstruction{ - {0x28, 0, 0, 0x0000000c}, - {0x15, 0, 13, 0x00000800}, - {0x30, 0, 0, 0x00000017}, - {0x15, 0, 11, 0x00000011}, - {0x28, 0, 0, 0x00000014}, - {0x45, 9, 0, 0x00001fff}, - {0xb1, 0, 0, 0x0000000e}, - {0x48, 0, 0, 0x0000000e}, - {0x15, 0, 2, uint32(dhcpServerPort)}, - {0x48, 0, 0, 0x00000010}, - {0x15, 3, 4, uint32(dhcpRelayPort)}, - {0x15, 0, 3, uint32(dhcpRelayPort)}, - {0x48, 0, 0, 0x00000010}, - {0x15, 0, 1, uint32(dhcpServerPort)}, - {0x6, 0, 0, 0x00040000}, - {0x6, 0, 0, 0x00000000}, + {Op: 0x28, Jt: 0, Jf: 0, K: 0x0000000c}, + {Op: 0x15, Jt: 0, Jf: 13, K: 0x00000800}, + {Op: 0x30, Jt: 0, Jf: 0, K: 0x00000017}, + {Op: 0x15, Jt: 0, Jf: 11, K: 0x00000011}, + {Op: 0x28, Jt: 0, Jf: 0, K: 0x00000014}, + {Op: 0x45, Jt: 9, Jf: 0, K: 0x00001fff}, + {Op: 0xb1, Jt: 0, Jf: 0, K: 0x0000000e}, + {Op: 0x48, Jt: 0, Jf: 0, K: 0x0000000e}, + {Op: 0x15, Jt: 0, Jf: 2, K: uint32(dhcpServerPort)}, + {Op: 0x48, Jt: 0, Jf: 0, K: 0x00000010}, + {Op: 0x15, Jt: 3, Jf: 4, K: uint32(dhcpRelayPort)}, + {Op: 0x15, Jt: 0, Jf: 3, K: uint32(dhcpRelayPort)}, + {Op: 0x48, Jt: 0, Jf: 0, K: 0x00000010}, + {Op: 0x15, Jt: 0, Jf: 1, K: uint32(dhcpServerPort)}, + {Op: 0x6, Jt: 0, Jf: 0, K: 0x00040000}, + {Op: 0x6, Jt: 0, Jf: 0, K: 0x00000000}, } conn, err := NewRawSocketConn(iface, bpf, dhcpServerPort) if err != nil {