Code Review
/
portal
/
ric-dashboard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Apply mat-table to control and catalog"
[portal/ric-dashboard.git]
/
webapp-backend
/
src
/
main
/
java
/
org
/
oransc
/
ric
/
portal
/
dashboard
/
config
/
XappManagerMockConfiguration.java
diff --git
a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java
b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java
index
f6bb378
..
ed4f49c
100644
(file)
--- a/
webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java
+++ b/
webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java
@@
-66,14
+66,10
@@
public class XappManagerMockConfiguration {
Xapp dc = new Xapp().name("Dual Connectivity").version("v2").status(StatusEnum.DELETED);
dc.addInstancesItem(
new XappInstance().name("def0-6789").ip("6.7.8.9").port(300).status(XappInstance.StatusEnum.COMPLETED));
Xapp dc = new Xapp().name("Dual Connectivity").version("v2").status(StatusEnum.DELETED);
dc.addInstancesItem(
new XappInstance().name("def0-6789").ip("6.7.8.9").port(300).status(XappInstance.StatusEnum.COMPLETED));
- Xapp pc = new Xapp().name("Pendulum Control").version("v1").status(StatusEnum.DEPLOYED);
- pc.addInstancesItem(
- new XappInstance().name("abcd-1234").ip("1.2.3.4").port(100).status(XappInstance.StatusEnum.RUNNING));
allXapps = new AllXapps();
allXapps.add(ac);
allXapps.add(an);
allXapps.add(dc);
allXapps = new AllXapps();
allXapps.add(ac);
allXapps.add(an);
allXapps.add(dc);
- allXapps.add(pc);
}
@Bean
}
@Bean
@@
-84,7
+80,10
@@
public class XappManagerMockConfiguration {
when(mockApi.getApiClient()).thenReturn(mockClient);
doAnswer(i -> {
return null;
when(mockApi.getApiClient()).thenReturn(mockClient);
doAnswer(i -> {
return null;
- }).when(mockApi).getHealth();
+ }).when(mockApi).getHealthAlive();
+ doAnswer(i -> {
+ return null;
+ }).when(mockApi).getHealthReady();
return mockApi;
}
return mockApi;
}
@@
-102,13
+101,12
@@
public class XappManagerMockConfiguration {
doAnswer(i -> {
return null;
doAnswer(i -> {
return null;
- }).when(mockApi).deleteSubscription(any(
Integer
.class));
+ }).when(mockApi).deleteSubscription(any(
String
.class));
when(mockApi.deployXapp(any(XAppInfo.class))).thenReturn(new Xapp());
when(mockApi.getAllXapps()).thenReturn(allXapps);
when(mockApi.deployXapp(any(XAppInfo.class))).thenReturn(new Xapp());
when(mockApi.getAllXapps()).thenReturn(allXapps);
-
Xapp xappByName = new Xapp().name("name").status(StatusEnum.UNKNOWN).version("v1");
when(mockApi.getXappByName(any(String.class))).thenReturn(xappByName);
Xapp xappByName = new Xapp().name("name").status(StatusEnum.UNKNOWN).version("v1");
when(mockApi.getXappByName(any(String.class))).thenReturn(xappByName);