From af06de5a979a93e6e76c735cfa4c7fdb6f17d9fe Mon Sep 17 00:00:00 2001 From: Mykola Kobets Date: Thu, 5 Sep 2024 19:14:52 +0300 Subject: [PATCH] [smcontroller, amqp, monitorctrl] Change Monitoring::disk to partition Signed-off-by: Mykola Kobets --- amqphandler/amqphandler_test.go | 10 ++-- monitorcontroller/monitorcontroller_test.go | 4 +- smcontroller/smcontroller_test.go | 56 ++++++++++----------- smcontroller/smhandler.go | 16 +++--- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/amqphandler/amqphandler_test.go b/amqphandler/amqphandler_test.go index ff0a42cc..035670ea 100644 --- a/amqphandler/amqphandler_test.go +++ b/amqphandler/amqphandler_test.go @@ -467,7 +467,7 @@ func TestSendMessages(t *testing.T) { nodeMonitoring := cloudprotocol.NodeMonitoringData{ Items: []aostypes.MonitoringData{ { - RAM: 1024, CPU: 50, Download: 8192, Upload: 4096, Disk: []aostypes.PartitionUsage{{ + RAM: 1024, CPU: 50, Download: 8192, Upload: 4096, Partitions: []aostypes.PartitionUsage{{ Name: "p1", UsedSize: 100, }}, Timestamp: time.Now().UTC(), @@ -479,25 +479,25 @@ func TestSendMessages(t *testing.T) { { NodeID: "mainNode", InstanceIdent: aostypes.InstanceIdent{ServiceID: "service0", SubjectID: "subj1", Instance: 1}, Items: []aostypes.MonitoringData{ - {RAM: 1024, CPU: 50, Disk: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}}, + {RAM: 1024, CPU: 50, Partitions: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}}, }, }, { NodeID: "mainNode", InstanceIdent: aostypes.InstanceIdent{ServiceID: "service1", SubjectID: "subj1", Instance: 1}, Items: []aostypes.MonitoringData{ - {RAM: 128, CPU: 60, Disk: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}}, + {RAM: 128, CPU: 60, Partitions: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}}, }, }, { NodeID: "mainNode", InstanceIdent: aostypes.InstanceIdent{ServiceID: "service2", SubjectID: "subj1", Instance: 1}, Items: []aostypes.MonitoringData{ - {RAM: 256, CPU: 70, Disk: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}}, + {RAM: 256, CPU: 70, Partitions: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}}, }, }, { NodeID: "mainNode", InstanceIdent: aostypes.InstanceIdent{ServiceID: "service3", SubjectID: "subj1", Instance: 1}, Items: []aostypes.MonitoringData{ - {RAM: 512, CPU: 80, Disk: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}}, + {RAM: 512, CPU: 80, Partitions: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}}, }, }, } diff --git a/monitorcontroller/monitorcontroller_test.go b/monitorcontroller/monitorcontroller_test.go index d6eea03c..2fd1a39d 100644 --- a/monitorcontroller/monitorcontroller_test.go +++ b/monitorcontroller/monitorcontroller_test.go @@ -184,7 +184,7 @@ func getTestMonitoringData() (aostypes.NodeMonitoring, cloudprotocol.Monitoring) Items: []aostypes.MonitoringData{ { RAM: 1024, CPU: 50, Download: 8192, Upload: 4096, Timestamp: timestamp, - Disk: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, + Partitions: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, }, }, } @@ -195,7 +195,7 @@ func getTestMonitoringData() (aostypes.NodeMonitoring, cloudprotocol.Monitoring) Items: []aostypes.MonitoringData{ { RAM: 1024, CPU: 50, Timestamp: timestamp, - Disk: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, + Partitions: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, }, }, } diff --git a/smcontroller/smcontroller_test.go b/smcontroller/smcontroller_test.go index aa98a947..b2c06cb6 100644 --- a/smcontroller/smcontroller_test.go +++ b/smcontroller/smcontroller_test.go @@ -546,16 +546,16 @@ func TestSMMonitoringNotifications(t *testing.T) { NodeID: nodeID, NodeData: aostypes.MonitoringData{ RAM: 10, CPU: 20, Download: 40, Upload: 50, - Disk: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, - Timestamp: now, + Partitions: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, + Timestamp: now, }, InstancesData: []aostypes.InstanceMonitoring{}, }, sendMonitoring: &pbsm.InstantMonitoring{ NodeMonitoring: &pbsm.MonitoringData{ Ram: 10, Cpu: 20, Download: 40, Upload: 50, - Disk: []*pbsm.PartitionUsage{{Name: "p1", UsedSize: 100}}, - Timestamp: timestamppb.New(now), + Partitions: []*pbsm.PartitionUsage{{Name: "p1", UsedSize: 100}}, + Timestamp: timestamppb.New(now), }, }, }, @@ -564,24 +564,24 @@ func TestSMMonitoringNotifications(t *testing.T) { NodeID: nodeID, NodeData: aostypes.MonitoringData{ RAM: 10, CPU: 20, Download: 40, Upload: 50, - Disk: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, - Timestamp: now, + Partitions: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, + Timestamp: now, }, InstancesData: []aostypes.InstanceMonitoring{ { InstanceIdent: aostypes.InstanceIdent{ServiceID: "service1", SubjectID: "s1", Instance: 1}, MonitoringData: aostypes.MonitoringData{ RAM: 10, CPU: 20, Download: 40, Upload: 0, - Disk: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, - Timestamp: now, + Partitions: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, + Timestamp: now, }, }, { InstanceIdent: aostypes.InstanceIdent{ServiceID: "service2", SubjectID: "s1", Instance: 1}, MonitoringData: aostypes.MonitoringData{ RAM: 20, CPU: 30, Download: 50, Upload: 10, - Disk: []aostypes.PartitionUsage{{Name: "p2", UsedSize: 50}}, - Timestamp: now, + Partitions: []aostypes.PartitionUsage{{Name: "p2", UsedSize: 50}}, + Timestamp: now, }, }, }, @@ -589,24 +589,24 @@ func TestSMMonitoringNotifications(t *testing.T) { sendMonitoring: &pbsm.InstantMonitoring{ NodeMonitoring: &pbsm.MonitoringData{ Ram: 10, Cpu: 20, Download: 40, Upload: 50, - Disk: []*pbsm.PartitionUsage{{Name: "p1", UsedSize: 100}}, - Timestamp: timestamppb.New(now), + Partitions: []*pbsm.PartitionUsage{{Name: "p1", UsedSize: 100}}, + Timestamp: timestamppb.New(now), }, InstancesMonitoring: []*pbsm.InstanceMonitoring{ { Instance: &pbcommon.InstanceIdent{ServiceId: "service1", SubjectId: "s1", Instance: 1}, MonitoringData: &pbsm.MonitoringData{ Ram: 10, Cpu: 20, Download: 40, Upload: 0, - Disk: []*pbsm.PartitionUsage{{Name: "p1", UsedSize: 100}}, - Timestamp: timestamppb.New(now), + Partitions: []*pbsm.PartitionUsage{{Name: "p1", UsedSize: 100}}, + Timestamp: timestamppb.New(now), }, }, { Instance: &pbcommon.InstanceIdent{ServiceId: "service2", SubjectId: "s1", Instance: 1}, MonitoringData: &pbsm.MonitoringData{ Ram: 20, Cpu: 30, Download: 50, Upload: 10, - Disk: []*pbsm.PartitionUsage{{Name: "p2", UsedSize: 50}}, - Timestamp: timestamppb.New(now), + Partitions: []*pbsm.PartitionUsage{{Name: "p2", UsedSize: 50}}, + Timestamp: timestamppb.New(now), }, }, }, @@ -1146,24 +1146,24 @@ func TestGetAverageMonitoring(t *testing.T) { NodeID: nodeID, NodeData: aostypes.MonitoringData{ RAM: 10, CPU: 20, Download: 40, Upload: 50, - Disk: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, - Timestamp: currentTime, + Partitions: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, + Timestamp: currentTime, }, InstancesData: []aostypes.InstanceMonitoring{ { InstanceIdent: aostypes.InstanceIdent{ServiceID: "service1", SubjectID: "s1", Instance: 1}, MonitoringData: aostypes.MonitoringData{ RAM: 10, CPU: 20, Download: 40, Upload: 0, - Disk: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, - Timestamp: currentTime, + Partitions: []aostypes.PartitionUsage{{Name: "p1", UsedSize: 100}}, + Timestamp: currentTime, }, }, { InstanceIdent: aostypes.InstanceIdent{ServiceID: "service2", SubjectID: "s1", Instance: 1}, MonitoringData: aostypes.MonitoringData{ RAM: 20, CPU: 30, Download: 50, Upload: 10, - Disk: []aostypes.PartitionUsage{{Name: "p2", UsedSize: 50}}, - Timestamp: currentTime, + Partitions: []aostypes.PartitionUsage{{Name: "p2", UsedSize: 50}}, + Timestamp: currentTime, }, }, }, @@ -1172,24 +1172,24 @@ func TestGetAverageMonitoring(t *testing.T) { AverageMonitoring: &pbsm.AverageMonitoring{ NodeMonitoring: &pbsm.MonitoringData{ Ram: 10, Cpu: 20, Download: 40, Upload: 50, - Disk: []*pbsm.PartitionUsage{{Name: "p1", UsedSize: 100}}, - Timestamp: timestamppb.New(currentTime), + Partitions: []*pbsm.PartitionUsage{{Name: "p1", UsedSize: 100}}, + Timestamp: timestamppb.New(currentTime), }, InstancesMonitoring: []*pbsm.InstanceMonitoring{ { Instance: &pbcommon.InstanceIdent{ServiceId: "service1", SubjectId: "s1", Instance: 1}, MonitoringData: &pbsm.MonitoringData{ Ram: 10, Cpu: 20, Download: 40, Upload: 0, - Disk: []*pbsm.PartitionUsage{{Name: "p1", UsedSize: 100}}, - Timestamp: timestamppb.New(currentTime), + Partitions: []*pbsm.PartitionUsage{{Name: "p1", UsedSize: 100}}, + Timestamp: timestamppb.New(currentTime), }, }, { Instance: &pbcommon.InstanceIdent{ServiceId: "service2", SubjectId: "s1", Instance: 1}, MonitoringData: &pbsm.MonitoringData{ Ram: 20, Cpu: 30, Download: 50, Upload: 10, - Disk: []*pbsm.PartitionUsage{{Name: "p2", UsedSize: 50}}, - Timestamp: timestamppb.New(currentTime), + Partitions: []*pbsm.PartitionUsage{{Name: "p2", UsedSize: 50}}, + Timestamp: timestamppb.New(currentTime), }, }, }, diff --git a/smcontroller/smhandler.go b/smcontroller/smhandler.go index d80a51e6..8501ba10 100644 --- a/smcontroller/smhandler.go +++ b/smcontroller/smhandler.go @@ -755,16 +755,16 @@ func instantMonitoringFromPB(instantMonitoring *pb.InstantMonitoring) aostypes.N func monitoringDataFromPB(pbMonitoring *pb.MonitoringData) aostypes.MonitoringData { monitoringData := aostypes.MonitoringData{ - Timestamp: pbMonitoring.GetTimestamp().AsTime(), - RAM: pbMonitoring.GetRam(), - CPU: pbMonitoring.GetCpu(), - Download: pbMonitoring.GetDownload(), - Upload: pbMonitoring.GetUpload(), - Disk: make([]aostypes.PartitionUsage, len(pbMonitoring.GetDisk())), + Timestamp: pbMonitoring.GetTimestamp().AsTime(), + RAM: pbMonitoring.GetRam(), + CPU: pbMonitoring.GetCpu(), + Download: pbMonitoring.GetDownload(), + Upload: pbMonitoring.GetUpload(), + Partitions: make([]aostypes.PartitionUsage, len(pbMonitoring.GetPartitions())), } - for i, pbData := range pbMonitoring.GetDisk() { - monitoringData.Disk[i] = aostypes.PartitionUsage{Name: pbData.GetName(), UsedSize: pbData.GetUsedSize()} + for i, pbData := range pbMonitoring.GetPartitions() { + monitoringData.Partitions[i] = aostypes.PartitionUsage{Name: pbData.GetName(), UsedSize: pbData.GetUsedSize()} } return monitoringData