enable openvpn in the experimental group

Additionally, remove RiseupVPN, that was disabled and is superseded
by the generic openvpn test.

cmd/ooniprobe/internal/nettests/groups.go

@@ -57,7 +57,7 @@ var All = map[string]Group{
 			DNSCheck{},
 			ECHCheck{},
 			STUNReachability{},
-			RiseupVPN{},
+			OpenVPN{},
 			TorSf{},
 			VanillaTor{},
 		},

cmd/ooniprobe/internal/nettests/openvpn.go

@@ -0,0 +1,38 @@
+package nettests
+
+import (
+	"context"
+
+	"github.com/ooni/probe-cli/v3/internal/model"
+)
+
+// OpenVPN nettest implementation.
+type OpenVPN struct{}
+
+func (o OpenVPN) loadTargets(ctl *Controller, builder model.ExperimentBuilder) ([]model.ExperimentTarget, error) {
+	config := &model.ExperimentTargetLoaderConfig{
+		CheckInConfig: &model.OOAPICheckInConfig{},
+		Session:       ctl.Session,
+		SourceFiles:   ctl.InputFiles,
+		StaticInputs:  ctl.Inputs,
+	}
+	targetloader := builder.NewTargetLoader(config)
+	targets, err := targetloader.Load(context.Background())
+	if err != nil {
+		return nil, err
+	}
+	return ctl.BuildAndSetInputIdxMap(targets)
+}
+
+// Run starts the nettest.
+func (o OpenVPN) Run(ctl *Controller) error {
+	builder, err := ctl.Session.NewExperimentBuilder("openvpn")
+	if err != nil {
+		return err
+	}
+	inputs, err := o.loadTargets(ctl, builder)
+	if err != nil {
+		return err
+	}
+	return ctl.Run(builder, inputs)
+}