fix addressing in grpc (#158)

Author: Magda-Pytel

launcher/internal/container_controller/container_controller.go

@@ -118,7 +118,6 @@ func CreateAndRunContainers(ctx context.Context, cli ContainerController, log lo
 			// Note - When you use the host network mode in Docker, the container shares
 			// the host machine's network stack.
 		}
-
 		err := createAndRunContainer(ctx, cli, log, &mcmAgentContainer, config)
 		if err != nil {
 			log.Error(err, "Failed to create container MCM MediaProxy Agent!")
@@ -185,7 +184,6 @@ func CreateAndRunContainers(ctx context.Context, cli ContainerController, log lo
 		}
 		instance.NmosClient.FfmpegConnectionAddress = instance.FfmpegPipeline.Network.IP
 		instance.NmosClient.FfmpegConnectionPort = strconv.Itoa(instance.FfmpegPipeline.GRPCPort)
-
 		err = createAndRunContainer(ctx, cli, log, &bcsNmosContainer, config)
 		if err != nil {
 			log.Error(err, "Failed to create container!")

launcher/resources_library/resources/nmos/nmos.go

@@ -18,8 +18,8 @@ type Config struct {
 	GpuHwAcceleration       string     `json:"gpu_hw_acceleration"`
 	GpuHwAccelerationDevice string     `json:"gpu_hw_acceleration_device,omitempty"`
 	Domain                  string     `json:"domain"`
-	FfmpegGrpcServerAddress string     `json:"ffmpeg_grpc_server_address,omitempty"`
-	FfmpegGrpcServerPort    string     `json:"ffmpeg_grpc_server_port,omitempty"`
+	FfmpegGrpcServerAddress string     `json:"ffmpeg_grpc_server_address"`
+	FfmpegGrpcServerPort    string     `json:"ffmpeg_grpc_server_port"`
 	SenderPayloadType       int        `json:"sender_payload_type"`
 	Sender                  []Sender   `json:"sender"`
 	Receiver                []Receiver `json:"receiver"`

launcher/resources_library/utils/operations.go

@@ -150,7 +150,7 @@ func ConstructContainerConfig(containerInfo *general.Containers, config *parser.
 			hostConfig.NetworkMode = "host"
 		}
 	case general.BcsPipelineFfmpeg:
-		fmt.Printf(">> BcsPipelineFfmpeg: %+v\n", config.WorkloadToBeRun)
+		fmt.Printf("\n>>> BcsPipelineFfmpeg: %+v\n", config.WorkloadToBeRun[containerInfo.Id])
 
 		containerConfig = &container.Config{
 			User:  "root",
@@ -212,8 +212,8 @@ func ConstructContainerConfig(containerInfo *general.Containers, config *parser.
 			log.Error(errors.New("NMOS json file does not exist"), "NMOS json file does not exist")
 		}
 		errUpdateJson := updateNmosJsonFile(nmosFilePathJson,
-			config.WorkloadToBeRun[containerInfo.Id].NmosClient.FfmpegConnectionAddress,
-			config.WorkloadToBeRun[containerInfo.Id].NmosClient.FfmpegConnectionPort)
+			config.WorkloadToBeRun[containerInfo.Id].FfmpegPipeline.Network.IP,
+			strconv.Itoa(config.WorkloadToBeRun[containerInfo.Id].FfmpegPipeline.GRPCPort))
 		if errUpdateJson != nil {
 			log.Error(errUpdateJson, "Error updating NMOS json file")
 		}