X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxaapiv1%2Fevents.go;h=3a47e4947f387b83d3802de5be1df609440d26d1;hb=069de98bdd926cb25954aad94fe23be0272a7b5e;hp=16c2dd7cc53c76510f4b3ff973d8689c72114655;hpb=45f6472d1e8ecad428da314a6d762143f033865d;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/xaapiv1/events.go b/lib/xaapiv1/events.go
index 16c2dd7..3a47e49 100644
--- a/lib/xaapiv1/events.go
+++ b/lib/xaapiv1/events.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,13 +40,25 @@ const (
 	EventTypePrefix = "event:" // following by event type
 
 	// Supported Events type
-	EVTAll           = EventTypePrefix + "all"
+	EVTAll = EventTypePrefix + "all"
+
 	EVTServerConfig  = EventTypePrefix + "server-config"        // type EventMsg with Data type xaapiv1.ServerCfg
 	EVTProjectAdd    = EventTypePrefix + "project-add"          // type EventMsg with Data type xaapiv1.ProjectConfig
 	EVTProjectDelete = EventTypePrefix + "project-delete"       // type EventMsg with Data type xaapiv1.ProjectConfig
 	EVTProjectChange = EventTypePrefix + "project-state-change" // type EventMsg with Data type xaapiv1.ProjectConfig
-	EVTSDKInstall    = EventTypePrefix + "sdk-install"          // type EventMsg with Data type xaapiv1.SDKManagementMsg
-	EVTSDKRemove     = EventTypePrefix + "sdk-remove"           // type EventMsg with Data type xaapiv1.SDKManagementMsg
+
+	EVTSDKAdd         = EventTypePrefix + "sdk-add"          // type EventMsg with Data type xaapiv1.SDK
+	EVTSDKRemove      = EventTypePrefix + "sdk-remove"       // type EventMsg with Data type xaapiv1.SDK
+	EVTSDKManagement  = EventTypePrefix + "sdk-management"   // type EventMsg with Data type xaapiv1.SDKManagementMsg
+	EVTSDKStateChange = EventTypePrefix + "sdk-state-change" // type EventMsg with Data type xaapiv1.SDK
+
+	EVTTargetAdd         = EventTypePrefix + "target-add"          // type EventMsg with Data type xaapiv1.TargetConfig
+	EVTTargetRemove      = EventTypePrefix + "target-remove"       // type EventMsg with Data type xaapiv1.TargetConfig
+	EVTTargetStateChange = EventTypePrefix + "target-state-change" // type EventMsg with Data type xaapiv1.TargetConfig
+
+	EVTTargetTerminalAdd         = EventTypePrefix + "target-terminal-add"          // type EventMsg with Data type xaapiv1.TerminalConfig
+	EVTTargetTerminalRemove      = EventTypePrefix + "target-terminal-remove"       // type EventMsg with Data type xaapiv1.TerminalConfig
+	EVTTargetTerminalStateChange = EventTypePrefix + "target-terminal-state-change" // type EventMsg with Data type xaapiv1.TerminalConfig
 )
 
 // EVTAllList List of all supported events
@@ -55,8 +67,16 @@ var EVTAllList = []string{
 	EVTProjectAdd,
 	EVTProjectDelete,
 	EVTProjectChange,
-	EVTSDKInstall,
+	EVTSDKAdd,
 	EVTSDKRemove,
+	EVTSDKManagement,
+	EVTSDKStateChange,
+	EVTTargetAdd,
+	EVTTargetRemove,
+	EVTTargetStateChange,
+	EVTTargetTerminalAdd,
+	EVTTargetTerminalRemove,
+	EVTTargetTerminalStateChange,
 }
 
 // EventMsg Event message send over Websocket, data format depend to Type (see DecodeXXX function)
@@ -97,12 +117,27 @@ func (e *EventMsg) DecodeProjectConfig() (ProjectConfig, error) {
 	return p, err
 }
 
-// DecodeSDKMsg Helper to decode Data field type SDKManagementMsg
-func (e *EventMsg) DecodeSDKMsg() (SDKManagementMsg, error) {
+// DecodeSDKMgtMsg Helper to decode Data field type SDKManagementMsg
+func (e *EventMsg) DecodeSDKMgtMsg() (SDKManagementMsg, error) {
 	var err error
 	s := SDKManagementMsg{}
+	if e.Type != EVTSDKManagement {
+		return s, fmt.Errorf("Invalid type")
+	}
+	d := []byte{}
+	d, err = json.Marshal(e.Data)
+	if err == nil {
+		err = json.Unmarshal(d, &s)
+	}
+	return s, err
+}
+
+// DecodeSDKEvent Helper to decode Data field type SDK
+func (e *EventMsg) DecodeSDKEvent() (SDK, error) {
+	var err error
+	s := SDK{}
 	switch e.Type {
-	case EVTSDKInstall, EVTSDKRemove:
+	case EVTSDKAdd, EVTSDKRemove, EVTSDKStateChange:
 		d := []byte{}
 		d, err = json.Marshal(e.Data)
 		if err == nil {
@@ -113,3 +148,37 @@ func (e *EventMsg) DecodeSDKMsg() (SDKManagementMsg, error) {
 	}
 	return s, err
 }
+
+// DecodeTargetEvent Helper to decode Data field type TargetConfig
+func (e *EventMsg) DecodeTargetEvent() (TargetConfig, error) {
+	var err error
+	p := TargetConfig{}
+	switch e.Type {
+	case EVTTargetAdd, EVTTargetRemove, EVTTargetStateChange:
+		d := []byte{}
+		d, err = json.Marshal(e.Data)
+		if err == nil {
+			err = json.Unmarshal(d, &p)
+		}
+	default:
+		err = fmt.Errorf("Invalid type")
+	}
+	return p, err
+}
+
+// DecodeTerminalEvent Helper to decode Data field type TerminalConfig
+func (e *EventMsg) DecodeTerminalEvent() (TerminalConfig, error) {
+	var err error
+	p := TerminalConfig{}
+	switch e.Type {
+	case EVTTargetTerminalAdd, EVTTargetTerminalRemove, EVTTargetTerminalStateChange:
+		d := []byte{}
+		d, err = json.Marshal(e.Data)
+		if err == nil {
+			err = json.Unmarshal(d, &p)
+		}
+	default:
+		err = fmt.Errorf("Invalid type")
+	}
+	return p, err
+}