diff --git a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/cmd/main.go b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/cmd/main.go index 3ca00fb8273..2f398d58974 100644 --- a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/cmd/main.go +++ b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/cmd/main.go @@ -9,9 +9,9 @@ import ( "github.com/kubeedge/Template/device" "github.com/kubeedge/Template/pkg/common" "github.com/kubeedge/Template/pkg/config" + "github.com/kubeedge/Template/pkg/grpcclient" "github.com/kubeedge/Template/pkg/grpcserver" "github.com/kubeedge/Template/pkg/httpserver" - "github.com/kubeedge/Template/pkg/util/grpcclient" "github.com/kubeedge/Template/pkg/util/parse" ) @@ -50,7 +50,7 @@ func main() { // if dev init mode is register, mapper's dev will init when registry to edgecore if c.DevInit.Mode != common.DevInitModeRegister { klog.Infoln("======dev init mode is not register, will register to edgecore") - if _, _, err = grpcclient.RegisterMapper(&c, false); err != nil { + if _, _, err = grpcclient.RegisterMapper(false); err != nil { klog.Fatal(err) } klog.Infoln("registerMapper finished") diff --git a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/device/device.go b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/device/device.go index f0077566d7f..c4ddf7de8df 100644 --- a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/device/device.go +++ b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/device/device.go @@ -277,7 +277,7 @@ func (d *DevPanel) DevInit(cfg *config.Config) error { // return err // } case common.DevInitModeRegister: - if err := parse.ParseByUsingRegister(cfg, devs, d.models, d.protocols); err != nil { + if err := parse.ParseByUsingRegister(devs, d.models, d.protocols); err != nil { return err } } diff --git a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/device/devicetwin.go b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/device/devicetwin.go index e5563f4a551..5df21570e71 100644 --- a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/device/devicetwin.go +++ b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/device/devicetwin.go @@ -12,7 +12,7 @@ import ( "github.com/kubeedge/Template/driver" "github.com/kubeedge/Template/pkg/common" dmiapi "github.com/kubeedge/Template/pkg/dmi-api" - "github.com/kubeedge/Template/pkg/util/grpcclient" + "github.com/kubeedge/Template/pkg/grpcclient" "github.com/kubeedge/Template/pkg/util/parse" ) diff --git a/staging/src/github.com/kubeedge/mapper-framework/pkg/util/grpcclient/config.go b/staging/src/github.com/kubeedge/mapper-framework/pkg/grpcclient/config.go similarity index 100% rename from staging/src/github.com/kubeedge/mapper-framework/pkg/util/grpcclient/config.go rename to staging/src/github.com/kubeedge/mapper-framework/pkg/grpcclient/config.go diff --git a/staging/src/github.com/kubeedge/mapper-framework/pkg/util/grpcclient/register.go b/staging/src/github.com/kubeedge/mapper-framework/pkg/grpcclient/register.go similarity index 90% rename from staging/src/github.com/kubeedge/mapper-framework/pkg/util/grpcclient/register.go rename to staging/src/github.com/kubeedge/mapper-framework/pkg/grpcclient/register.go index 3f577f956c5..f582de56e61 100644 --- a/staging/src/github.com/kubeedge/mapper-framework/pkg/util/grpcclient/register.go +++ b/staging/src/github.com/kubeedge/mapper-framework/pkg/grpcclient/register.go @@ -9,12 +9,11 @@ import ( "google.golang.org/grpc" "github.com/kubeedge/Template/pkg/common" - "github.com/kubeedge/Template/pkg/config" dmiapi "github.com/kubeedge/Template/pkg/dmi-api" ) // RegisterMapper if withData is true, edgecore will send device and model list. -func RegisterMapper(cfg *config.Config, withData bool) ([]*dmiapi.Device, []*dmiapi.DeviceModel, error) { +func RegisterMapper(withData bool) ([]*dmiapi.Device, []*dmiapi.DeviceModel, error) { // connect grpc server conn, err := grpc.Dial(cfg.Common.EdgeCoreSock, grpc.WithInsecure(), diff --git a/staging/src/github.com/kubeedge/mapper-framework/pkg/util/grpcclient/report.go b/staging/src/github.com/kubeedge/mapper-framework/pkg/grpcclient/report.go similarity index 100% rename from staging/src/github.com/kubeedge/mapper-framework/pkg/util/grpcclient/report.go rename to staging/src/github.com/kubeedge/mapper-framework/pkg/grpcclient/report.go diff --git a/staging/src/github.com/kubeedge/mapper-framework/pkg/util/parse/parse.go b/staging/src/github.com/kubeedge/mapper-framework/pkg/util/parse/parse.go index 6c02d9a7fe6..74558bbd891 100644 --- a/staging/src/github.com/kubeedge/mapper-framework/pkg/util/parse/parse.go +++ b/staging/src/github.com/kubeedge/mapper-framework/pkg/util/parse/parse.go @@ -22,17 +22,15 @@ import ( "k8s.io/klog/v2" "github.com/kubeedge/Template/pkg/common" - "github.com/kubeedge/Template/pkg/config" - "github.com/kubeedge/Template/pkg/util/grpcclient" + "github.com/kubeedge/Template/pkg/grpcclient" ) var ErrEmptyData error = errors.New("device or device model list is empty") -func ParseByUsingRegister(cfg *config.Config, - devices map[string]*common.DeviceInstance, +func ParseByUsingRegister(devices map[string]*common.DeviceInstance, dms map[string]common.DeviceModel, protocols map[string]common.ProtocolConfig) error { - deviceList, deviceModelList, err := grpcclient.RegisterMapper(cfg, true) + deviceList, deviceModelList, err := grpcclient.RegisterMapper(true) if err != nil { return err }