summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
a38e36c)
Change-Id: I74204d5636948430a8ea0dfac8c29cae5dc81f2d
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
<groupId>org.o-ran-sc.ric.plt.appmgr.client</groupId>
<artifactId>app-mgr-client</artifactId>
<name>RIC App Manager client</name>
<groupId>org.o-ran-sc.ric.plt.appmgr.client</groupId>
<artifactId>app-mgr-client</artifactId>
<name>RIC App Manager client</name>
- <version>0.1.5-SNAPSHOT</version>
+ <version>0.1.7-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/xapp_manager_rest_api_v0_1_5.yaml</inputSpec>
+ <inputSpec>${project.basedir}/src/main/resources/api_appmgr_rest_api_0.1.7.yaml</inputSpec>
<language>java</language>
<configOptions>
<groupId>${project.groupId}</groupId>
<language>java</language>
<configOptions>
<groupId>${project.groupId}</groupId>
swagger: '2.0'
info:
description: This is a draft API for RIC appmgr
swagger: '2.0'
info:
description: This is a draft API for RIC appmgr
title: RIC appmgr
license:
name: Apache 2.0
title: RIC appmgr
license:
name: Apache 2.0
/health/alive :
get :
summary : Health check of xApp Manager - Liveness probe
/health/alive :
get :
summary : Health check of xApp Manager - Liveness probe
- health
operationId : getHealthAlive
responses :
- health
operationId : getHealthAlive
responses :
/health/ready :
get :
summary : Readiness check of xApp Manager - Readiness probe
/health/ready :
get :
summary : Readiness check of xApp Manager - Readiness probe
- health
operationId : getHealthReady
responses :
- health
operationId : getHealthReady
responses :
$ref: '#/definitions/AllDeployedXapps'
'500':
description: Internal error
$ref: '#/definitions/AllDeployedXapps'
'500':
description: Internal error
get:
summary: Returns the list of all deployable xapps
tags:
- xapp
get:
summary: Returns the list of all deployable xapps
tags:
- xapp
- operationId: listAllXapps
+ operationId: listAllDeployableXapps
produces:
- application/json
responses:
produces:
- application/json
responses:
$ref: '#/definitions/ConfigMetadata'
responses:
'204':
$ref: '#/definitions/ConfigMetadata'
responses:
'204':
- description: Successful deletion of xApp
+ description: Successful deletion of xApp config
'400':
description: Invalid parameters supplied
'500':
'400':
description: Invalid parameters supplied
'500':
schema:
$ref: '#/definitions/subscriptionRequest'
responses:
schema:
$ref: '#/definitions/subscriptionRequest'
responses:
- '200':
- description: Subscription successful
+ '201':
+ description: Subscription successfully created
schema:
$ref: '#/definitions/subscriptionResponse'
'400':
schema:
$ref: '#/definitions/subscriptionResponse'
'400':
RIC Dashboard Release Notes
===========================
RIC Dashboard Release Notes
===========================
-Version 1.2.0, 31 July 2019
----------------------------
+Version 1.2.0, 7 Aug 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
* 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
* Move mock configuration classes into test area
* Add EPSDK-FW user management and Portal security
* Update A1 mediator client to spec version 0.10.0
* Move mock configuration classes into test area
* Add EPSDK-FW user management and Portal security
* Update A1 mediator client to spec version 0.10.0
+* Update App manager client to spec version 0.1.7
Version 1.0.5, 5 July 2019
--------------------------
Version 1.0.5, 5 July 2019
--------------------------
<dependency>
<groupId>org.o-ran-sc.ric.plt.appmgr.client</groupId>
<artifactId>app-mgr-client</artifactId>
<dependency>
<groupId>org.o-ran-sc.ric.plt.appmgr.client</groupId>
<artifactId>app-mgr-client</artifactId>
- <version>0.1.5-SNAPSHOT</version>
+ <version>0.1.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
</dependency>
<dependency>
<groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
@Secured({ DashboardConstants.ROLE_ADMIN, DashboardConstants.ROLE_STANDARD })
public Object getAvailableXapps() {
logger.debug("getAvailableXapps");
@Secured({ DashboardConstants.ROLE_ADMIN, DashboardConstants.ROLE_STANDARD })
public Object getAvailableXapps() {
logger.debug("getAvailableXapps");
- AllDeployableXapps appNames = xappApi.listAllXapps();
+ AllDeployableXapps appNames = xappApi.listAllDeployableXapps();
// Answer a collection of structure instead of string
// because I expect the AppMgr to be extended with
// additional properties for each one.
// Answer a collection of structure instead of string
// because I expect the AppMgr to be extended with
// additional properties for each one.
@Value("${mock.config.delay:0}")
private int delayMs;
@Value("${mock.config.delay:0}")
private int delayMs;
- private final AllDeployableXapps availXapps;
+ private final AllDeployableXapps deployableApps;
private final AllDeployedXapps deployedXapps;
private final AllXappConfig allXappConfigs;
private final SubscriptionResponse subRes;
private final AllDeployedXapps deployedXapps;
private final AllXappConfig allXappConfigs;
private final SubscriptionResponse subRes;
final String configJson = " { \"config\" : \"example\" }";
final String descriptorJson = " { \"descriptor\" : \"example\" }";
allXappConfigs = new AllXappConfig();
final String configJson = " { \"config\" : \"example\" }";
final String descriptorJson = " { \"descriptor\" : \"example\" }";
allXappConfigs = new AllXappConfig();
- availXapps = new AllDeployableXapps();
+ deployableApps = new AllDeployableXapps();
deployedXapps = new AllDeployedXapps();
for (String n : appNames) {
ConfigMetadata metadata = new ConfigMetadata().configName("config-" + n).name(n).namespace("namespace");
XAppConfig config = new XAppConfig().config(configJson).descriptor(descriptorJson).metadata(metadata);
allXappConfigs.add(config);
deployedXapps = new AllDeployedXapps();
for (String n : appNames) {
ConfigMetadata metadata = new ConfigMetadata().configName("config-" + n).name(n).namespace("namespace");
XAppConfig config = new XAppConfig().config(configJson).descriptor(descriptorJson).metadata(metadata);
allXappConfigs.add(config);
Xapp xapp = new Xapp().name(n).version("version").status(StatusEnum.UNKNOWN);
xapp.addInstancesItem(new XappInstance().name("abcd-1234").ip("127.0.0.1").port(200)
.status(XappInstance.StatusEnum.RUNNING));
Xapp xapp = new Xapp().name(n).version("version").status(StatusEnum.UNKNOWN);
xapp.addInstancesItem(new XappInstance().name("abcd-1234").ip("127.0.0.1").port(200)
.status(XappInstance.StatusEnum.RUNNING));
}).when(mockApi).deployXapp(any(XAppInfo.class));
doAnswer(inv -> {
if (delayMs > 0) {
}).when(mockApi).deployXapp(any(XAppInfo.class));
doAnswer(inv -> {
if (delayMs > 0) {
- logger.debug("listAllXapps sleeping {}", delayMs);
+ logger.debug("listAllDeployableXapps sleeping {}", delayMs);
- return availXapps;
- }).when(mockApi).listAllXapps();
+ return deployableApps;
+ }).when(mockApi).listAllDeployableXapps();
doAnswer(inv -> {
if (delayMs > 0) {
logger.debug("getAllXapps sleeping {}", delayMs);
doAnswer(inv -> {
if (delayMs > 0) {
logger.debug("getAllXapps sleeping {}", delayMs);