X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fconfig%2Fconfig.go;h=eef1b5f97003d6a6a6f9307939af9e861dbad630;hb=6f48adb69090799c74c29204dd2cd1737cc9d6ac;hp=dfd2505b6c38d0fd886cab4c36e7cdc150749279;hpb=f1cee0f81c6bc482f73182c8f4c903e8376381e8;p=nonrtric.git

diff --git a/dmaap-mediator-producer/internal/config/config.go b/dmaap-mediator-producer/internal/config/config.go
index dfd2505b..eef1b5f9 100644
--- a/dmaap-mediator-producer/internal/config/config.go
+++ b/dmaap-mediator-producer/internal/config/config.go
@@ -21,6 +21,7 @@
 package config
 
 import (
+	"fmt"
 	"os"
 	"strconv"
 
@@ -32,21 +33,26 @@ type Config struct {
 	InfoProducerHost       string
 	InfoProducerPort       int
 	InfoCoordinatorAddress string
-	MRHost                 string
-	MRPort                 int
+	DMaaPMRAddress         string
+	ProducerCertPath       string
+	ProducerKeyPath        string
 }
 
 func New() *Config {
 	return &Config{
-		LogLevel:               getLogLevel(),
 		InfoProducerHost:       getEnv("INFO_PRODUCER_HOST", ""),
 		InfoProducerPort:       getEnvAsInt("INFO_PRODUCER_PORT", 8085),
-		InfoCoordinatorAddress: getEnv("INFO_COORD_ADDR", "http://enrichmentservice:8083"),
-		MRHost:                 getEnv("MR_HOST", "http://message-router.onap"),
-		MRPort:                 getEnvAsInt("MR_PORT", 3904),
+		InfoCoordinatorAddress: getEnv("INFO_COORD_ADDR", "https://enrichmentservice:8434"),
+		DMaaPMRAddress:         getEnv("DMAAP_MR_ADDR", "https://message-router.onap:3905"),
+		ProducerCertPath:       getEnv("PRODUCER_CERT_PATH", "security/producer.crt"),
+		ProducerKeyPath:        getEnv("PRODUCER_KEY_PATH", "security/producer.key"),
+		LogLevel:               getLogLevel(),
 	}
 }
 
+func (c Config) String() string {
+	return fmt.Sprintf("InfoProducerHost: %v, InfoProducerPort: %v, InfoCoordinatorAddress: %v, DMaaPMRAddress: %v, ProducerCertPath: %v, ProducerKeyPath: %v, LogLevel: %v", c.InfoProducerHost, c.InfoProducerPort, c.InfoCoordinatorAddress, c.DMaaPMRAddress, c.ProducerCertPath, c.ProducerKeyPath, c.LogLevel)
+}
 func getEnv(key string, defaultVal string) string {
 	if value, exists := os.LookupEnv(key); exists {
 		return value