summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
492897c)
Minor changes in the backend but no behavior changes.
Change-Id: Ica61cc488d077dc1001828229a3d858bbeea31ae
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
/.settings
/target/
/.mvn/wrapper/maven-wrapper.jar
/.settings
/target/
/.mvn/wrapper/maven-wrapper.jar
### STS ###
.apt_generated
### STS ###
.apt_generated
-------------------------
* Add EPSDK-FW user management and Portal security
-------------------------
* Add EPSDK-FW user management and Portal security
-Version 1.2.0, 23 Aug 2019
+Version 1.2.0, 11 Sep 2019
--------------------------
* Split URL properties into prefix/suffix parts
* Add jacoco plugin to back-end for code coverage
--------------------------
* Split URL properties into prefix/suffix parts
* Add jacoco plugin to back-end for code coverage
* Extend mock endpoints to simulate delay seen in tests
* Move mock configuration classes into test area
* Update App manager client to spec version 0.1.7
* Extend mock endpoints to simulate delay seen in tests
* Move mock configuration classes into test area
* Update App manager client to spec version 0.1.7
-* Update E2 manager client to spec version 20190815
* Add controller for page refresh of Angular routes
* Extend E2 mock configuration for demo purposes
* Add pattern for matching AC/admin application name
* Add controller for page refresh of Angular routes
* Extend E2 mock configuration for demo purposes
* Add pattern for matching AC/admin application name
* Create loading-dialog component and service
* Showing the loading-dialog while making API call
* Add notification and error handling for xapp configuration
* Create loading-dialog component and service
* Showing the loading-dialog while making API call
* Add notification and error handling for xapp configuration
+* Update E2 manager client to spec version 2.0.5 of 2019-09-11
Version 1.0.5, 5 July 2019
--------------------------
Version 1.0.5, 5 July 2019
--------------------------
<groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
<artifactId>e2-mgr-client</artifactId>
<name>RIC E2 Manager client</name>
<groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
<artifactId>e2-mgr-client</artifactId>
<name>RIC E2 Manager client</name>
- <version>20190815-SNAPSHOT</version>
+ <version>2.0.5-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<goal>generate</goal>
</goals>
<configuration>
<goal>generate</goal>
</goals>
<configuration>
- <inputSpec>${project.basedir}/src/main/resources/E2M_API_2019-08-15.yaml</inputSpec>
+ <inputSpec>${project.basedir}/src/main/resources/E2M_API_2019-09-11.yaml</inputSpec>
<language>java</language>
<packageName>${client.base.package.name}</packageName>
<modelPackage>${client.base.package.name}.model</modelPackage>
<language>java</language>
<packageName>${client.base.package.name}</packageName>
<modelPackage>${client.base.package.name}.model</modelPackage>
# See the License for the specific language governing permissions and
# limitations under the License.
# ========================LICENSE_END===================================
# See the License for the specific language governing permissions and
# limitations under the License.
# ========================LICENSE_END===================================
openapi: 3.0.0
info:
title: E2 Manager Service
description: E2 Manager Service APIs
openapi: 3.0.0
info:
title: E2 Manager Service
description: E2 Manager Service APIs
servers:
- url: 'http://{apiRoot}/v1'
variables:
servers:
- url: 'http://{apiRoot}/v1'
variables:
application/problem+json:
schema:
$ref: '#/components/schemas/ErrorResponse'
application/problem+json:
schema:
$ref: '#/components/schemas/ErrorResponse'
application/problem+json:
schema:
$ref: '#/components/schemas/ErrorResponse'
application/problem+json:
schema:
$ref: '#/components/schemas/ErrorResponse'
- /nodeb-reset/{ranName}:
+ /nodeb/{ranName}/reset:
put:
tags:
- nodeb
summary: >-
put:
tags:
- nodeb
summary: >-
- Upon receipt of this message, 'ranName' shall abort any other ongoing procedures over X2 between the RIC and the RAN. The RAN shall delete all the context information related to the RIC, except the application level configuration data exchanged during the X2 Setup or eNB Configuration Update procedures, and release the corresponding resource.
+ Upon receipt of this message, 'ranName' shall abort any other ongoing procedures over X2 between the RIC and the RAN. The RAN shall delete all the context information related to the RIC, except the application level configuration data exchanged during the X2 Setup or eNB Configuration Update procedures, and release the corresponding resource.
operationId: reset
parameters:
- name: ranName
operationId: reset
parameters:
- name: ranName
radioNetwork:resource-optimisation-handover,
radioNetwork:reduce-load-in-serving-cell,
radioNetwork:partial-handover,
radioNetwork:resource-optimisation-handover,
radioNetwork:reduce-load-in-serving-cell,
radioNetwork:partial-handover,
-radioNetwork:unknown-new-eNB-UE-X2AP-ID,
-radioNetwork:unknown-old-eNB-UE-X2AP-ID,
+radioNetwork:unknown-new-eNB-UE-X2AP-ID,
+radioNetwork:unknown-old-eNB-UE-X2AP-ID,
radioNetwork:unknown-pair-of-UE-X2AP-ID,
radioNetwork:ho-target-not-allowed,
radioNetwork:tx2relocoverall-expiry,
radioNetwork:unknown-pair-of-UE-X2AP-ID,
radioNetwork:ho-target-not-allowed,
radioNetwork:tx2relocoverall-expiry,
<dependency>
<groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
<artifactId>e2-mgr-client</artifactId>
<dependency>
<groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
<artifactId>e2-mgr-client</artifactId>
- <version>20190815-SNAPSHOT</version>
+ <version>2.0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.onap.portal.sdk</groupId>
</dependency>
<dependency>
<groupId>org.onap.portal.sdk</groupId>
// Publish paths in constants so tests are easy to write
public static final String CONTROLLER_PATH = DashboardConstants.ENDPOINT_PREFIX + "/e2mgr";
// Publish paths in constants so tests are easy to write
public static final String CONTROLLER_PATH = DashboardConstants.ENDPOINT_PREFIX + "/e2mgr";
public static final String HEALTH_METHOD = "health";
public static final String HEALTH_METHOD = "health";
- public static final String NODEB_SHUTDOWN_METHOD = "/nodebShutdownPut";
- public static final String NODEB_LIST_METHOD = "/nodeb-ids";
public static final String RAN_METHOD = "/ran";
public static final String RAN_METHOD = "/ran";
- public static final String RESET_METHOD = "/reset";
- public static final String ENDC_SETUP_METHOD = "/endcSetup";
- public static final String X2_SETUP_METHOD = "/x2Setup";
public static final String VERSION_METHOD = DashboardConstants.VERSION_METHOD;
public static final String VERSION_METHOD = DashboardConstants.VERSION_METHOD;
+ // Keep these consistent with the E2M implementation
+ public static final String NODEB_PREFIX = "/nodeb";
+ public static final String NODEB_SHUTDOWN_METHOD = NODEB_PREFIX + "/shutdown";
+ public static final String NODEB_LIST_METHOD = NODEB_PREFIX + "/ids";
+ public static final String RESET_METHOD = "/reset";
+ public static final String ENDC_SETUP_METHOD = NODEB_PREFIX + "/endc-setup";
+ public static final String X2_SETUP_METHOD = NODEB_PREFIX + "/x2-setup";
// Path parameters
private static final String PP_RANNAME = "ranName";
// Path parameters
private static final String PP_RANNAME = "ranName";
}
@ApiOperation(value = "Abort any other ongoing procedures over X2 between the RIC and the RAN.")
}
@ApiOperation(value = "Abort any other ongoing procedures over X2 between the RIC and the RAN.")
- @PutMapping(RESET_METHOD + "/{" + PP_RANNAME + "}")
+ @PutMapping(NODEB_PREFIX + "/{" + PP_RANNAME + "}"+ RESET_METHOD)
@Secured({ DashboardConstants.ROLE_ADMIN })
public void reset(@PathVariable(PP_RANNAME) String ranName, @RequestBody ResetRequest resetRequest,
HttpServletResponse response) {
@Secured({ DashboardConstants.ROLE_ADMIN })
public void reset(@PathVariable(PP_RANNAME) String ranName, @RequestBody ResetRequest resetRequest,
HttpServletResponse response) {
}
private ResponseEntity<Void> reset() {
}
private ResponseEntity<Void> reset() {
- URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.RESET_METHOD, "ignored");
+ URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.NODEB_PREFIX, "ignored",
+ E2ManagerController.RESET_METHOD);
logger.info("Invoking {}", uri);
ResetRequest reset = new ResetRequest();
HttpEntity<ResetRequest> entity = new HttpEntity<>(reset);
logger.info("Invoking {}", uri);
ResetRequest reset = new ResetRequest();
HttpEntity<ResetRequest> entity = new HttpEntity<>(reset);