Upgrade E2 to version 20190626

[portal/ric-dashboard.git] / webapp-backend / src / main / java / org / oransc / ric / portal / dashboard / config / AnrXappMockConfiguration.java

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java
index 4d80d4f..b33aa04 100644 (file)
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java
@@ -54,9 +54,9 @@ public class AnrXappMockConfiguration {
        private final NeighborCellRelationTable ncrt, ncrtNodeB1, ncrtNodeB2, ncrtNodeB3;
        private final GgNodeBTable gNodebTable;
 
-       private static final String gnodeb1 = "GNB:001EF5:0045FE50";
-       private static final String gnodeb2 = "GNB:001EF6:0045FE51";
-       private static final String gnodeb3 = "GNB:001EF7:0045FE52";
+       private static final String gnodeb1 = "001EF5:0045FE50";
+       private static final String gnodeb2 = "001EF6:0045FE51";
+       private static final String gnodeb3 = "001EF7:0045FE52";
 
        public AnrXappMockConfiguration() {
 
@@ -97,6 +97,7 @@ public class AnrXappMockConfiguration {
        }
 
        @Bean
+       // Use the same name as regular configuration
        public HealthApi anrHealthApi() {
                ApiClient apiClient = apiClient();
                HealthApi mockApi = mock(HealthApi.class);
@@ -111,7 +112,8 @@ public class AnrXappMockConfiguration {
        }
 
        @Bean
-       public NcrtApi ncrtMockApi() {
+       // Use the same name as regular configuration
+       public NcrtApi anrNcrtApi() {
                ApiClient apiClient = apiClient();
                NcrtApi mockApi = mock(NcrtApi.class);
                when(mockApi.getApiClient()).thenReturn(apiClient);