diff options
| author | Xiang Dai <long0dai@foxmail.com> | 2020-05-11 10:37:33 +0800 |
|---|---|---|
| committer | Xiang Dai <long0dai@foxmail.com> | 2020-06-04 10:27:54 +0800 |
| commit | 1d770c11d03ea1985e61575cba5c83d2a9ca5623 (patch) | |
| tree | 9743e2159d6cbf68e3f1203e1a5e6bf5e9ed91dd /mappers | |
| parent | Merge pull request #1746 from daixiang0/cache (diff) | |
| download | kubeedge-1d770c11d03ea1985e61575cba5c83d2a9ca5623.tar.gz | |
Lint: cleanup white noise
Signed-off-by: Xiang Dai <long0dai@foxmail.com>
Diffstat (limited to 'mappers')
| -rw-r--r-- | mappers/bluetooth_mapper/deployment.yaml | 2 | ||||
| -rw-r--r-- | mappers/modbus_mapper/Makefile | 2 | ||||
| -rw-r--r-- | mappers/modbus_mapper/deployment.yaml | 6 | ||||
| -rw-r--r-- | mappers/modbus_mapper/dpl/deviceProfile.json | 2 | ||||
| -rw-r--r-- | mappers/modbus_mapper/src/devicetwin.js | 6 | ||||
| -rw-r--r-- | mappers/modbus_mapper/src/index.js | 6 | ||||
| -rw-r--r-- | mappers/modbus_mapper/src/watchfile.js | 6 |
7 files changed, 15 insertions, 15 deletions
diff --git a/mappers/bluetooth_mapper/deployment.yaml b/mappers/bluetooth_mapper/deployment.yaml index 3d236ec84..883b78dbe 100644 --- a/mappers/bluetooth_mapper/deployment.yaml +++ b/mappers/bluetooth_mapper/deployment.yaml @@ -23,7 +23,7 @@ spec: - name: config-volume mountPath: /opt/kubeedge/ nodeSelector: - bluetooth: "true" + bluetooth: "true" volumes: - name: config-volume configMap: diff --git a/mappers/modbus_mapper/Makefile b/mappers/modbus_mapper/Makefile index 9be3cb8d8..5b1fecffa 100644 --- a/mappers/modbus_mapper/Makefile +++ b/mappers/modbus_mapper/Makefile @@ -1,5 +1,5 @@ #make modbus_mapper .PHONY: default modbus_mapper -modbus_mapper: +modbus_mapper: cd src && npm install --unsafe-perm=true docker build -t modbus_mapper:v1.0 . diff --git a/mappers/modbus_mapper/deployment.yaml b/mappers/modbus_mapper/deployment.yaml index 30a536796..a024235a7 100644 --- a/mappers/modbus_mapper/deployment.yaml +++ b/mappers/modbus_mapper/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: modbus-mapper-container image: <your_dockerhub_username>/modbus_mapper:v1.0 - env: + env: - name: CONNECTOR_MQTT_PORT value: "1883" - name: CONNECTOR_MQTT_IP @@ -30,10 +30,10 @@ spec: - name: dpl-config-volume mountPath: /opt/src/dpl nodeSelector: - modbus: "true" + modbus: "true" volumes: - name: dpl-config-volume configMap: name: device-profile-config-<edge_node_name> restartPolicy: Always -
\ No newline at end of file + diff --git a/mappers/modbus_mapper/dpl/deviceProfile.json b/mappers/modbus_mapper/dpl/deviceProfile.json index 00082d319..78401c0b7 100644 --- a/mappers/modbus_mapper/dpl/deviceProfile.json +++ b/mappers/modbus_mapper/dpl/deviceProfile.json @@ -4,7 +4,7 @@ "name": "modbus-mock-instance-01", "model": "modbus-mock-model", "protocol": "modbus-tcp-01" - }], + }], "deviceModels": [{ "properties": [{ "name": "temperature", diff --git a/mappers/modbus_mapper/src/devicetwin.js b/mappers/modbus_mapper/src/devicetwin.js index 6f15d5425..5f8dc3fc5 100644 --- a/mappers/modbus_mapper/src/devicetwin.js +++ b/mappers/modbus_mapper/src/devicetwin.js @@ -9,7 +9,7 @@ class DeviceTwin { constructor(mqttClient) { this.mqttClient = mqttClient; } - + // transferType transfer data according to the dpl configuration transferType(visitor, property, data, callback) { let transData; @@ -88,7 +88,7 @@ class DeviceTwin { default: logger.error('unknown dataType: ', property.dataType); callback(null); - break; + break; } } @@ -219,7 +219,7 @@ class DeviceTwin { return; } if (!deviceTwin.hasOwnProperty('actual') || - (deviceTwin.hasOwnProperty('expected') && deviceTwin.expected.hasOwnProperty('metadata') && deviceTwin.actual.hasOwnProperty('metadata') && + (deviceTwin.hasOwnProperty('expected') && deviceTwin.expected.hasOwnProperty('metadata') && deviceTwin.actual.hasOwnProperty('metadata') && deviceTwin.expected.metadata.timestamp > deviceTwin.actual.metadata.timestamp && deviceTwin.expected.value !== deviceTwin.actual.value)) { callback(deviceTwin.expected.value); diff --git a/mappers/modbus_mapper/src/index.js b/mappers/modbus_mapper/src/index.js index da2af8dae..2edc685e0 100644 --- a/mappers/modbus_mapper/src/index.js +++ b/mappers/modbus_mapper/src/index.js @@ -46,7 +46,7 @@ async.series([ } }); }, - + //load dpl first time function(callback) { WatchFiles.loadDpl(options.dpl_name, (devInsMap, devModMap, devProMap, modVistrMap)=>{ @@ -167,7 +167,7 @@ async.series([ } }); }); - } + } } catch (err) { logger.error('failed to change devicetwin of device[%s], err: ', deviceID, err); } @@ -247,7 +247,7 @@ WatchFiles.watchChange(path.join(__dirname, 'dpl'), ()=>{ }); } }); - callback(); + callback(); } ],function(err) { if (err) { diff --git a/mappers/modbus_mapper/src/watchfile.js b/mappers/modbus_mapper/src/watchfile.js index 1cf13c675..6c5340492 100644 --- a/mappers/modbus_mapper/src/watchfile.js +++ b/mappers/modbus_mapper/src/watchfile.js @@ -80,7 +80,7 @@ function buildMaps(dplConfigs, i) { } else { logger.error('failed to find model[%s] for deviceid', dplConfigs.deviceModels[i].model); } - + let foundPro = dplConfigs.protocols.findIndex((element)=>{ return element.name === dplConfigs.deviceInstances[i].protocol; }); @@ -88,7 +88,7 @@ function buildMaps(dplConfigs, i) { devPro.set(dplConfigs.deviceInstances[i].id, dplConfigs.protocols[foundMod]); } else { logger.error('failed to find protocol[%s] for deviceid', dplConfigs.deviceModels[i].protocol); - } + } } // buildVisitorMaps build map[model-property-protocol]propertyVisitor @@ -100,7 +100,7 @@ function buildVisitorMaps(dplConfigs, i, j) { modVisitr.set(util.format('%s-%s-%s', dplConfigs.propertyVisitors[foundVisitor].modelName, dplConfigs.propertyVisitors[foundVisitor].propertyName, dplConfigs.propertyVisitors[foundVisitor].protocol), dplConfigs.propertyVisitors[foundVisitor]); } else { logger.error('failed to find visitor for model[%s], property[%s]', dplConfigs.deviceModels[i].name, dplConfigs.deviceModels[i].properties[j].name); - } + } } module.exports = {watchChange, loadDpl, loadConfig}; |
