X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fconfig%2Fconfig_test.go;h=90d3c0368283f2e7d1479687db6b5e40363a7ae7;hb=3deeefa87a81f8724520ce0e3a55d88a5d328204;hp=104302726406fc9a970c176fffc18e013ad6aa9c;hpb=82378715d387362e97a064665a2467c587afdeed;p=nonrtric.git

diff --git a/dmaap-mediator-producer/internal/config/config_test.go b/dmaap-mediator-producer/internal/config/config_test.go
index 10430272..90d3c036 100644
--- a/dmaap-mediator-producer/internal/config/config_test.go
+++ b/dmaap-mediator-producer/internal/config/config_test.go
@@ -31,30 +31,29 @@ import (
 )
 
 func TestNew_envVarsSetConfigContainSetValues(t *testing.T) {
+	assertions := require.New(t)
 	os.Setenv("LOG_LEVEL", "Debug")
-	os.Setenv("INFO_PRODUCER_SUPERVISION_CALLBACK_HOST", "supervisionCallbackHost")
-	os.Setenv("INFO_PRODUCER_SUPERVISION_CALLBACK_PORT", "8095")
-	os.Setenv("INFO_JOB_CALLBACK_HOST", "jobCallbackHost")
-	os.Setenv("INFO_JOB_CALLBACK_PORT", "8096")
+	os.Setenv("INFO_PRODUCER_HOST", "producerHost")
+	os.Setenv("INFO_PRODUCER_PORT", "8095")
 	os.Setenv("INFO_COORD_ADDR", "infoCoordAddr")
-	os.Setenv("MR_HOST", "mrHost")
-	os.Setenv("MR_PORT", "3908")
+	os.Setenv("DMAAP_MR_ADDR", "mrHost:3908")
+	os.Setenv("PRODUCER_CERT_PATH", "cert")
+	os.Setenv("PRODUCER_KEY_PATH", "key")
 	t.Cleanup(func() {
 		os.Clearenv()
 	})
 	wantConfig := Config{
-		LogLevel:                            "Debug",
-		InfoProducerSupervisionCallbackHost: "supervisionCallbackHost",
-		InfoProducerSupervisionCallbackPort: 8095,
-		InfoJobCallbackHost:                 "jobCallbackHost",
-		InfoJobCallbackPort:                 8096,
-		InfoCoordinatorAddress:              "infoCoordAddr",
-		MRHost:                              "mrHost",
-		MRPort:                              3908,
-	}
-	if got := New(); !reflect.DeepEqual(got, &wantConfig) {
-		t.Errorf("New() = %v, want %v", got, &wantConfig)
+		LogLevel:               log.DebugLevel,
+		InfoProducerHost:       "producerHost",
+		InfoProducerPort:       8095,
+		InfoCoordinatorAddress: "infoCoordAddr",
+		DMaaPMRAddress:         "mrHost:3908",
+		ProducerCertPath:       "cert",
+		ProducerKeyPath:        "key",
 	}
+	got := New()
+
+	assertions.Equal(&wantConfig, got)
 }
 
 func TestNew_faultyIntValueSetConfigContainDefaultValueAndWarnInLog(t *testing.T) {
@@ -62,40 +61,51 @@ func TestNew_faultyIntValueSetConfigContainDefaultValueAndWarnInLog(t *testing.T
 	var buf bytes.Buffer
 	log.SetOutput(&buf)
 
-	os.Setenv("INFO_PRODUCER_SUPERVISION_CALLBACK_PORT", "wrong")
+	os.Setenv("INFO_PRODUCER_PORT", "wrong")
 	t.Cleanup(func() {
 		log.SetOutput(os.Stderr)
 		os.Clearenv()
 	})
 	wantConfig := Config{
-		LogLevel:                            "Info",
-		InfoProducerSupervisionCallbackHost: "",
-		InfoProducerSupervisionCallbackPort: 8085,
-		InfoJobCallbackHost:                 "",
-		InfoJobCallbackPort:                 8086,
-		InfoCoordinatorAddress:              "http://enrichmentservice:8083",
-		MRHost:                              "http://message-router.onap",
-		MRPort:                              3904,
+		LogLevel:               log.InfoLevel,
+		InfoProducerHost:       "",
+		InfoProducerPort:       8085,
+		InfoCoordinatorAddress: "https://enrichmentservice:8434",
+		DMaaPMRAddress:         "https://message-router.onap:3905",
+		ProducerCertPath:       "security/producer.crt",
+		ProducerKeyPath:        "security/producer.key",
 	}
 	if got := New(); !reflect.DeepEqual(got, &wantConfig) {
 		t.Errorf("New() = %v, want %v", got, &wantConfig)
 	}
 	logString := buf.String()
-	assertions.Contains(logString, "Invalid int value: wrong for variable: INFO_PRODUCER_SUPERVISION_CALLBACK_PORT. Default value: 8085 will be used")
+	assertions.Contains(logString, "Invalid int value: wrong for variable: INFO_PRODUCER_PORT. Default value: 8085 will be used")
 }
 
-func TestNew_envVarsNotSetConfigContainDefaultValues(t *testing.T) {
+func TestNew_envFaultyLogLevelConfigContainDefaultValues(t *testing.T) {
+	assertions := require.New(t)
+	var buf bytes.Buffer
+	log.SetOutput(&buf)
+
+	os.Setenv("LOG_LEVEL", "wrong")
+	t.Cleanup(func() {
+		log.SetOutput(os.Stderr)
+		os.Clearenv()
+	})
+
 	wantConfig := Config{
-		LogLevel:                            "Info",
-		InfoProducerSupervisionCallbackHost: "",
-		InfoProducerSupervisionCallbackPort: 8085,
-		InfoJobCallbackHost:                 "",
-		InfoJobCallbackPort:                 8086,
-		InfoCoordinatorAddress:              "http://enrichmentservice:8083",
-		MRHost:                              "http://message-router.onap",
-		MRPort:                              3904,
-	}
-	if got := New(); !reflect.DeepEqual(got, &wantConfig) {
-		t.Errorf("New() = %v, want %v", got, &wantConfig)
+		LogLevel:               log.InfoLevel,
+		InfoProducerHost:       "",
+		InfoProducerPort:       8085,
+		InfoCoordinatorAddress: "https://enrichmentservice:8434",
+		DMaaPMRAddress:         "https://message-router.onap:3905",
+		ProducerCertPath:       "security/producer.crt",
+		ProducerKeyPath:        "security/producer.key",
 	}
+
+	got := New()
+
+	assertions.Equal(&wantConfig, got)
+	logString := buf.String()
+	assertions.Contains(logString, "Invalid log level: wrong. Log level will be Info!")
 }