[all] Update cloud protocol component status

Signed-off-by: Mykhailo Lohvynenko <[email protected]>
aosedge · Sep 10, 2024 · 494d596 · 494d596
1 parent 148dbf0
commit 494d596
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/umcontroller/umcontroller.go b/umcontroller/umcontroller.go
@@ -1148,7 +1148,7 @@ func (umCtrl *Controller) notifyNewComponents(umID string, componsStatus []syste
 			ComponentID:   status.componentID,
 			ComponentType: status.componentType,
 			Version:       status.version,
-			NodeID:        umID,
+			NodeID:        &umID,
 			Status:        status.status,
 		}
 

diff --git a/umcontroller/umcontroller_test.go b/umcontroller/umcontroller_test.go
@@ -341,8 +341,8 @@ func TestNewComponentsUpdate(t *testing.T) {
 	select {
 	case newComponents := <-umCtrl.NewComponentsChannel():
 		if !reflect.DeepEqual(newComponents, []cloudprotocol.ComponentStatus{
-			{ComponentID: "component3", Version: "1.0.0", Status: "installed", NodeID: "umID2"},
-			{ComponentID: "component4", Version: "1.0.0", Status: "installed", NodeID: "umID2"},
+			{ComponentID: "component3", Version: "1.0.0", Status: "installed", NodeID: convertToNodeID("umID2")},
+			{ComponentID: "component4", Version: "1.0.0", Status: "installed", NodeID: convertToNodeID("umID2")},
 		}) {
 			t.Errorf("Incorrect new components: %v", newComponents)
 		}
@@ -1897,3 +1897,7 @@ func generateFile(fileName string, size uint64) (err error) {
 func convertToComponentID(id string) *string {
 	return &id
 }
+
+func convertToNodeID(nodeID string) *string {
+	return &nodeID
+}
diff --git a/unitstatushandler/unitstatushandler_test.go b/unitstatushandler/unitstatushandler_test.go
@@ -1175,15 +1175,15 @@ func TestNewComponents(t *testing.T) {
 	newComponents := []cloudprotocol.ComponentStatus{
 		{
 			ComponentID: "comp1", ComponentType: "type1", Version: "1.0.0",
-			Status: cloudprotocol.InstalledStatus, NodeID: "node1",
+			Status: cloudprotocol.InstalledStatus, NodeID: convertToNodeID("node1"),
 		},
 		{
 			ComponentID: "comp2", ComponentType: "type2", Version: "1.0.0",
-			Status: cloudprotocol.InstalledStatus, NodeID: "node2",
+			Status: cloudprotocol.InstalledStatus, NodeID: convertToNodeID("node2"),
 		},
 		{
 			ComponentID: "comp3", ComponentType: "type3", Version: "1.0.0",
-			Status: cloudprotocol.InstalledStatus, NodeID: "node3",
+			Status: cloudprotocol.InstalledStatus, NodeID: convertToNodeID("node3"),
 		},
 	}
 
@@ -1388,3 +1388,7 @@ func handleUpdateStatus(handler *unitstatushandler.Instance) {
 func convertToComponentID(id string) *string {
 	return &id
 }
+
+func convertToNodeID(nodeID string) *string {
+	return &nodeID
+}