mapper framework fix

Signed-off-by: cl2017 <[email protected]>
Shelley-BaoYue · Nov 27, 2023 · e3018fa · e3018fa
1 parent ed4634c
commit e3018fa
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
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
@@ -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
@@ -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
@@ -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/...r-framework/pkg/util/grpcclient/config.go → ...mapper-framework/pkg/grpcclient/config.go b/...r-framework/pkg/util/grpcclient/config.go → ...mapper-framework/pkg/grpcclient/config.go
diff --git a/...framework/pkg/util/grpcclient/register.go → ...pper-framework/pkg/grpcclient/register.go b/...framework/pkg/util/grpcclient/register.go → ...pper-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/...r-framework/pkg/util/grpcclient/report.go → ...mapper-framework/pkg/grpcclient/report.go b/...r-framework/pkg/util/grpcclient/report.go → ...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
@@ -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
 	}