Class<?> clazz = Class.forName(ric.getConfig().getCustomAdapterClass());
if (A1Client.class.isAssignableFrom(clazz)) {
Constructor<?> constructor = clazz.getConstructor(RicConfig.class, AsyncRestClientFactory.class);
+ logger.debug("A1Client (" + clazz.getTypeName() + ") being created for ric: {}",
+ ric.getConfig().getRicId());
return (A1Client) constructor.newInstance(ric.getConfig(), this.restClientFactory);
} else if (A1Client.Factory.class.isAssignableFrom(clazz)) {
A1Client.Factory factory = (A1Client.Factory) clazz.getDeclaredConstructor().newInstance();
+ logger.debug("A1Client (" + clazz.getTypeName() + ") factory creating client for ric: {}",
+ ric.getConfig().getRicId());
return factory.create(ric.getConfig(), this.restClientFactory);
} else {
throw new ServiceException("The custom class must either implement A1Client.Factory or A1Client");
this.body = body;
}
- public AdapterRequest() {}
+ public AdapterRequest() {
+ }
}
@Getter
this.body = body;
}
- public AdapterOutput() {}
+ public AdapterOutput() {
+ }
}
static com.google.gson.Gson gson = new GsonBuilder() //
/**
* Constructor that creates the REST client to use.
*
- * @param protocolType the southbound protocol of the controller. Supported
- * protocols are CCSDK_A1_ADAPTER_STD_V1_1,
- * CCSDK_A1_ADAPTER_OSC_V1 and
- * CCSDK_A1_ADAPTER_STD_V2_0_0 with
- * @param ricConfig the configuration of the Near-RT RIC to communicate
- * with
+ * @param protocolType the southbound protocol of the controller. Supported
+ * protocols are CCSDK_A1_ADAPTER_STD_V1_1,
+ * CCSDK_A1_ADAPTER_OSC_V1 and
+ * CCSDK_A1_ADAPTER_STD_V2_0_0 with
+ * @param ricConfig the configuration of the Near-RT RIC to communicate
+ * with
* @param controllerConfig the configuration of the CCSDK A1 Adapter to use
*
* @throws IllegalArgumentException when the protocolType is wrong.
/**
* Constructor where the REST client to use is provided.
*
- * @param protocolType the southbound protocol of the controller. Supported
- * protocols are CCSDK_A1_ADAPTER_STD_V1_1,
- * CCSDK_A1_ADAPTER_OSC_V1 and
- * CCSDK_A1_ADAPTER_STD_V2_0_0 with
- * @param ricConfig the configuration of the Near-RT RIC to communicate
- * with
+ * @param protocolType the southbound protocol of the controller. Supported
+ * protocols are CCSDK_A1_ADAPTER_STD_V1_1,
+ * CCSDK_A1_ADAPTER_OSC_V1 and
+ * CCSDK_A1_ADAPTER_STD_V2_0_0 with
+ * @param ricConfig the configuration of the Near-RT RIC to communicate
+ * with
* @param controllerConfig the configuration of the CCSDK A1 Adapter to use
- * @param restClient the REST client to use
+ * @param restClient the REST client to use
*
* @throws IllegalArgumentException when the protocolType is illegal.
*/
this.restClient = restClient;
this.ricConfig = ricConfig;
this.protocolType = protocolType;
- logger.debug("CcsdkA1AdapterClient for ric: {}, a1Controller: {}", ricConfig.getRicId(),
- ricConfig.getControllerConfig());
+ logger.debug("A1Client (" + getClass().getTypeName() + ") created for ric: {}, a1Controller: {}",
+ ricConfig.getRicId(), ricConfig.getControllerConfig());
+
} else {
logger.error("Not supported protocoltype: {}", protocolType);
throw new IllegalArgumentException("Not handeled protocolversion: " + protocolType);
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
+
/**
* Client for accessing OSC A1 REST API
*/
@Override
public String createPutPolicyUri(String type, String policyId, String notificationDestinationUri) {
- return createPolicyUri(type, policyId, notificationDestinationUri);
+ return createPolicyUri(type, policyId, notificationDestinationUri);
}
/**
@Override
public String createDeleteUri(String type, String policyId) {
- return createPolicyUri(type, policyId, null);
+ return createPolicyUri(type, policyId, null);
}
/**
*/
@Override
public String createGetPolicyStatusUri(String type, String policyId) {
- return createPolicyUri(type, policyId, null) + "/status";
+ return createPolicyUri(type, policyId, null) + "/status";
}
/**
String url = baseUrl + "/policies/" + id;
if (notificationDestination != null) {
url += "?notificationDestination=" +
- URLEncoder.encode(notificationDestination, StandardCharsets.UTF_8.toString());
+ URLEncoder.encode(notificationDestination, StandardCharsets.UTF_8.toString());
}
return new URI(url).toString();
} catch (Exception e) {
String exceptionString = e.getMessage();
logger.error("Unexpected error in policy URI creation for policy type: {}, exception: {}", type,
- exceptionString);
+ exceptionString);
return "";
}
}
public OscA1Client(RicConfig ricConfig, AsyncRestClient restClient) {
this.restClient = restClient;
- logger.debug("OscA1Client for ric: {}", ricConfig.getRicId());
-
uri = new UriBuilder(ricConfig);
+ logger.debug("A1Client (" + getClass().getTypeName() + ") created for ric: {}", ricConfig.getRicId());
}
public static Mono<String> extractCreateSchema(String policyTypeResponse, String policyTypeId) {
package org.onap.ccsdk.oran.a1policymanagementservice.clients;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import org.onap.ccsdk.oran.a1policymanagementservice.configuration.RicConfig;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Policy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
private final AsyncRestClient restClient;
private final UriBuilder uri;
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public StdA1ClientVersion1(RicConfig ricConfig, AsyncRestClientFactory restClientFactory) {
this(restClientFactory.createRestClientUseHttpProxy(""), ricConfig);
public StdA1ClientVersion1(AsyncRestClient restClient, RicConfig ricConfig) {
this.restClient = restClient;
this.uri = new UriBuilder(ricConfig);
+ logger.debug("A1Client (" + getClass().getTypeName() + ") created for ric: {}", ricConfig.getRicId());
}
@Override
import reactor.core.publisher.Mono;
/**
- * Client for accessing ORAN A1-P Vesion 2.0 REST API
+ * Client for accessing ORAN A1-P Version 2.0 REST API
*/
@SuppressWarnings("squid:S2629") // Invoke method(s) only conditionally
public class StdA1ClientVersion2 implements A1Client {
- static final int CONCURRENCY_RIC = 1; // How many paralell requests that is sent to one NearRT RIC
+ static final int CONCURRENCY_RIC = 1; // How many parallel requests that is sent to one NearRT RIC
public static class Factory implements A1Client.Factory {
@Override
}
/**
- * /A1-P/v2/policytypes/{policy_type_id}/policies
+ * /A1-P/v2/policytypes/{policy_type_id}/policies
*/
@Override
public String createGetPolicyIdsUri(String type) {
}
/**
- * /A1-P/v2/policytypes/{policy_type_id}/policies/{policy_instance_id}/status
+ * /A1-P/v2/policytypes/{policy_type_id}/policies/{policy_instance_id}/status
*/
@Override
public String createGetPolicyStatusUri(String type, String policyId) {
}
/**
- * /A1-P/v2/policytypes/{policy_type_id}
+ * /A1-P/v2/policytypes/{policy_type_id}
*/
@Override
public String createPolicyTypesUri() {
}
/**
- * /A1-P/v2/policytypes/{policy_type_id}/policies/{policy_instance_id}
+ * /A1-P/v2/policytypes/{policy_type_id}/policies/{policy_instance_id}
*/
private String createPolicyUri(String type, String id) {
return createPolicyTypeUri(type) + "/policies/" + id;
public StdA1ClientVersion2(RicConfig ricConfig, AsyncRestClient restClient) {
this.restClient = restClient;
- logger.debug("OscA1Client for ric: {}", ricConfig.getRicId());
-
uriBuiler = new OranV2UriBuilder(ricConfig);
+ logger.debug("A1Client (" + getClass().getTypeName() + ") created for ric: {}", ricConfig.getRicId());
}
public static Mono<String> extractPolicySchema(String policyTypeResponse, String policyTypeId) {
Code Review / ccsdk / oran.git / commitdiff