fix instructions under example

deviceshifu/pkg/deviceshifu/deviceshifu.go

@@ -190,8 +190,6 @@ func (handler DeviceCommandHandlerHTTP) commandHandleFunc() http.HandlerFunc {
 				log.Printf("timeout URI parsing error" + parseErr.Error())
 				return
 			}
-
-			r.URL.Query().Del(deviceshifubase.DEVICE_INSTRUCTION_TIMEOUT_URI_QUERY_STR)
 		}
 
 		switch reqType {

deviceshifu/pkg/deviceshifubase/deviceshifubase.go

@@ -54,6 +54,7 @@ const (
 	KUBERNETES_CONFIG_DEFAULT                   string = ""
 	DEVICE_INSTRUCTION_TIMEOUT_URI_QUERY_STR    string = "timeout"
 	DEVICE_DEFAULT_GLOBAL_TIMEOUT_SECONDS       int    = 3
+	DEFAULT_HTTP_SERVER_TIMEOUT_SECONDS         int    = 0
 )
 
 var (
@@ -105,8 +106,8 @@ func New(deviceShifuMetadata *DeviceShifuMetaData) (*DeviceShifuBase, *http.Serv
 		Server: &http.Server{
 			Addr:         DEVICE_DEFAULT_PORT_STR,
 			Handler:      mux,
-			ReadTimeout:  60 * time.Second,
-			WriteTimeout: 60 * time.Second,
+			ReadTimeout:  time.Duration(DEFAULT_HTTP_SERVER_TIMEOUT_SECONDS) * time.Second,
+			WriteTimeout: time.Duration(DEFAULT_HTTP_SERVER_TIMEOUT_SECONDS) * time.Second,
 		},
 		DeviceShifuConfig: deviceShifuConfig,
 		EdgeDevice:        edgeDevice,

deviceshifu/pkg/deviceshifubase/deviceshifubase_config.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"log"
-	"time"
 
 	"edgenesis.io/shifu/k8s/crd/api/v1alpha1"
 	"gopkg.in/yaml.v3"
@@ -164,7 +163,6 @@ func NewEdgeDeviceRestClient(config *rest.Config) (*rest.RESTClient, error) {
 	crdConfig.APIPath = "/apis"
 	crdConfig.NegotiatedSerializer = serializer.NewCodecFactory(scheme.Scheme)
 	crdConfig.UserAgent = rest.DefaultKubernetesUserAgent()
-	crdConfig.Timeout = 3 * time.Second
 	exampleRestClient, err := rest.UnversionedRESTClientFor(crdConfig)
 	if err != nil {
 		return nil, err

examples/httpDeviceShifu/deployment/http-deviceshifu-configmap.yaml

@@ -10,8 +10,9 @@ data:
     driverImage: http-device:v0.0.1
 #    available instructions
   instructions: |
-    status:
-    info:
+    instructions:
+      status:
+      info:
 #    telemetry retrieval methods
 #    in this example, a device_health telemetry is collected by calling hello instruction every 1 second
   telemetries: |

examples/mqttDeviceShifu/mqtt_deploy/mqtt_deviceshifu_configmap.yaml

@@ -10,6 +10,7 @@ data:
   instructions: |
 
   telemetries: |
-    device_health:
-      properties:
+    telemetries:
+      device_health:
+        properties:
 

examples/opcuaDeviceShifu/opcua_deploy/opcua_deviceshifu_configmap.yaml

@@ -8,15 +8,16 @@ data:
     driverSku: Test OPC UA Server
     driverImage: 
   instructions: |
-    get_value:
-      instructionProperties:
-        OPCUANodeID: "ns=2;i=2"
-    get_time:
-      instructionProperties:
-        OPCUANodeID: "i=2258"
-    get_server:
-      instructionProperties:
-        OPCUANodeID: "i=2261"
+    instructions:
+      get_value:
+        instructionProperties:
+          OPCUANodeID: "ns=2;i=2"
+      get_time:
+        instructionProperties:
+          OPCUANodeID: "i=2258"
+      get_server:
+        instructionProperties:
+          OPCUANodeID: "i=2261"
   telemetries: |
     telemetrySettings:
       telemetryUpdateIntervalInMiliseconds: 1000

examples/rtspDeviceShifu/camera-deployment/deviceshifu-camera-configmap.yaml

@@ -8,21 +8,23 @@ data:
     driverSku: HikVision
     driverImage: edgenesis/camera-python:v0.0.1
   instructions: |
-    capture:
-    info:
-    stream:
-    move/up:
-    move/down:
-    move/left:
-    move/right:
+    instructions:
+      capture:
+      info:
+      stream:
+      move/up:
+      move/down:
+      move/left:
+      move/right:
 # Telemetries are configurable health checks of the EdgeDevice
 # Developer/user can configure certain instructions to be used as health check
 # of the device. In this example, the device_health telemetry is mapped to
 # "get_status" instruction, executed every 1000 ms
   telemetries: |
-    device_health:
-      properties:
-        instruction: info
-        initialDelayMs: 1000
-        intervalMs: 1000
+    telemetries:
+      device_health:
+        properties:
+          instruction: info
+          initialDelayMs: 1000
+          intervalMs: 1000
 

examples/siemensPLCDeviceShifu/plc-deployment/plc-deviceshifu-configmap.yaml

@@ -11,15 +11,17 @@ data:
     driverExecution: " "
 #    available instructions
   instructions: |
-    sendsinglebit:
-    sendcontent:
-    getcontent:
-    getcpuordercode:
+    instructions:
+      sendsinglebit:
+      sendcontent:
+      getcontent:
+      getcpuordercode:
 #    telemetry retrieval methods
 #    in this example, a device_health telemetry is collected by calling hello instruction every 1 second
   telemetries: |
-    device_health:
-      properties:
-        instruction: getcpuordercode
-        initialDelayMs: 1000
-        intervalMs: 1000
+    telemetries:
+      device_health:
+        properties:
+          instruction: getcpuordercode
+          initialDelayMs: 1000
+          intervalMs: 1000