only subscribe to subscribe events in event InitEventSystem(), fix gnmi target...

only subscribe to subscribe events in event InitEventSystem(), fix gnmi target names in test/main.go, remove stop channel from main.go that has become redundant, don't copy gNMISubscription.txt alternative into gosdn container in controller.Dockerfile

applications/rtdt-manager/main.go

@@ -3,10 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"os"
-	"os/signal"
-	"syscall"
-
 	clabconfig "code.fbi.h-da.de/danet/gosdn/applications/rtdt-manager/clab-config"
 	RtdtMan "code.fbi.h-da.de/danet/gosdn/applications/rtdt-manager/rtdt-manager"
 	"code.fbi.h-da.de/danet/gosdn/applications/rtdt-manager/sdnconfig"
@@ -16,10 +12,6 @@ import (
 func main() {
 
 	var err error
-	// Global stop channel, should be passed to all venvs and App
-	stopChan := make(chan os.Signal, 1)
-	signal.Notify(stopChan, os.Interrupt, syscall.SIGTERM)
-
 	var address string
 	var pass string
 	var user string
@@ -95,7 +87,7 @@ func main() {
 	if withTwin {
 		rtdtMan.LaunchTwin("172.101.0.0/16", "2001:db9::/64", "test-twin")
 	}
-    // Runs the main loop
+	// Runs the main loop
 	if err := rtdtMan.Run(); err != nil {
 		fmt.Println("Program exited with errors: %w", err)
 	}

applications/rtdt-manager/rtdt-manager/rtdt-manager.go

@@ -345,9 +345,9 @@ func (r *RtdtManager) InitEventSystem() error {
 
 	// Can have different callback per type per topic (e.g. adding mne or updating mne)
 	eventServiceMNE.SubscribeToEventType([]event.TypeToCallbackTuple{
-		{Type: event.Type(event.Update), Callback: r.updateMNECallback},
-		{Type: event.Type(event.Add), Callback: r.updateMNECallback},
-		{Type: event.Type(event.Delete), Callback: r.updateMNECallback},
+		// {Type: event.Type(event.Update), Callback: r.updateMNECallback},
+		// {Type: event.Type(event.Add), Callback: r.updateMNECallback},
+		// {Type: event.Type(event.Delete), Callback: r.updateMNECallback},
 		{Type: event.Type(event.Subscribe), Callback: r.updateMNECallback},
 	})
 	eventServiceUser.SubscribeToEventType([]event.TypeToCallbackTuple{

applications/rtdt-manager/test/main.go

@@ -106,7 +106,7 @@ func CreateMnes() {
 			},
 			{
 				Address:            opt1.GetAddress(),
-				MneName:            "gnmi-target-switch0",
+				MneName:            "gnmi-target-switch1",
 				PluginId:           pluginID.String(),
 				Pid:                gosdn_pnd.String(),
 				TransportOption:    opt1,

controller/controller.Dockerfile

@@ -19,8 +19,6 @@ COPY --from=builder /gosdn/controller/configs/development-gosdn.toml.example ./c
 COPY --from=builder /gosdn/controller/configs/integration-test-gosdn.toml ./configs/integration-test-gosdn.toml
 COPY --from=builder /gosdn/controller/configs/containerlab-gosdn.toml.example ./configs/containerlab-gosdn.toml
 COPY --from=builder /gosdn/controller/configs/gNMISubscriptions.txt.example ./configs/gNMISubscriptions.txt
-COPY --from=builder /gosdn/applications/rtdt-manager/data/containerlab-gosdn-realnet.toml.example ./configs/containerlab-gosdn-realnet.toml
-COPY --from=builder /gosdn/applications/rtdt-manager/data/containerlab-gosdn-twin.toml.example ./configs/containerlab-gosdn-twin.toml
 
 EXPOSE 55055 8080 40000
 ENTRYPOINT ["./gosdn"]