summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
ccf7511)
This mocked a list of RAN names to support testing in R1.
Remove because the latest e2mgr provides a list of names.
Change-Id: I467c9ec33b53ea524ace97eab4c87c4f0bbbf6b9
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
RIC Dashboard Release Notes
===========================
RIC Dashboard Release Notes
===========================
-Version 1.2.0, 10 July 2019
+Version 1.2.0, 11 July 2019
---------------------------
* Split URL properties into prefix/suffix parts
* Add jacoco plugin to back-end for code coverage
* Compile with Java version 11, run with image openjdk:11
* Clean code of issues reported by Sonar
---------------------------
* Split URL properties into prefix/suffix parts
* Add jacoco plugin to back-end for code coverage
* Compile with Java version 11, run with image openjdk:11
* Clean code of issues reported by Sonar
+* Drop mock RAN names feature that supported R1 testing
Version 1.0.5, 5 July 2019
--------------------------
Version 1.0.5, 5 July 2019
--------------------------
import org.oransc.ric.e2mgr.client.api.NodebApi;
import org.oransc.ric.e2mgr.client.model.GetNodebResponse;
import org.oransc.ric.e2mgr.client.model.NodebIdentity;
import org.oransc.ric.e2mgr.client.api.NodebApi;
import org.oransc.ric.e2mgr.client.model.GetNodebResponse;
import org.oransc.ric.e2mgr.client.model.NodebIdentity;
-import org.oransc.ric.e2mgr.client.model.NodebIdentityGlobalNbId;
import org.oransc.ric.e2mgr.client.model.SetupRequest;
import org.oransc.ric.portal.dashboard.DashboardApplication;
import org.oransc.ric.portal.dashboard.DashboardConstants;
import org.oransc.ric.e2mgr.client.model.SetupRequest;
import org.oransc.ric.portal.dashboard.DashboardApplication;
import org.oransc.ric.portal.dashboard.DashboardConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
import org.springframework.util.Assert;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
import org.springframework.util.Assert;
* 502 on failure and wrap the remote details: <blockquote>HTTP server received
* an invalid response from a server it consulted when acting as a proxy or
* gateway.</blockquote>
* 502 on failure and wrap the remote details: <blockquote>HTTP server received
* an invalid response from a server it consulted when acting as a proxy or
* gateway.</blockquote>
- *
- * In R1 the E2 interface does not yet implement the get-ID-list method, so this
- * class mocks up some functionality.
*/
@Configuration
@RestController
*/
@Configuration
@RestController
private final HealthCheckApi e2HealthCheckApi;
private final NodebApi e2NodebApi;
private final HealthCheckApi e2HealthCheckApi;
private final NodebApi e2NodebApi;
- // TODO: remove this when E2 delivers the feature
- private final List<NodebIdentity> mockNodebIdList;
-
- public E2ManagerController(final HealthCheckApi e2HealthCheckApi, final NodebApi e2NodebApi,
- @Value("${e2mgr.mock.rannames:#{null}}") final String mockRanNames) {
+ public E2ManagerController(final HealthCheckApi e2HealthCheckApi, final NodebApi e2NodebApi) {
Assert.notNull(e2HealthCheckApi, "API must not be null");
Assert.notNull(e2NodebApi, "API must not be null");
this.e2HealthCheckApi = e2HealthCheckApi;
this.e2NodebApi = e2NodebApi;
Assert.notNull(e2HealthCheckApi, "API must not be null");
Assert.notNull(e2NodebApi, "API must not be null");
this.e2HealthCheckApi = e2HealthCheckApi;
this.e2NodebApi = e2NodebApi;
- mockNodebIdList = new ArrayList<>();
- if (mockRanNames != null) {
- logger.debug("ctor: Mocking RAN names: {}", mockRanNames);
- for (String id : mockRanNames.split(",")) {
- NodebIdentityGlobalNbId globalNbId = new NodebIdentityGlobalNbId().nbId("mockNbId").plmnId("mockPlmId");
- mockNodebIdList.add(new NodebIdentity().globalNbId(globalNbId).inventoryName(id.trim()));
- }
- }
}
@ApiOperation(value = "Gets the E2 manager client library MANIFEST.MF property Implementation-Version.", response = SuccessTransport.class)
}
@ApiOperation(value = "Gets the E2 manager client library MANIFEST.MF property Implementation-Version.", response = SuccessTransport.class)
@GetMapping(RAN_METHOD)
public List<RanDetailsTransport> getRanDetails() {
logger.debug("getRanDetails");
@GetMapping(RAN_METHOD)
public List<RanDetailsTransport> getRanDetails() {
logger.debug("getRanDetails");
- // TODO: remove mock when e2mgr delivers the getNodebIdList() method
- List<NodebIdentity> nodebIdList = mockNodebIdList.isEmpty() ? e2NodebApi.getNodebIdList() : mockNodebIdList;
+ List<NodebIdentity> nodebIdList = e2NodebApi.getNodebIdList();
List<RanDetailsTransport> details = new ArrayList<>();
for (NodebIdentity nbid : nodebIdList) {
GetNodebResponse nbResp = null;
List<RanDetailsTransport> details = new ArrayList<>();
for (NodebIdentity nbid : nodebIdList) {
GetNodebResponse nbResp = null;
# E2 Manager
e2mgr.url.prefix = http://jar-app-props-default-E2-URL
e2mgr.url.suffix = /v1
# E2 Manager
e2mgr.url.prefix = http://jar-app-props-default-E2-URL
e2mgr.url.suffix = /v1
-# Supply CSV to mock the get-list API for testing e2mgr in R1;
-# missing key or empty value disables the mock behavior
-# e2mgr.mock.rannames = RANONE, RANTWO