summaryrefslogtreecommitdiff
path: root/mappers
diff options
context:
space:
mode:
Diffstat (limited to 'mappers')
-rw-r--r--mappers/bluetooth_mapper/action_manager/action_manager.go2
-rw-r--r--mappers/bluetooth_mapper/configuration/config.go4
-rw-r--r--mappers/bluetooth_mapper/controller/controller.go4
-rw-r--r--mappers/bluetooth_mapper/watcher/watcher.go4
-rw-r--r--mappers/common/event_test.go55
-rw-r--r--mappers/modbus-go/configmap/parse.go3
-rw-r--r--mappers/modbus-go/configmap/parse_test.go3
-rw-r--r--mappers/modbus-go/device/device.go4
-rw-r--r--mappers/modbus-go/device/devstatus.go3
-rw-r--r--mappers/modbus-go/device/twindata.go3
-rw-r--r--mappers/modbus-go/main.go3
11 files changed, 19 insertions, 69 deletions
diff --git a/mappers/bluetooth_mapper/action_manager/action_manager.go b/mappers/bluetooth_mapper/action_manager/action_manager.go
index 5513ae21c..ea739bc9d 100644
--- a/mappers/bluetooth_mapper/action_manager/action_manager.go
+++ b/mappers/bluetooth_mapper/action_manager/action_manager.go
@@ -24,7 +24,7 @@ import (
"github.com/paypal/gatt"
"k8s.io/klog/v2"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
+ dataconverter "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
)
const (
diff --git a/mappers/bluetooth_mapper/configuration/config.go b/mappers/bluetooth_mapper/configuration/config.go
index c23178c36..fb032e491 100644
--- a/mappers/bluetooth_mapper/configuration/config.go
+++ b/mappers/bluetooth_mapper/configuration/config.go
@@ -25,8 +25,8 @@ import (
"gopkg.in/yaml.v2"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
+ actionmanager "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
+ dataconverter "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/scheduler"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/watcher"
)
diff --git a/mappers/bluetooth_mapper/controller/controller.go b/mappers/bluetooth_mapper/controller/controller.go
index d75a31faf..56504ca88 100644
--- a/mappers/bluetooth_mapper/controller/controller.go
+++ b/mappers/bluetooth_mapper/controller/controller.go
@@ -25,9 +25,9 @@ import (
"github.com/paypal/gatt/examples/option"
"k8s.io/klog/v2"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
+ actionmanager "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/configuration"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
+ dataconverter "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/helper"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/scheduler"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/watcher"
diff --git a/mappers/bluetooth_mapper/watcher/watcher.go b/mappers/bluetooth_mapper/watcher/watcher.go
index 668ccf7bd..b7db3c000 100644
--- a/mappers/bluetooth_mapper/watcher/watcher.go
+++ b/mappers/bluetooth_mapper/watcher/watcher.go
@@ -26,8 +26,8 @@ import (
"github.com/paypal/gatt"
"k8s.io/klog/v2"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
+ actionmanager "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
+ dataconverter "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/helper"
)
diff --git a/mappers/common/event_test.go b/mappers/common/event_test.go
deleted file mode 100644
index 794f7a544..000000000
--- a/mappers/common/event_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-Copyright 2020 The KubeEdge Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mappercommon
-
-import (
- "fmt"
- "os"
- "time"
-
- mqtt "github.com/eclipse/paho.mqtt.golang"
-)
-
-func onMessage(client mqtt.Client, message mqtt.Message) {
- fmt.Println("Get topic", message.Topic())
-}
-
-func main() {
- var c MqttClient = MqttClient{IP: "tcp://127.0.0.1:1883"}
- err := c.Connect()
- if err != nil {
- fmt.Println(err)
- os.Exit(1)
- } else {
- fmt.Println("Connect mqtt server success", c.IP)
- }
- err = c.Subscribe("$hw/events/device/#", onMessage)
- if err != nil {
- fmt.Println(err)
- os.Exit(1)
- } else {
- fmt.Println("Subscribe topic success")
- }
- err = c.Publish("$hw/events/device/001/data/update", "test")
- if err != nil {
- fmt.Println(err)
- os.Exit(1)
- }
- for {
- time.Sleep(time.Second)
- }
-}
diff --git a/mappers/modbus-go/configmap/parse.go b/mappers/modbus-go/configmap/parse.go
index 4a63342f2..c84b0faf5 100644
--- a/mappers/modbus-go/configmap/parse.go
+++ b/mappers/modbus-go/configmap/parse.go
@@ -21,9 +21,10 @@ import (
"errors"
"io/ioutil"
+ "k8s.io/klog/v2"
+
mappercommon "github.com/kubeedge/kubeedge/mappers/common"
"github.com/kubeedge/kubeedge/mappers/modbus-go/globals"
- "k8s.io/klog/v2"
)
// Parse parse the configmap.
diff --git a/mappers/modbus-go/configmap/parse_test.go b/mappers/modbus-go/configmap/parse_test.go
index a49521886..0c0afae7b 100644
--- a/mappers/modbus-go/configmap/parse_test.go
+++ b/mappers/modbus-go/configmap/parse_test.go
@@ -4,9 +4,10 @@ import (
"encoding/json"
"testing"
+ "github.com/stretchr/testify/assert"
+
mappercommon "github.com/kubeedge/kubeedge/mappers/common"
. "github.com/kubeedge/kubeedge/mappers/modbus-go/globals"
- "github.com/stretchr/testify/assert"
)
func TestParse(t *testing.T) {
diff --git a/mappers/modbus-go/device/device.go b/mappers/modbus-go/device/device.go
index bd812db67..b7516caa2 100644
--- a/mappers/modbus-go/device/device.go
+++ b/mappers/modbus-go/device/device.go
@@ -26,12 +26,12 @@ import (
"time"
mqtt "github.com/eclipse/paho.mqtt.golang"
- mappercommon "github.com/kubeedge/kubeedge/mappers/common"
+ "k8s.io/klog/v2"
+ mappercommon "github.com/kubeedge/kubeedge/mappers/common"
"github.com/kubeedge/kubeedge/mappers/modbus-go/configmap"
"github.com/kubeedge/kubeedge/mappers/modbus-go/driver"
"github.com/kubeedge/kubeedge/mappers/modbus-go/globals"
- "k8s.io/klog/v2"
)
var devices map[string]*globals.ModbusDev
diff --git a/mappers/modbus-go/device/devstatus.go b/mappers/modbus-go/device/devstatus.go
index bf762f8ae..d6dda5703 100644
--- a/mappers/modbus-go/device/devstatus.go
+++ b/mappers/modbus-go/device/devstatus.go
@@ -17,10 +17,11 @@ limitations under the License.
package device
import (
+ "k8s.io/klog/v2"
+
mappercommon "github.com/kubeedge/kubeedge/mappers/common"
"github.com/kubeedge/kubeedge/mappers/modbus-go/driver"
"github.com/kubeedge/kubeedge/mappers/modbus-go/globals"
- "k8s.io/klog/v2"
)
// GetStatus is the timer structure for getting device status.
diff --git a/mappers/modbus-go/device/twindata.go b/mappers/modbus-go/device/twindata.go
index 6aedcec46..db964b164 100644
--- a/mappers/modbus-go/device/twindata.go
+++ b/mappers/modbus-go/device/twindata.go
@@ -20,10 +20,11 @@ import (
"strconv"
"strings"
+ "k8s.io/klog/v2"
+
mappercommon "github.com/kubeedge/kubeedge/mappers/common"
"github.com/kubeedge/kubeedge/mappers/modbus-go/driver"
"github.com/kubeedge/kubeedge/mappers/modbus-go/globals"
- "k8s.io/klog/v2"
)
// TwinData is the timer structure for getting twin/data.
diff --git a/mappers/modbus-go/main.go b/mappers/modbus-go/main.go
index 74bafd840..ff6e84fc2 100644
--- a/mappers/modbus-go/main.go
+++ b/mappers/modbus-go/main.go
@@ -19,10 +19,11 @@ package main
import (
"os"
+ "k8s.io/klog/v2"
+
mappercommon "github.com/kubeedge/kubeedge/mappers/common"
"github.com/kubeedge/kubeedge/mappers/modbus-go/device"
"github.com/kubeedge/kubeedge/mappers/modbus-go/globals"
- "k8s.io/klog/v2"
)
func main() {
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 06:24:06 +0000