Fix core/instance tests

opensvc · Sep 11, 2023 · 900e287 · 900e287
1 parent e44fa6d
commit 900e287
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/core/instance/instance_test.go b/core/instance/instance_test.go
@@ -29,10 +29,9 @@ func Test_Status_Unmarshal(t *testing.T) {
 		Overall:     status.Down,
 		Provisioned: provisioned.Mixed,
 		UpdatedAt:   time.Date(2022, time.December, 28, 11, 21, 45, 800780633, time.UTC),
-		Resources: []resource.Status{
-			{
+		Resources: ResourceStatuses{
+			"volume#1": {
 				ResourceID: (*resourceid.T)(nil),
-				Rid:        "volume#1",
 				Label:      "data2",
 				Log: []*resource.StatusLogEntry{
 					{
@@ -47,9 +46,8 @@ func Test_Status_Unmarshal(t *testing.T) {
 					State: provisioned.True,
 				},
 			},
-			{
+			"fs#1": {
 				ResourceID: (*resourceid.T)(nil),
-				Rid:        "fs#1",
 				Label:      "flag /dev/shm/opensvc/svc/svc2/fs#1.flag",
 				Status:     status.Down,
 				Type:       "fs.flag",
@@ -58,9 +56,8 @@ func Test_Status_Unmarshal(t *testing.T) {
 					State: provisioned.False,
 				},
 			},
-			{
+			"app#1": {
 				ResourceID: (*resourceid.T)(nil),
-				Rid:        "app#1",
 				Label:      "forking app.forking",
 				Log: []*resource.StatusLogEntry{
 					{

diff --git a/core/instance/monitor_test.go b/core/instance/monitor_test.go
@@ -34,7 +34,7 @@ func Test_Monitor_Unmarshal(t *testing.T) {
 			LocalExpectUpdatedAt: t0,
 			State:                MonitorStateIdle,
 			StateUpdatedAt:       t0,
-			Resources: ResourceMonitorMap{
+			Resources: ResourceMonitors{
 				"fs#1": ResourceMonitor{
 					Restart: ResourceMonitorRestart{
 						Remaining: 1,
@@ -61,7 +61,7 @@ func Test_Monitor_DeepCopy(t *testing.T) {
 	mon1 := Monitor{
 		LocalExpectUpdatedAt:  time.Now(),
 		GlobalExpectUpdatedAt: time.Now(),
-		Resources: ResourceMonitorMap{
+		Resources: ResourceMonitors{
 			"a": ResourceMonitor{Restart: ResourceMonitorRestart{Remaining: 1, LastAt: time.Now()}},
 			"b": ResourceMonitor{Restart: ResourceMonitorRestart{Remaining: 8, LastAt: time.Now()}},
 		},

diff --git a/core/instance/testdata/status.json b/core/instance/testdata/status.json
@@ -7,9 +7,8 @@
   "kind": "svc",
   "provisioned": "mixed",
   "updated_at": "2022-12-28T11:21:45.800780633Z",
-  "resources": [
-    {
-      "rid": "volume#1",
+  "resources": {
+    "volume#1": {
       "label": "data2",
       "log": [
         {
@@ -24,8 +23,7 @@
         "state": "true"
       }
     },
-    {
-      "rid": "fs#1",
+    "fs#1": {
       "label": "flag /dev/shm/opensvc/svc/svc2/fs#1.flag",
       "status": "down",
       "type": "fs.flag",
@@ -34,8 +32,7 @@
         "state": "false"
       }
     },
-    {
-      "rid": "app#1",
+    "app#1": {
       "label": "forking app.forking",
       "log": [
         {
@@ -51,5 +48,5 @@
       },
       "restart": 2
     }
-  ]
+  }
 }