Refactor and enhance SGCP drivers and caching mechanisms

Makefile

@@ -46,7 +46,7 @@ clean:
 	rm -f $(OM) $(OX)
 
 compobj:
-	$(GOBUILD) -o $(COMPOBJ) ./util/compobj/
+	$(GOBUILD) -trimpath -o $(COMPOBJ) ./util/compobj/
 
 compobj-race:
 	$(GOBUILDRACE) -o $(COMPOBJ) ./util/compobj/
@@ -94,13 +94,13 @@ install:
 	$(PREFIX)/$(COMPOBJ) -i $(PREFIX)/$(COMPOBJ_D)
 
 om:
-	$(GOBUILD) -o $(OM) ./cmd/om/
+	$(GOBUILD) -trimpath -o $(OM) ./cmd/om/
 
 om-race:
 	$(GOBUILDRACE) -o $(OM) ./cmd/om/
 
 ox:
-	$(GOBUILD) -o $(OX) ./cmd/ox/
+	$(GOBUILD) -trimpath -o $(OX) ./cmd/ox/
 
 ox-race:
 	$(GOBUILDRACE) -o $(OX) ./cmd/ox/

core/driverdb/drivers.go

@@ -30,6 +30,7 @@ import (
 	_ "github.com/opensvc/om3/v3/drivers/resdisklv"
 	_ "github.com/opensvc/om3/v3/drivers/resdiskmd"
 	_ "github.com/opensvc/om3/v3/drivers/resdiskraw"
+	_ "github.com/opensvc/om3/v3/drivers/resdisksgcp_nfs_cg"
 	_ "github.com/opensvc/om3/v3/drivers/resdiskvg"
 	_ "github.com/opensvc/om3/v3/drivers/resdiskxp8"
 	_ "github.com/opensvc/om3/v3/drivers/resfsdir"

core/env/env.go

@@ -26,7 +26,8 @@ var (
 )
 
 // HasDaemonOrigin returns true if the environment variable OSVC_ACTION_ORIGIN
-// is set to "daemon". The opensvc daemon sets this variable on every command
+// is set to one of the daemon origins: "daemon/monitor", "daemon/api" or
+// "daemon/scheduler". The opensvc daemon sets this variable on every command
 // it executes.
 func HasDaemonOrigin() bool {
 	switch Origin() {
@@ -38,7 +39,7 @@ func HasDaemonOrigin() bool {
 }
 
 // HasDaemonMonitorOrigin returns true if the environment variable OSVC_ACTION_ORIGIN
-// is set to "daemon/imon". The opensvc daemon sets this variable on every command
+// is set to "daemon/monitor". The opensvc daemon sets this variable on every command
 // it executes.
 func HasDaemonMonitorOrigin() bool {
 	switch Origin() {
@@ -49,6 +50,18 @@ func HasDaemonMonitorOrigin() bool {
 	}
 }
 
+// HasDaemonSchedulerOrigin returns true if the environment variable
+// OSVC_ACTION_ORIGIN is set to "daemon/scheduler", which the daemon sets on
+// the commands its scheduler runs.
+func HasDaemonSchedulerOrigin() bool {
+	switch Origin() {
+	case ActionOriginDaemonScheduler:
+		return true
+	default:
+		return false
+	}
+}
+
 // Origin returns the action origin using a env var that the daemon sets when
 // executing a CRM action.
 func Origin() ActionOrigin {

core/env/env_test.go

@@ -0,0 +1,35 @@
+package env
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestOriginPredicates(t *testing.T) {
+	cases := []struct {
+		origin    string
+		daemon    bool
+		monitor   bool
+		scheduler bool
+	}{
+		{origin: "", daemon: false, monitor: false, scheduler: false},
+		{origin: string(ActionOriginUser), daemon: false, monitor: false, scheduler: false},
+		{origin: string(ActionOriginDaemonMonitor), daemon: true, monitor: true, scheduler: false},
+		{origin: string(ActionOriginDaemonAPI), daemon: true, monitor: false, scheduler: false},
+		{origin: string(ActionOriginDaemonScheduler), daemon: true, monitor: false, scheduler: true},
+
+		// The daemon never sets these, and none of them is a daemon origin.
+		{origin: "daemon", daemon: false, monitor: false, scheduler: false},
+		{origin: "scheduler", daemon: false, monitor: false, scheduler: false},
+	}
+
+	for _, tc := range cases {
+		t.Run("origin "+tc.origin, func(t *testing.T) {
+			t.Setenv(ActionOriginVar, tc.origin)
+			assert.Equal(t, tc.daemon, HasDaemonOrigin(), "HasDaemonOrigin")
+			assert.Equal(t, tc.monitor, HasDaemonMonitorOrigin(), "HasDaemonMonitorOrigin")
+			assert.Equal(t, tc.scheduler, HasDaemonSchedulerOrigin(), "HasDaemonSchedulerOrigin")
+		})
+	}
+}