X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FAnrXappMockConfiguration.java;h=aaf522ed8c2433a6c928cd9f2ec5f24b3af9bd2c;hb=b8f4e986970eab6cfa5729c24680f2816f056edb;hp=b33aa04059242003b36c4c3ab6dc82364b77f74e;hpb=3340ea073fd56431b2d1231bda17cd98765fd8eb;p=portal%2Fric-dashboard.git 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 b33aa040..aaf522ed 100644 --- 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,15 +54,15 @@ public class AnrXappMockConfiguration { private final NeighborCellRelationTable ncrt, ncrtNodeB1, ncrtNodeB2, ncrtNodeB3; private final GgNodeBTable gNodebTable; - private static final String gnodeb1 = "001EF5:0045FE50"; - private static final String gnodeb2 = "001EF6:0045FE51"; - private static final String gnodeb3 = "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() { logger.info("Configuring mock ANR xApp client"); gNodebTable = new GgNodeBTable(); - gNodebTable.addGNodeBIdsItem(gnodeb1).addGNodeBIdsItem(gnodeb2).addGNodeBIdsItem(gnodeb3); + gNodebTable.addGNodeBIdsItem(GNODEB1).addGNodeBIdsItem(GNODEB2).addGNodeBIdsItem(GNODEB3); ncrtNodeB1 = new NeighborCellRelationTable(); ncrtNodeB2 = new NeighborCellRelationTable(); ncrtNodeB3 = new NeighborCellRelationTable(); @@ -70,18 +70,18 @@ public class AnrXappMockConfiguration { String[] neighbors1 = { "1104", "1105", "1106" }; for (String n : neighbors1) ncrtNodeB1.addNcrtRelationsItem( - new NeighborCellRelation().servingCellNrcgi(gnodeb1 + ":1100").neighborCellNrpci(n) - .neighborCellNrcgi(gnodeb1 + ":" + n).flagNoHo(true).flagNoXn(true).flagNoRemove(true)); + new NeighborCellRelation().servingCellNrcgi(GNODEB1 + ":1100").neighborCellNrpci(n) + .neighborCellNrcgi(GNODEB1 + ":" + n).flagNoHo(true).flagNoXn(true).flagNoRemove(true)); String[] neighbors2 = { "1471", "1472", "1473" }; for (String n : neighbors2) ncrtNodeB2.addNcrtRelationsItem( - new NeighborCellRelation().servingCellNrcgi(gnodeb2 + ":1400").neighborCellNrpci(n) - .neighborCellNrcgi(gnodeb2 + ":" + n).flagNoHo(false).flagNoXn(false).flagNoRemove(false)); + new NeighborCellRelation().servingCellNrcgi(GNODEB2 + ":1400").neighborCellNrpci(n) + .neighborCellNrcgi(GNODEB2 + ":" + n).flagNoHo(false).flagNoXn(false).flagNoRemove(false)); String[] neighbors3 = { "3601", "3601", "3602" }; for (String n : neighbors3) ncrtNodeB3.addNcrtRelationsItem( - new NeighborCellRelation().servingCellNrcgi(gnodeb3 + ":3600").neighborCellNrpci(n) - .neighborCellNrcgi(gnodeb3 + ":" + n).flagNoHo(true).flagNoXn(true).flagNoRemove(true)); + new NeighborCellRelation().servingCellNrcgi(GNODEB3 + ":3600").neighborCellNrpci(n) + .neighborCellNrcgi(GNODEB3 + ":" + n).flagNoHo(true).flagNoXn(true).flagNoRemove(true)); for (NeighborCellRelation ncr : ncrtNodeB1.getNcrtRelations()) ncrt.addNcrtRelationsItem(ncr); for (NeighborCellRelation ncr : ncrtNodeB2.getNcrtRelations()) @@ -121,9 +121,9 @@ public class AnrXappMockConfiguration { // Swagger sends nulls; front end sends empty strings when(mockApi.getNcrt((String) isNull(), (String) isNull(), (String) isNull())).thenReturn(ncrt); when(mockApi.getNcrt(eq(""), any(String.class), any(String.class))).thenReturn(ncrt); - when(mockApi.getNcrt(eq(gnodeb1), any(String.class), any(String.class))).thenReturn(ncrtNodeB1); - when(mockApi.getNcrt(eq(gnodeb2), any(String.class), any(String.class))).thenReturn(ncrtNodeB2); - when(mockApi.getNcrt(eq(gnodeb3), any(String.class), any(String.class))).thenReturn(ncrtNodeB3); + when(mockApi.getNcrt(eq(GNODEB1), any(String.class), any(String.class))).thenReturn(ncrtNodeB1); + when(mockApi.getNcrt(eq(GNODEB2), any(String.class), any(String.class))).thenReturn(ncrtNodeB2); + when(mockApi.getNcrt(eq(GNODEB3), any(String.class), any(String.class))).thenReturn(ncrtNodeB3); doAnswer(i -> { return null; }).when(mockApi).deleteNcrt(any(String.class), any(String.class));