X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fconfiguration%2Fconfiguration_test.go;fp=E2Manager%2Fconfiguration%2Fconfiguration_test.go;h=ffd3123eff8291a594c28f5e65ce24c17cb3f556;hb=21c4f80c47d4941eee3d7b233e0e065dbe098e2d;hp=a7c8cc5659fbc6896903aa5c22afcb9e16ff9f11;hpb=219c5386a3ad46c4646bd5a4f45389a42db065c0;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/configuration/configuration_test.go b/E2Manager/configuration/configuration_test.go
index a7c8cc5..ffd3123 100644
--- a/E2Manager/configuration/configuration_test.go
+++ b/E2Manager/configuration/configuration_test.go
@@ -69,6 +69,7 @@ func TestRmrConfigNotFoundFailure(t *testing.T) {
 	yamlMap := map[string]interface{}{
 		"logging": map[string]interface{}{"logLevel": "info"},
 		"http":    map[string]interface{}{"port": 3800},
+		"routingManager":    map[string]interface{}{"baseUrl": "http://iltlv740.intl.att.com:8080/ric/v1/handles/"},
 	}
 	buf, err := yaml.Marshal(yamlMap)
 	if err != nil {
@@ -78,7 +79,7 @@ func TestRmrConfigNotFoundFailure(t *testing.T) {
 	if err != nil {
 		t.Errorf("#TestRmrConfigNotFoundFailure - failed to write configuration file: %s\n", configPath)
 	}
-	assert.PanicsWithValue(t, "#configuration.fillRmrConfig - failed to fill RMR configuration: The entry 'rmr' not found\n", func() { ParseConfiguration() })
+	assert.PanicsWithValue(t, "#configuration.populateRmrConfig - failed to populate RMR configuration: The entry 'rmr' not found\n", func() { ParseConfiguration() })
 }
 
 func TestLoggingConfigNotFoundFailure(t *testing.T) {
@@ -97,6 +98,7 @@ func TestLoggingConfigNotFoundFailure(t *testing.T) {
 	yamlMap := map[string]interface{}{
 		"rmr":  map[string]interface{}{"port": 3801, "maxMsgSize": 4096},
 		"http": map[string]interface{}{"port": 3800},
+		"routingManager":    map[string]interface{}{"baseUrl": "http://iltlv740.intl.att.com:8080/ric/v1/handles/"},
 	}
 	buf, err := yaml.Marshal(yamlMap)
 	if err != nil {
@@ -106,7 +108,7 @@ func TestLoggingConfigNotFoundFailure(t *testing.T) {
 	if err != nil {
 		t.Errorf("#TestRmrConfigNotFoundFailure - failed to write configuration file: %s\n", configPath)
 	}
-	assert.PanicsWithValue(t, "#configuration.fillLoggingConfig - failed to fill logging configuration: The entry 'logging' not found\n",
+	assert.PanicsWithValue(t, "#configuration.populateLoggingConfig - failed to populate logging configuration: The entry 'logging' not found\n",
 		func() { ParseConfiguration() })
 }
 
@@ -126,6 +128,7 @@ func TestHttpConfigNotFoundFailure(t *testing.T) {
 	yamlMap := map[string]interface{}{
 		"rmr":     map[string]interface{}{"port": 3801, "maxMsgSize": 4096},
 		"logging": map[string]interface{}{"logLevel": "info"},
+		"routingManager":    map[string]interface{}{"baseUrl": "http://iltlv740.intl.att.com:8080/ric/v1/handles/"},
 	}
 	buf, err := yaml.Marshal(yamlMap)
 	if err != nil {
@@ -135,6 +138,36 @@ func TestHttpConfigNotFoundFailure(t *testing.T) {
 	if err != nil {
 		t.Errorf("#TestHttpConfigNotFoundFailure - failed to write configuration file: %s\n", configPath)
 	}
-	assert.PanicsWithValue(t, "#configuration.fillHttpConfig - failed to fill HTTP configuration: The entry 'http' not found\n",
+	assert.PanicsWithValue(t, "#configuration.populateHttpConfig - failed to populate HTTP configuration: The entry 'http' not found\n",
+		func() { ParseConfiguration() })
+}
+
+func TestRoutingManagerConfigNotFoundFailure(t *testing.T) {
+	configPath := "../resources/configuration.yaml"
+	configPathTmp := "../resources/configuration.yaml_tmp"
+	err := os.Rename(configPath, configPathTmp)
+	if err != nil {
+		t.Errorf("#TestRoutingManagerConfigNotFoundFailure - failed to rename configuration file: %s\n", configPath)
+	}
+	defer func() {
+		err = os.Rename(configPathTmp, configPath)
+		if err != nil {
+			t.Errorf("#TestRoutingManagerConfigNotFoundFailure - failed to rename configuration file: %s\n", configPath)
+		}
+	}()
+	yamlMap := map[string]interface{}{
+		"rmr":     map[string]interface{}{"port": 3801, "maxMsgSize": 4096},
+		"logging": map[string]interface{}{"logLevel": "info"},
+		"http": map[string]interface{}{"port": 3800},
+	}
+	buf, err := yaml.Marshal(yamlMap)
+	if err != nil {
+		t.Errorf("#TestRoutingManagerConfigNotFoundFailure - failed to marshal configuration map\n")
+	}
+	err = ioutil.WriteFile("../resources/configuration.yaml", buf, 0644)
+	if err != nil {
+		t.Errorf("#TestRoutingManagerConfigNotFoundFailure - failed to write configuration file: %s\n", configPath)
+	}
+	assert.PanicsWithValue(t, "#configuration.populateRoutingManagerConfig - failed to populate Routing Manager configuration: The entry 'routingManager' not found\n",
 		func() { ParseConfiguration() })
 }