<groupId>org.onap.usecase-ui.server</groupId>
<artifactId>usecase-ui-server-parent</artifactId>
- <version>15.0.1-SNAPSHOT</version>
+ <version>15.0.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>usecase-ui-server-parent</name>
<description>parent project for usecase-ui server</description>
<parent>
<groupId>org.onap.usecase-ui.server</groupId>
<artifactId>usecase-ui-server-parent</artifactId>
- <version>15.0.1-SNAPSHOT</version>
+ <version>15.0.3-SNAPSHOT</version>
</parent>
<artifactId>usecase-ui-server</artifactId>
import java.io.IOException;
-import org.onap.usecaseui.server.service.intent.IntentAaiService;
+import org.onap.usecaseui.server.service.intent.IntentAaiClient;
import org.onap.usecaseui.server.service.lcm.domain.aai.AAIClient;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
}
@Bean
- AAISliceService aaiSliceService(Retrofit retrofit) {
- return retrofit.create(AAISliceService.class);
+ AAISliceClient aaiSliceClient(Retrofit retrofit) {
+ return retrofit.create(AAISliceClient.class);
}
@Bean
- IntentAaiService intentAaiService(Retrofit retrofit) {
- return retrofit.create(IntentAaiService.class);
+ IntentAaiClient intentAaiClient(Retrofit retrofit) {
+ return retrofit.create(IntentAaiClient.class);
}
}
import org.onap.usecaseui.server.service.csmf.SlicingService;
import org.onap.usecaseui.server.service.csmf.config.SlicingProperties;
import org.onap.usecaseui.server.service.lcm.ServiceLcmService;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceInstance;
import org.onap.usecaseui.server.service.slicingdomain.so.SOSliceService;
import org.onap.usecaseui.server.service.slicingdomain.so.bean.SOOperation;
private static final Gson gson = new Gson();
private final ServiceLcmService serviceLcmService;
- private final AAISliceService aaiSliceService;
+ private final AAISliceClient aaiSliceClient;
private final SOSliceService soSliceService;
private final SlicingProperties slicingProperties;
try {
// TODO
- Response<JSONObject> response = this.aaiSliceService
+ Response<JSONObject> response = this.aaiSliceClient
.listOrders(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G).execute();
if (response.isSuccessful()) {
log.info("querySlicingOrderList: listService reponse is:{}", response.body());
import retrofit2.http.Path;
import retrofit2.http.Query;
-public interface IntentAaiService {
+public interface IntentAaiClient {
@GET("/aai/v24/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/{resource-service-id}?depth=all")
Call<JSONObject> getInstanceNetworkInfo(@Path("resource-service-id") String resourceServiceId);
import org.onap.usecaseui.server.bean.nsmf.common.ServiceResult;
import org.onap.usecaseui.server.constant.IntentConstant;
import org.onap.usecaseui.server.service.csmf.SlicingService;
-import org.onap.usecaseui.server.service.intent.IntentAaiService;
+import org.onap.usecaseui.server.service.intent.IntentAaiClient;
import org.onap.usecaseui.server.service.intent.IntentInstanceService;
import org.onap.usecaseui.server.service.intent.IntentSoService;
import org.onap.usecaseui.server.service.intent.config.IntentProperties;
private static final int MIN_BANDWIDTH = 100;
private final SlicingService slicingService;
- private final IntentAaiService intentAaiService;
+ private final IntentAaiClient intentAaiClient;
private final IntentSoService intentSoService;
private final SessionFactory sessionFactory;
private final ResourceMgtService resourceMgtService;
private final IntentProperties intentProperties;
- public IntentInstanceServiceImpl(SlicingService slicingService, IntentAaiService intentAaiService, IntentSoService intentSoService, SessionFactory sessionFactory, ResourceMgtService resourceMgtService, IntentProperties intentProperties) {
+ public IntentInstanceServiceImpl(SlicingService slicingService, IntentAaiClient intentAaiClient, IntentSoService intentSoService, SessionFactory sessionFactory, ResourceMgtService resourceMgtService, IntentProperties intentProperties) {
this.slicingService = slicingService;
- this.intentAaiService = intentAaiService;
+ this.intentAaiClient = intentAaiClient;
this.intentSoService = intentSoService;
this.sessionFactory = sessionFactory;
this.resourceMgtService = resourceMgtService;
if (instance == null || instance.getResourceInstanceId() == null) {
return -1;
}
- Response<JSONObject> response = intentAaiService.getInstanceInfo(instance.getResourceInstanceId()).execute();
+ Response<JSONObject> response = intentAaiClient.getInstanceInfo(instance.getResourceInstanceId()).execute();
logger.debug(response.toString());
if (response.isSuccessful()) {
String status = response.body().getString("orchestration-status");
List<CCVPNInstance> instanceList = getInstanceByFinishedFlag("1");
for (CCVPNInstance instance : instanceList) {
String serviceInstanceId = instance.getResourceInstanceId();
- Response<JSONObject> response = intentAaiService.getInstanceNetworkInfo(serviceInstanceId).execute();
+ Response<JSONObject> response = intentAaiClient.getInstanceNetworkInfo(serviceInstanceId).execute();
if (!response.isSuccessful()) {
logger.error("get Intent-Instance Bandwidth error:" + response.toString());
continue;
continue;
}
- Response<JSONObject> networkPolicyInfoResponse = intentAaiService.getInstanceNetworkPolicyInfo(networkPolicyId).execute();
+ Response<JSONObject> networkPolicyInfoResponse = intentAaiClient.getInstanceNetworkPolicyInfo(networkPolicyId).execute();
if (!networkPolicyInfoResponse.isSuccessful()) {
logger.error("get Intent-Instance networkPolicyInfo error:" + networkPolicyInfoResponse.toString());
continue;
instancePerformance.setJobId(instance.getJobId());
instancePerformance.setDate(new Date());
- Response<JSONObject> metadatumResponse = intentAaiService.getInstanceBandwidth(serviceInstanceId).execute();
+ Response<JSONObject> metadatumResponse = intentAaiClient.getInstanceBandwidth(serviceInstanceId).execute();
if (!metadatumResponse.isSuccessful()) {
logger.error("get Intent-Instance metadatum error:" + metadatumResponse.toString());
continue;
Map<String, Object> result = new HashMap<>();
List<String> accessNodeList = new ArrayList<>();
List<String> cloudAccessNodeList = new ArrayList<>();
- Response<JSONObject> response = intentAaiService.queryNetworkRoute().execute();
+ Response<JSONObject> response = intentAaiClient.queryNetworkRoute().execute();
if (!response.isSuccessful()) {
logger.error(response.toString());
throw new RuntimeException("Query Access Node Info Error");
public void addCustomer() throws IOException {
String globalCustomerId = intentProperties.getGlobalCustomerId();
- Response<JSONObject> queryCustomerResponse = intentAaiService.queryCustomer(globalCustomerId).execute();
+ Response<JSONObject> queryCustomerResponse = intentAaiClient.queryCustomer(globalCustomerId).execute();
if (queryCustomerResponse.isSuccessful()) {
return;
}
params.put("subscriber-name", subscriberName);
params.put("subscriber-type", subscriberType);
okhttp3.RequestBody requestBody = okhttp3.RequestBody.create(okhttp3.MediaType.parse("application/json"), JSON.toJSONString(params));
- intentAaiService.addCustomer(globalCustomerId, requestBody).execute();
+ intentAaiClient.addCustomer(globalCustomerId, requestBody).execute();
}
@Override
public void addSubscription() throws IOException {
String globalCustomerId = intentProperties.getGlobalCustomerId();
String serviceType = intentProperties.getServiceType();
- Response<JSONObject> querySubscription = intentAaiService.querySubscription(globalCustomerId, serviceType).execute();
+ Response<JSONObject> querySubscription = intentAaiClient.querySubscription(globalCustomerId, serviceType).execute();
if (querySubscription.isSuccessful()) {
return;
}
Map<String, Object> params = new HashMap<>();
params.put("service-type", serviceType);
okhttp3.RequestBody requestBody = okhttp3.RequestBody.create(okhttp3.MediaType.parse("application/json"), JSON.toJSONString(params));
- intentAaiService.addSubscription(globalCustomerId, serviceType, requestBody).execute();
+ intentAaiClient.addSubscription(globalCustomerId, serviceType, requestBody).execute();
}
public Properties getProperties() throws IOException {
String serviceType = intentProperties.getServiceType();
String resourceVersion = null;
if (serviceInstanceId != null) {
- Response<JSONObject> queryServiceInstance = intentAaiService.queryServiceInstance(globalCustomerId, serviceType, serviceInstanceId).execute();
+ Response<JSONObject> queryServiceInstance = intentAaiClient.queryServiceInstance(globalCustomerId, serviceType, serviceInstanceId).execute();
if (queryServiceInstance.isSuccessful()) {
JSONObject body = queryServiceInstance.body();
resourceVersion = body.getString("resource-version");
params.put("resource-version",resourceVersion);
}
okhttp3.RequestBody requestBody = okhttp3.RequestBody.create(okhttp3.MediaType.parse("application/json"), JSON.toJSONString(params));
- intentAaiService.saveServiceInstance(globalCustomerId,serviceType,serviceInstanceId,requestBody).execute();
+ intentAaiClient.saveServiceInstance(globalCustomerId,serviceType,serviceInstanceId,requestBody).execute();
}
public void deleteIntentInstanceToAAI(String serviceInstanceId) throws IOException {
if (serviceInstanceId == null) {
return;
}
- Response<JSONObject> queryServiceInstance = intentAaiService.queryServiceInstance(globalCustomerId, serviceType, serviceInstanceId).execute();
+ Response<JSONObject> queryServiceInstance = intentAaiClient.queryServiceInstance(globalCustomerId, serviceType, serviceInstanceId).execute();
if (queryServiceInstance.isSuccessful()) {
JSONObject body = queryServiceInstance.body();
String resourceVersion = body.getString("resource-version");
- intentAaiService.deleteServiceInstance(globalCustomerId,serviceType,serviceInstanceId,resourceVersion).execute();
+ intentAaiClient.deleteServiceInstance(globalCustomerId,serviceType,serviceInstanceId,resourceVersion).execute();
}
}
params.put("resource-sharing-level", slicingOrderInfo.getResourceSharingLevel());
params.put("data-owner", IntentConstant.INTENT_INSTANCE_DATA_OWNER);
okhttp3.RequestBody requestBody = okhttp3.RequestBody.create(okhttp3.MediaType.parse("application/json"), JSON.toJSONString(params));
- intentAaiService.saveServiceInstance(globalCustomerId,serviceType,serviceId,requestBody).execute();
+ intentAaiClient.saveServiceInstance(globalCustomerId,serviceType,serviceId,requestBody).execute();
}
@Override
import java.util.Arrays;
import java.util.List;
import org.onap.usecaseui.server.constant.nsmf.NsmfParamConstant;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceAndInstance;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.Relationship;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.RelationshipData;
private static final Logger logger = LoggerFactory.getLogger(GeneralConvertImpl.class);
- private final AAISliceService aaiSliceService;
+ private final AAISliceClient aaiSliceClient;
public AAIServiceAndInstance queryServiceUtil(JSONObject object) {
if (object.containsKey("relationship-list")) {
AAIServiceAndInstance aaiServiceAndInstance = new AAIServiceAndInstance();
try {
// TODO
- Response<JSONObject> response = this.aaiSliceService
+ Response<JSONObject> response = this.aaiSliceClient
.queryOrderByService(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, serviceId)
.execute();
if (response.isSuccessful()) {
logger.info("getUseInterval: queryOrderByService response is:{}", response.body());
aaiServiceAndInstance = queryServiceUtil(object);
String orderId = getOrderIdFromRelation(aaiServiceAndInstance);
- Response<JSONObject> orderResponse = this.aaiSliceService
+ Response<JSONObject> orderResponse = this.aaiSliceClient
.queryOrderByOrderId(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, orderId)
.execute();
if (orderResponse.isSuccessful()) {
import org.onap.usecaseui.server.bean.nsmf.task.BusinessDemandInfo;
import org.onap.usecaseui.server.bean.nsmf.task.NstInfo;
import org.onap.usecaseui.server.constant.nsmf.NsmfParamConstant;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIService;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceAndInstance;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceNST;
@Resource(name = "GeneralConvertService")
private GeneralConvertImpl generalConvert;
- private final AAISliceService aaiSliceService;
+ private final AAISliceClient aaiSliceClient;
void convertSlicingBusinessList(SlicingBusinessList slicingBusinessList, AAIServiceRsp aAIServiceRsp, int pageNo,
int pageSize)
void getNsiInfoByBusiness(NsiInfo nsiInfo, String nsiId) {
try {
AAIServiceAndInstance aaiServiceAndInstance = new AAIServiceAndInstance();
- Response<JSONObject> response = this.aaiSliceService
+ Response<JSONObject> response = this.aaiSliceClient
.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nsiId)
.execute();
if (response.isSuccessful()) {
String modelInvariantId;
String modelVersionId;
try {
- Response<JSONObject> response = this.aaiSliceService.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G,
+ Response<JSONObject> response = this.aaiSliceClient.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G,
NsmfParamConstant.SERVICE_TYPE_5G, nsiId).execute();
if (response.isSuccessful()) {
JSONObject object = response.body();
}
try {
- Response<AAIServiceNST> nstResponse = this.aaiSliceService.queryServiceNST(modelInvariantId, modelVersionId)
+ Response<AAIServiceNST> nstResponse = this.aaiSliceClient.queryServiceNST(modelInvariantId, modelVersionId)
.execute();
if (nstResponse.isSuccessful()) {
AAIServiceNST aaiServiceNST = nstResponse.body();
throws IOException {
List<AAIServiceAndInstance> aaiServiceAndInstanceList = new ArrayList<>();
try {
- Response<JSONObject> response = this.aaiSliceService.queryAllottedResources(NsmfParamConstant.CUSTOM_5G,
+ Response<JSONObject> response = this.aaiSliceClient.queryAllottedResources(NsmfParamConstant.CUSTOM_5G,
NsmfParamConstant.SERVICE_TYPE_5G, businessId).execute();
if (response.isSuccessful()) {
logger.info("getNsiIdByBusiness: queryAllottedResources response is: {}", response.body());
AAIServiceProfiles aaiServiceProfiles = new AAIServiceProfiles();
try {
- Response<JSONObject> response = this.aaiSliceService.getServiceProfiles(NsmfParamConstant.CUSTOM_5G,
+ Response<JSONObject> response = this.aaiSliceClient.getServiceProfiles(NsmfParamConstant.CUSTOM_5G,
NsmfParamConstant.SERVICE_TYPE_5G, businessId).execute();
if (response.isSuccessful()) {
i++;
try {
AAIServiceAndInstance aaiServiceAndInstance = new AAIServiceAndInstance();
- Response<JSONObject> response = this.aaiSliceService
+ Response<JSONObject> response = this.aaiSliceClient
.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nssiId)
.execute();
if (response.isSuccessful()) {
try {
// 添加给slicingTaskCreationProgress赋值的代码
AAIServiceAndInstance aaiServiceAndInstance = new AAIServiceAndInstance();
- Response<JSONObject> response = this.aaiSliceService
+ Response<JSONObject> response = this.aaiSliceClient
.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, businessId)
.execute();
if (response.isSuccessful()) {
List<HostedNsiInfo> hostedNsiInfoList = new ArrayList<>();
for (String nsiId : nsiIdList) {
try {
- Response<JSONObject> response = this.aaiSliceService.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G,
+ Response<JSONObject> response = this.aaiSliceClient.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G,
NsmfParamConstant.SERVICE_TYPE_5G, nsiId).execute();
if (response.isSuccessful()) {
JSONObject object = response.body();
import org.onap.usecaseui.server.constant.nsmf.NsmfParamConstant;
import org.onap.usecaseui.server.service.lcm.ServiceLcmService;
import org.onap.usecaseui.server.service.nsmf.ResourceMgtService;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceAndInstance;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceInstance;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceRsp;
import org.onap.usecaseui.server.service.slicingdomain.so.bean.ActivateService;
import org.onap.usecaseui.server.service.slicingdomain.so.bean.SOOperation;
import org.onap.usecaseui.server.util.DateUtils;
-import org.onap.usecaseui.server.util.RestfulServices;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.stereotype.Service;
import retrofit2.Response;
private static final Logger logger = LoggerFactory.getLogger(ResourceMgtServiceImpl.class);
private static final Gson gson = new Gson();
- private final AAISliceService aaiSliceService;
+ private final AAISliceClient aaiSliceClient;
private final SOSliceService soSliceService;
@Resource(name = "ServiceLcmService")
String resultMsg;
try {
- Response<JSONObject> response = this.aaiSliceService
+ Response<JSONObject> response = this.aaiSliceClient
.listService(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G).execute();
if (response.isSuccessful()) {
logger.info("querySlicingBusiness: listService reponse is:{}", response.body());
}
public void addBusinessProgress(SlicingBusinessList slicingBusinessList) {
- System.out.println(aaiSliceService);
+ System.out.println(aaiSliceClient);
System.out.println(serviceLcmService);
System.out.println(generalConvert);
if (slicingBusinessList.getSlicingBusinessInfoList() == null
String resultMsg;
AAIServiceRsp aAIServiceRsp = new AAIServiceRsp();
try {
- Response<JSONObject> response = this.aaiSliceService.listServiceByStatus(
+ Response<JSONObject> response = this.aaiSliceClient.listServiceByStatus(
NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, processingStatus).execute();
if (response.isSuccessful()) {
logger.info("querySlicingBusinessByStatus: listServiceByStatus reponse is:{}", response.body());
String resultMsg;
try {
- Response<JSONObject> response = this.aaiSliceService
+ Response<JSONObject> response = this.aaiSliceClient
.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, businessId)
.execute();
if (response.isSuccessful()) {
resultMsg = "5G slicing business details query failed!";
resultHeader.setResult_code(NsmfCodeConstant.ERROR_CODE_UNKNOWN);
}
- Response<NetworkInfo> networkInfoResponse = this.aaiSliceService
+ Response<NetworkInfo> networkInfoResponse = this.aaiSliceClient
.getServiceNetworkInstance(businessId).execute();
if (networkInfoResponse.isSuccessful()) {
NetworkInfo networkInfo = networkInfoResponse.body();
.filter(e -> e.getRelationshipKey()
.equals("service-instance.service-instance-id")).collect(Collectors.toList());
String networkRouteCnId = serviceInstanceInfo.get(0).getRelationshipValue();
- Response<NetworkInfo> networkInfoResponse1 = this.aaiSliceService
+ Response<NetworkInfo> networkInfoResponse1 = this.aaiSliceClient
.getServiceNetworkInstance(networkRouteCnId).execute();
if (networkInfoResponse1.isSuccessful()) {
NetworkInfo networkInfo1 = networkInfoResponse1.body();
List<RelationshipData> networkInfoRelationshipDataList = networkRouteCn.get(0)
.getRelationshipDataList();
String networkRouteId = networkInfoRelationshipDataList.get(0).getRelationshipValue();
- Response<EndPointInfoList> networkInfoEndPointInfoList = this.aaiSliceService
+ Response<EndPointInfoList> networkInfoEndPointInfoList = this.aaiSliceClient
.getEndpointByLinkName(networkRouteId).execute();
if (networkInfoEndPointInfoList.isSuccessful()) {
EndPointInfoList endPointInfoList = networkInfoEndPointInfoList.body();
.filter(e -> e.getRelationshipKey()
.equals("service-instance.service-instance-id")).collect(Collectors.toList());
- Response<SliceProfileList> executeTn = this.aaiSliceService
+ Response<SliceProfileList> executeTn = this.aaiSliceClient
.getSliceProfiles(tnServiceInstanceInfo.get(0).getRelationshipValue()).execute();
if (executeTn.isSuccessful()) {
SliceProfileList body = executeTn.body();
String resultMsg;
try {
- Response<JSONObject> response = this.aaiSliceService
+ Response<JSONObject> response = this.aaiSliceClient
.listServiceNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G).execute();
if (response.isSuccessful()) {
logger.info("queryNsiInstances: listServiceNSI reponse is:{}", response.body());
String resultMsg;
try {
- Response<JSONObject> response = this.aaiSliceService.listServiceNSIByStatus(
+ Response<JSONObject> response = this.aaiSliceClient.listServiceNSIByStatus(
NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, instanceStatus).execute();
if (response.isSuccessful()) {
logger.info("queryNsiInstancesByStatus: listServiceNSIByStatus reponse is:{}", response.body());
String resultMsg;
try {
- Response<JSONObject> response = this.aaiSliceService.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G,
+ Response<JSONObject> response = this.aaiSliceClient.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G,
NsmfParamConstant.SERVICE_TYPE_5G, serviceInstanceId).execute();
if (response.isSuccessful()) {
JSONObject object = response.body();
NsiRelatedNssiInfo nsiRelatedNssiInfo = new NsiRelatedNssiInfo();
String resultMsg;
try {
- Response<JSONObject> response = this.aaiSliceService
+ Response<JSONObject> response = this.aaiSliceClient
.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nsiId)
.execute();
if (response.isSuccessful()) {
String resultMsg;
AAIServiceRsp aAIServiceRsp = new AAIServiceRsp();
try {
- Response<JSONObject> response = this.aaiSliceService
+ Response<JSONObject> response = this.aaiSliceClient
.listServiceNSSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G).execute();
if (response.isSuccessful()) {
logger.info("queryNssiInstances: listServiceNSSI reponse is:{}", response.body());
String resultMsg;
AAIServiceRsp aAIServiceRsp = new AAIServiceRsp();
try {
- Response<JSONObject> response = this.aaiSliceService.listServiceNSSIByStatus(
+ Response<JSONObject> response = this.aaiSliceClient.listServiceNSSIByStatus(
NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, instanceStatus).execute();
if (response.isSuccessful()) {
logger.info("queryNssiInstancesByStatus: listServiceNSSIByStatus reponse is:{}", response.body());
String resultMsg;
AAIServiceRsp aAIServiceRsp = new AAIServiceRsp();
try {
- Response<JSONObject> response = this.aaiSliceService.listServiceNSSIByEnv(NsmfParamConstant.CUSTOM_5G,
+ Response<JSONObject> response = this.aaiSliceClient.listServiceNSSIByEnv(NsmfParamConstant.CUSTOM_5G,
NsmfParamConstant.SERVICE_TYPE_5G, environmentContext).execute();
if (response.isSuccessful()) {
logger.info("queryNssiInstancesByEnvironment: listServiceNSSIByEnv reponse is:{}", response.body());
String resultMsg;
try {
- Response<JSONObject> response = this.aaiSliceService
+ Response<JSONObject> response = this.aaiSliceClient
.queryNSIByNSSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nssiId).execute();
if (response.isSuccessful()) {
logger.info("queryNssiDetails: queryNSIByNSSI reponse is:{}", response.body());
import org.onap.usecaseui.server.bean.nsmf.task.SlicingTaskCreationProgress;
import org.onap.usecaseui.server.bean.nsmf.task.SlicingTaskInfo;
import org.onap.usecaseui.server.bean.nsmf.task.SlicingTaskList;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.ConnectionLink;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.ConnectionLinkList;
import org.onap.usecaseui.server.service.slicingdomain.so.bean.AnSliceTaskInfo;
@Resource(name = "GeneralConvertService")
private GeneralConvertImpl generalConvert;
- private final AAISliceService aaiSliceService;
+ private final AAISliceClient aaiSliceClient;
void convertSlicingTaskList(SlicingTaskList targetSlicingTaskList, SOTaskRsp sourceSoTaskRsp, int pageNo,
int pageSize)
ConnectionLinkList connectionLinkList = new ConnectionLinkList();
EndPointInfo endPointInfo = new EndPointInfo();
try {
- Response<ConnectionLinkList> response = this.aaiSliceService.getConnectionLinks().execute();
+ Response<ConnectionLinkList> response = this.aaiSliceClient.getConnectionLinks().execute();
if(response.isSuccessful()){
connectionLinkList = response.body();
logger.info(connectionLinkList.toString());
import org.onap.usecaseui.server.bean.nsmf.task.SlicingTaskList;
import org.onap.usecaseui.server.constant.nsmf.NsmfCodeConstant;
import org.onap.usecaseui.server.service.nsmf.TaskMgtService;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.ConnectionLink;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.ConnectionLinkList;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.EndPointInfoList;
private static final Logger logger = LoggerFactory.getLogger(TaskMgtServiceImpl.class);
private final SOSliceService soSliceService;
- private final AAISliceService aaiSliceService;
+ private final AAISliceClient aaiSliceClient;
@Resource(name = "TaskMgtConvertService")
protected TaskMgtServiceConvert taskMgtServiceConvert;
ConnectionListVo connectionListVo = new ConnectionListVo();
List<ConnectionListVo> list = new ArrayList<>();
try {
- Response<ConnectionLinkList> response = this.aaiSliceService.getConnectionLinks().execute();
+ Response<ConnectionLinkList> response = this.aaiSliceClient.getConnectionLinks().execute();
if(response.isSuccessful()){
connectionLinkList = response.body();
logger.info(connectionLinkList.toString());
List<ConnectionLink> tsciConnectionLink = connectionLinks.stream().filter(e -> e.getLinkType().equals("TsciConnectionLink") && e.getRelationshipList()!=null).collect(Collectors.toList());
if(!ObjectUtils.isEmpty(tsciConnectionLink)){
for (ConnectionLink connectionLink : tsciConnectionLink) {
- Response<EndPointInfoList> anInfo = this.aaiSliceService.getEndpointByLinkName(connectionLink.getLinkName()).execute();
- Response<EndPointInfoList> cnInfo = this.aaiSliceService.getEndpointByLinkName2(connectionLink.getLinkName2()).execute();
+ Response<EndPointInfoList> anInfo = this.aaiSliceClient.getEndpointByLinkName(connectionLink.getLinkName()).execute();
+ Response<EndPointInfoList> cnInfo = this.aaiSliceClient.getEndpointByLinkName2(connectionLink.getLinkName2()).execute();
PropertiesVo propertiesVo = new PropertiesVo();
List<RelationshipData> relationshipDataList = connectionLink.getRelationshipList().getRelationship().get(0).getRelationshipDataList();
List<RelationshipData> allottedResourceId = relationshipDataList.stream().filter(e -> e.getRelationshipKey().equals("allotted-resource.id")).collect(Collectors.toList());
List<RelationshipData> serviceInstanceId = relationshipDataList.stream().filter(e -> e.getRelationshipKey().equals("service-instance.service-instance-id")).collect(Collectors.toList());
- Response<ConnectionLink> AllottedResource=this.aaiSliceService.getAllottedResource(serviceInstanceId.get(0).getRelationshipValue(),allottedResourceId.get(0).getRelationshipValue()).execute();
+ Response<ConnectionLink> AllottedResource=this.aaiSliceClient.getAllottedResource(serviceInstanceId.get(0).getRelationshipValue(),allottedResourceId.get(0).getRelationshipValue()).execute();
List<Relationship> relationships= AllottedResource.body().getRelationshipList().getRelationship().stream().filter(a-> a.getRelatedTo().equals("network-policy")).collect(Collectors.toList());
List<RelationshipData> networkPolicyId=relationships.get(0).getRelationshipDataList().stream().filter(e -> e.getRelationshipKey().equals("network-policy.network-policy-id")).collect(Collectors.toList());
- Response<NetworkPolicy> networkPolicy=this.aaiSliceService.getNetworkPolicy(networkPolicyId.get(0).getRelationshipValue()).execute();
+ Response<NetworkPolicy> networkPolicy=this.aaiSliceClient.getNetworkPolicy(networkPolicyId.get(0).getRelationshipValue()).execute();
propertiesVo.setJitter(networkPolicy.body().getJitter());
propertiesVo.setLatency(networkPolicy.body().getLatency());
propertiesVo.setMaxBandwidth(networkPolicy.body().getMaxBandwidth());
- Response<ConnectionLink> serviceInstance=this.aaiSliceService.getServiceInstance(serviceInstanceId.get(0).getRelationshipValue()).execute();
+ Response<ConnectionLink> serviceInstance=this.aaiSliceClient.getServiceInstance(serviceInstanceId.get(0).getRelationshipValue()).execute();
propertiesVo.setResourceSharingLevel(serviceInstance.body().getServiceFunction());
connectionListVo.setLinkId(connectionLink.getLinkId());
*/
package org.onap.usecaseui.server.service.slicingdomain.aai;
-import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceInstance;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.NetworkInfo;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceNST;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.SliceProfileList;
import retrofit2.Call;
import retrofit2.http.GET;
-import retrofit2.http.Headers;
import retrofit2.http.Path;
import retrofit2.http.Query;
-public interface AAISliceService {
+public interface AAISliceClient {
@GET("/api/aai-business/v13/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances?service-role=service-profile")
Call<JSONObject> listService(@Path("global-customer-id") String globalCustomerId,@Path("service-type") String serviceType);
import org.onap.usecaseui.server.service.lcm.ServiceLcmService;
import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAICustomer;
import org.onap.usecaseui.server.service.lcm.impl.DefaultServiceLcmService;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.onap.usecaseui.server.service.slicingdomain.so.SOSliceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
public class SlicingServiceImplIntegrationTest {
@MockBean ServiceLcmService serviceLcmService;
- @Autowired AAISliceService aaiSliceService;
+ @Autowired AAISliceClient aaiSliceClient;
@Autowired SOSliceService soSliceService;
@Autowired SlicingProperties slicingProperties;
@BeforeEach
void setup() {
- slicingService = new SlicingServiceImpl(serviceLcmService,aaiSliceService,soSliceService, slicingProperties);
+ slicingService = new SlicingServiceImpl(serviceLcmService,aaiSliceClient,soSliceService, slicingProperties);
}
@Test
import org.onap.usecaseui.server.service.csmf.config.SlicingProperties;
import org.onap.usecaseui.server.service.lcm.ServiceLcmService;
import org.onap.usecaseui.server.service.lcm.impl.DefaultServiceLcmService;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.onap.usecaseui.server.service.slicingdomain.so.SOSliceService;
import org.onap.usecaseui.server.service.slicingdomain.so.bean.SOOperation;
import org.powermock.api.support.membermodification.MemberModifier;
SlicingServiceImpl slicingService = null;
SOSliceService soSliceService;
- AAISliceService aaiSliceService;
+ AAISliceClient aaiSliceClient;
ServiceLcmService serviceLcmService;
SlicingProperties slicingProperties;
@Before
public void before() throws Exception {
- aaiSliceService = mock(AAISliceService.class);
+ aaiSliceClient = mock(AAISliceClient.class);
soSliceService = mock(SOSliceService.class);
serviceLcmService = mock(DefaultServiceLcmService.class);
slicingProperties = mock(SlicingProperties.class);
- slicingService = new SlicingServiceImpl(serviceLcmService, aaiSliceService, soSliceService, slicingProperties);
+ slicingService = new SlicingServiceImpl(serviceLcmService, aaiSliceClient, soSliceService, slicingProperties);
MemberModifier.field(SlicingServiceImpl.class, "serviceLcmService").set(slicingService , serviceLcmService);
}
@Test
public void itCanQuerySlicingOrderList() {
JSONObject object = new JSONObject();
- when(aaiSliceService
+ when(aaiSliceClient
.listOrders(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G))
.thenReturn(successfulCall(object));
slicingService.querySlicingOrderList("processing", "1", "100");
@Test
public void querySlicingOrderListWithThrowsException() {
- when(aaiSliceService
+ when(aaiSliceClient
.listOrders(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G))
.thenReturn(failedCall("aai is not exist!"));
slicingService.querySlicingOrderList("processing", "1", "100");
@Test
public void emptyResponseWhenQuerySlicingOrderList() {
Call<JSONObject> call = emptyBodyCall();
- when(aaiSliceService
+ when(aaiSliceClient
.listOrders(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G)).thenReturn(call);
slicingService.querySlicingOrderList("processing", "1", "100");
}
import org.onap.usecaseui.server.bean.nsmf.common.ServiceResult;
import org.onap.usecaseui.server.constant.IntentConstant;
import org.onap.usecaseui.server.service.csmf.SlicingService;
-import org.onap.usecaseui.server.service.intent.IntentAaiService;
+import org.onap.usecaseui.server.service.intent.IntentAaiClient;
import org.onap.usecaseui.server.service.intent.IntentSoService;
import org.onap.usecaseui.server.service.intent.config.IntentProperties;
import org.onap.usecaseui.server.service.lcm.domain.so.bean.OperationProgress;
private IntentInstanceServiceImpl intentInstanceService;
@Mock
- private IntentAaiService intentAaiService;
+ private IntentAaiClient intentAaiClient;
@Mock
private IntentSoService intentSoService;
MemberModifier.field(IntentInstanceServiceImpl.class, "sessionFactory").set(intentInstanceService , sessionFactory);
MemberModifier.field(IntentInstanceServiceImpl.class, "resourceMgtService").set(intentInstanceService , resourceMgtService);
MemberModifier.field(IntentInstanceServiceImpl.class, "slicingService").set(intentInstanceService , slicingService);
- MemberModifier.field(IntentInstanceServiceImpl.class, "intentAaiService").set(intentInstanceService , intentAaiService);
+ MemberModifier.field(IntentInstanceServiceImpl.class, "intentAaiClient").set(intentInstanceService , intentAaiClient);
MemberModifier.field(IntentInstanceServiceImpl.class, "intentSoService").set(intentInstanceService , intentSoService);
when(sessionFactory.openSession()).thenReturn(session);
jsonObject.put("orchestration-status", "created");
Call mockCall = PowerMockito.mock(Call.class);
Response<JSONObject> response = Response.success(jsonObject);
- Mockito.when(intentAaiService.getInstanceInfo(anyString())).thenReturn(mockCall);
+ Mockito.when(intentAaiClient.getInstanceInfo(anyString())).thenReturn(mockCall);
Mockito.when(mockCall.execute()).thenReturn(response);
IntentInstanceServiceImpl spy = PowerMockito.spy(intentInstanceService);
" }\n" +
"}");
Response<JSONObject> response = Response.success(jsonObject);
- Mockito.when(intentAaiService.getInstanceNetworkInfo(any())).thenReturn(mockCall);
+ Mockito.when(intentAaiClient.getInstanceNetworkInfo(any())).thenReturn(mockCall);
Mockito.when(mockCall.execute()).thenReturn(response);
Call mockCall1 = PowerMockito.mock(Call.class);
" }\n" +
"}");
Response<JSONObject> response1 = Response.success(jsonObject1);
- Mockito.when(intentAaiService.getInstanceNetworkPolicyInfo(any())).thenReturn(mockCall1);
+ Mockito.when(intentAaiClient.getInstanceNetworkPolicyInfo(any())).thenReturn(mockCall1);
Mockito.when(mockCall1.execute()).thenReturn(response1);
Call mockCall2 = PowerMockito.mock(Call.class);
" ]\n" +
"}");
Response<JSONObject> response2 = Response.success(jsonObject2);
- Mockito.when(intentAaiService.getInstanceBandwidth(any())).thenReturn(mockCall2);
+ Mockito.when(intentAaiClient.getInstanceBandwidth(any())).thenReturn(mockCall2);
Mockito.when(mockCall2.execute()).thenReturn(response2);
Transaction tx = Mockito.mock(Transaction.class);
" ]\n" +
"}");
Response<JSONObject> response = Response.success(body);
- Mockito.when(intentAaiService.queryNetworkRoute()).thenReturn(mockCall);
+ Mockito.when(intentAaiClient.queryNetworkRoute()).thenReturn(mockCall);
Mockito.when(mockCall.execute()).thenReturn(response);
Map<String, Object> result = (Map<String, Object>) intentInstanceService.queryAccessNodeInfo();
assertEquals(((List)result.get("accessNodeList")).size(), 3);
}
});
- when(intentAaiService.queryCustomer(anyString())).thenReturn(mockCall);
- when(intentAaiService.addCustomer(anyString(), any())).thenReturn(mockCall);
+ when(intentAaiClient.queryCustomer(anyString())).thenReturn(mockCall);
+ when(intentAaiClient.addCustomer(anyString(), any())).thenReturn(mockCall);
when(mockCall.execute()).thenReturn(response);
Properties properties = new Properties();
// doReturn(properties).when(spy).getProperties();
spy.addCustomer();
- Mockito.verify(intentAaiService,Mockito.times(1)).addCustomer(anyString(),any());
+ Mockito.verify(intentAaiClient,Mockito.times(1)).addCustomer(anyString(),any());
}
}
});
when(intentProperties.getServiceType()).thenReturn("someServiceType");
- when(intentAaiService.querySubscription(anyString(),anyString())).thenReturn(mockCall);
+ when(intentAaiClient.querySubscription(anyString(),anyString())).thenReturn(mockCall);
when(mockCall.execute()).thenReturn(response);
IntentInstanceServiceImpl spy = spy(intentInstanceService);
Call mockCall2 = PowerMockito.mock(Call.class);
- when(intentAaiService.addSubscription(anyString(),anyString(),any())).thenReturn(mockCall2);
+ when(intentAaiClient.addSubscription(anyString(),anyString(),any())).thenReturn(mockCall2);
spy.addSubscription();
- Mockito.verify(intentAaiService,Mockito.times(1)).addSubscription(anyString(),anyString(),any());
+ Mockito.verify(intentAaiClient,Mockito.times(1)).addSubscription(anyString(),anyString(),any());
}
@Test
body.put("resource-version",123);
Call mockCall = PowerMockito.mock(Call.class);
Response<JSONObject> response = Response.success(body);
- when(intentAaiService.queryServiceInstance(anyString(),anyString(),anyString())).thenReturn(mockCall);
+ when(intentAaiClient.queryServiceInstance(anyString(),anyString(),anyString())).thenReturn(mockCall);
when(mockCall.execute()).thenReturn(response);
CCVPNInstance instance = new CCVPNInstance();
Call mockCall2 = PowerMockito.mock(Call.class);
Response<JSONObject> response2 = Response.success(body);
- when(intentAaiService.saveServiceInstance(anyString(),anyString(),anyString(),any())).thenReturn(mockCall2);
+ when(intentAaiClient.saveServiceInstance(anyString(),anyString(),anyString(),any())).thenReturn(mockCall2);
when(mockCall2.execute()).thenReturn(response2);
spy.saveIntentInstanceToAAI("CCVPN-id",instance);
- Mockito.verify(intentAaiService, Mockito.times(1)).saveServiceInstance(anyString(),anyString(),anyString(),any());
+ Mockito.verify(intentAaiClient, Mockito.times(1)).saveServiceInstance(anyString(),anyString(),anyString(),any());
}
@Test
body.put("resource-version",123);
Call mockCall = PowerMockito.mock(Call.class);
Response<JSONObject> response = Response.success(body);
- when(intentAaiService.queryServiceInstance(anyString(),anyString(),anyString())).thenReturn(mockCall);
+ when(intentAaiClient.queryServiceInstance(anyString(),anyString(),anyString())).thenReturn(mockCall);
when(mockCall.execute()).thenReturn(response);
Call mockCall2 = PowerMockito.mock(Call.class);
Response<JSONObject> response2 = Response.success(body);
- when(intentAaiService.deleteServiceInstance(anyString(),anyString(),anyString(),anyString())).thenReturn(mockCall2);
+ when(intentAaiClient.deleteServiceInstance(anyString(),anyString(),anyString(),anyString())).thenReturn(mockCall2);
when(mockCall2.execute()).thenReturn(response2);
spy.deleteIntentInstanceToAAI("CCVPN-id");
- Mockito.verify(intentAaiService, Mockito.times(1)).deleteServiceInstance(anyString(),anyString(),anyString(),any());
+ Mockito.verify(intentAaiClient, Mockito.times(1)).deleteServiceInstance(anyString(),anyString(),anyString(),any());
}
@Test
import org.onap.usecaseui.server.service.csmf.SlicingService;
import org.onap.usecaseui.server.service.csmf.config.SlicingProperties;
import org.onap.usecaseui.server.service.csmf.impl.SlicingServiceImpl;
-import org.onap.usecaseui.server.service.intent.IntentAaiService;
+import org.onap.usecaseui.server.service.intent.IntentAaiClient;
import org.onap.usecaseui.server.service.intent.IntentSoService;
import org.onap.usecaseui.server.service.intent.config.IntentProperties;
import org.onap.usecaseui.server.service.lcm.impl.DefaultServiceLcmService;
SlicingService slicingService;
@Autowired
- IntentAaiService intentAaiService;
+ IntentAaiClient intentAaiClient;
@Autowired
IntentSoService intentSoService;
Transaction transaction = mock(Transaction.class);
when(sessionFactory.openSession()).thenReturn(session);
when(session.beginTransaction()).thenReturn(transaction);
- this.intentService = new IntentInstanceServiceImpl(slicingService, intentAaiService, intentSoService, sessionFactory, resourceMgtServiceImpl, intentProperties);
+ this.intentService = new IntentInstanceServiceImpl(slicingService, intentAaiClient, intentSoService, sessionFactory, resourceMgtServiceImpl, intentProperties);
}
IntentInstanceServiceImpl intentService;
import org.junit.Before;
import org.junit.Test;
import org.onap.usecaseui.server.constant.nsmf.NsmfParamConstant;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceAndInstance;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.Relationship;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.RelationshipData;
public class GeneralConvertImplTest {
GeneralConvertImpl generalConvert = null;
- AAISliceService aaiSliceService = null;
+ AAISliceClient aaiSliceClient = null;
@Before
public void before() throws Exception {
- aaiSliceService = mock(AAISliceService.class);
- generalConvert = new GeneralConvertImpl(aaiSliceService);
+ aaiSliceClient = mock(AAISliceClient.class);
+ generalConvert = new GeneralConvertImpl(aaiSliceClient);
}
@Test
String serviceType = NsmfParamConstant.SERVICE_TYPE_5G;
String serviceInstanceId = "1234-ty23-rt56-oiu9";
- when(aaiSliceService.queryOrderByService(globalCustomerId, serviceType, serviceInstanceId))
+ when(aaiSliceClient.queryOrderByService(globalCustomerId, serviceType, serviceInstanceId))
.thenReturn(successfulCall(object));
String orderId = "order123";
- when(aaiSliceService
+ when(aaiSliceClient
.queryOrderByOrderId(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, orderId))
.thenReturn(successfulCall(object));
generalConvert.getUseInterval(serviceInstanceId);
String serviceType = NsmfParamConstant.SERVICE_TYPE_5G;
String serviceInstanceId = "1234-ty23-rt56-oiu9";
- when(aaiSliceService.queryOrderByService(globalCustomerId, serviceType, serviceInstanceId))
+ when(aaiSliceClient.queryOrderByService(globalCustomerId, serviceType, serviceInstanceId))
.thenReturn(failedCall("aai is not exist!"));
String orderId = "order123";
- when(aaiSliceService
+ when(aaiSliceClient
.queryOrderByOrderId(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, orderId))
.thenReturn(failedCall("aai is not exist!"));
import org.onap.usecaseui.server.bean.nsmf.task.NstInfo;
import org.onap.usecaseui.server.constant.nsmf.NsmfParamConstant;
import org.onap.usecaseui.server.controller.IntentController;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIService;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceAndInstance;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceNST;
ResourceMgtServiceConvert resourceMgtServiceConvert = null;
SOSliceService soSliceService = null;
- AAISliceService aaiSliceService = null;
+ AAISliceClient aaiSliceClient = null;
GeneralConvertImpl generalConvert;
@Before
public void before() throws Exception {
- aaiSliceService = mock(AAISliceService.class);
+ aaiSliceClient = mock(AAISliceClient.class);
generalConvert = mock(GeneralConvertImpl.class);
- resourceMgtServiceConvert = new ResourceMgtServiceConvert(aaiSliceService);
+ resourceMgtServiceConvert = new ResourceMgtServiceConvert(aaiSliceClient);
MemberModifier.field(ResourceMgtServiceConvert.class, "generalConvert").set(resourceMgtServiceConvert , generalConvert);
}
NsiInfo nsiInfo = new NsiInfo();
String nsiId = "1234-ty23-rt56-oiu9";
- when(aaiSliceService.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nsiId))
+ when(aaiSliceClient.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nsiId))
.thenReturn(successfulCall(object));
resourceMgtServiceConvert.getNsiInfoByBusiness(nsiInfo, nsiId);
}
NsiInfo nsiInfo = new NsiInfo();
String nsiId = "1234-ty23-rt56-oiu9";
- when(aaiSliceService.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nsiId))
+ when(aaiSliceClient.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nsiId))
.thenReturn(failedCall("aai is not exist!"));
resourceMgtServiceConvert.getNsiInfoByBusiness(nsiInfo, nsiId);
}
NstInfo nstInfo = new NstInfo();
String nsiId = "1234-ty23-rt56-oiu9";
- when(aaiSliceService
+ when(aaiSliceClient
.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nsiId))
.thenReturn(successfulCall(object));
String modelVersionId = "v00001";
AAIServiceNST aaiServiceNST = new AAIServiceNST();
- when(aaiSliceService.queryServiceNST(modelInvariantId, modelVersionId))
+ when(aaiSliceClient.queryServiceNST(modelInvariantId, modelVersionId))
.thenReturn(successfulCall(aaiServiceNST));
try {
NstInfo nstInfo = new NstInfo();
String nsiId = "1234-ty23-rt56-oiu9";
- when(aaiSliceService
+ when(aaiSliceClient
.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nsiId))
.thenReturn(failedCall("aai is not exist!"));
String modelVersionId = "v00001";
AAIServiceNST aaiServiceNST = new AAIServiceNST();
- when(aaiSliceService.queryServiceNST(modelInvariantId, modelVersionId))
+ when(aaiSliceClient.queryServiceNST(modelInvariantId, modelVersionId))
.thenReturn(failedCall("aai is not exist!"));
try {
JSONObject object = new JSONObject();
String businessId = "1234-ty23-rt56-oiu9";
- when(aaiSliceService.queryAllottedResources(NsmfParamConstant.CUSTOM_5G,
+ when(aaiSliceClient.queryAllottedResources(NsmfParamConstant.CUSTOM_5G,
NsmfParamConstant.SERVICE_TYPE_5G, businessId))
.thenReturn(successfulCall(object));
try {
public void getNsiIdByBusinessWithThrowsException() {
String businessId = "1234-ty23-rt56-oiu9";
- when(aaiSliceService
+ when(aaiSliceClient
.queryAllottedResources(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, businessId))
.thenReturn(failedCall("aai is not exist!"));
try {
SlicingBusinessDetails slicingBusinessDetails = new SlicingBusinessDetails();
AAIServiceAndInstance aaiServiceAndInstance = new AAIServiceAndInstance();
- when(aaiSliceService.getServiceProfiles(NsmfParamConstant.CUSTOM_5G,
+ when(aaiSliceClient.getServiceProfiles(NsmfParamConstant.CUSTOM_5G,
NsmfParamConstant.SERVICE_TYPE_5G, businessId))
.thenReturn(successfulCall(object));
when(generalConvert.getUseInterval(eq(businessId))).thenReturn(businessId);
nssiIdList.add(nssiId);
JSONObject object = new JSONObject();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nssiId))
.thenReturn(successfulCall(object));
String nssiId = "nssiTest01";
nssiIdList.add(nssiId);
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nssiId))
.thenReturn(failedCall("aai is not exist!"));
businessIdList.add(businessId);
JSONObject object = new JSONObject();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, businessId))
.thenReturn(successfulCall(object));
try {
String businessId = "busiId001";
businessIdList.add(businessId);
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, businessId))
.thenReturn(failedCall("aai is not exist!"));
try {
HostedNsiList hostedNsiList = new HostedNsiList();
AAIServiceAndInstance aaiServiceAndInstance = new AAIServiceAndInstance();
- when(aaiSliceService.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G,
+ when(aaiSliceClient.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G,
NsmfParamConstant.SERVICE_TYPE_5G, nsiId))
.thenReturn(successfulCall(object));
try {
HostedNsiList hostedNsiList = new HostedNsiList();
AAIServiceAndInstance aaiServiceAndInstance = new AAIServiceAndInstance();
- when(aaiSliceService
+ when(aaiSliceClient
.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nsiId))
.thenReturn(failedCall("aai is not exist!"));
try {
import org.junit.Before;
import org.junit.Test;
import org.onap.usecaseui.server.constant.nsmf.NsmfParamConstant;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.NetworkInfo;
import org.onap.usecaseui.server.service.slicingdomain.so.SOSliceService;
import org.onap.usecaseui.server.service.slicingdomain.so.bean.ActivateService;
ResourceMgtServiceImpl resourceMgtService = null;
SOSliceService soSliceService;
- AAISliceService aaiSliceService;
+ AAISliceClient aaiSliceClient;
@Before
public void before() throws Exception {
- aaiSliceService = mock(AAISliceService.class);
+ aaiSliceClient = mock(AAISliceClient.class);
soSliceService = mock(SOSliceService.class);
- resourceMgtService = new ResourceMgtServiceImpl(aaiSliceService, soSliceService);
+ resourceMgtService = new ResourceMgtServiceImpl(aaiSliceClient, soSliceService);
}
@Test
public void itCanQuerySlicingBusiness() {
JSONObject object = new JSONObject();
- when(aaiSliceService
+ when(aaiSliceClient
.listService(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G))
.thenReturn(successfulCall(object));
resourceMgtService.querySlicingBusiness(1, 100);
public void querySlicingBusinessWithThrowsException() {
JSONObject object = new JSONObject();
- when(aaiSliceService
+ when(aaiSliceClient
.listService(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G))
.thenReturn(failedCall("aai is not exist!"));
resourceMgtService.querySlicingBusiness(1, 100);
@Test
public void emptyResponseWhenQuerySlicingBusiness() {
Call<JSONObject> call = emptyBodyCall();
- when(aaiSliceService
+ when(aaiSliceClient
.listService(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G)).thenReturn(call);
resourceMgtService.querySlicingBusiness(1, 100);
}
public void itCanQuerySlicingBusinessByStatus() {
JSONObject object = new JSONObject();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceByStatus(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, "activated"))
.thenReturn(successfulCall(object));
resourceMgtService.querySlicingBusinessByStatus("activated", 1, 100);
@Test
public void emptyResponseWhenQuerySlicingBusinessByStatus() {
Call<JSONObject> call = emptyBodyCall();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceByStatus(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, "activated")).thenReturn(call);
resourceMgtService.querySlicingBusinessByStatus("activated", 1, 100);
}
@Test
public void querySlicingBusinessByStatusWithThrowsException() {
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceByStatus(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, "activated"))
.thenReturn(failedCall("aai is not exist!"));
resourceMgtService.querySlicingBusinessByStatus("activated", 1, 100);
public void itCanQuerySlicingBusinessDetails() {
JSONObject object = new JSONObject();
String businessId = "23er-56ty-4567-rgdf5";
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, businessId))
.thenReturn(successfulCall(object));
NetworkInfo networkInfo = new NetworkInfo();
- when(aaiSliceService
+ when(aaiSliceClient
.getServiceNetworkInstance(businessId))
.thenReturn(successfulCall(networkInfo));
public void querySlicingBusinessDetailsWithThrowsException() {
String businessId = "23er-56ty-4567-rgdf5";
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, businessId))
.thenReturn(failedCall("aai is not exist!"));
resourceMgtService.querySlicingBusinessDetails(businessId);
public void emptyResponseWhenQuerySlicingBusinessDetails() {
String businessId = "23er-56ty-4567-rgdf5";
Call<JSONObject> call = emptyBodyCall();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceById(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, businessId)).thenReturn(call);
resourceMgtService.querySlicingBusinessDetails(businessId);
}
public void itCanQueryNsiInstances() {
JSONObject object = new JSONObject();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G))
.thenReturn(successfulCall(object));
resourceMgtService.queryNsiInstances(1, 100);
@Test
public void queryNsiInstancesWithThrowsException() {
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G))
.thenReturn(failedCall("aai is not exist!"));
resourceMgtService.queryNsiInstances(1, 100);
@Test
public void emptyResponseWhenQueryNsiInstances() {
Call<JSONObject> call = emptyBodyCall();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G)).thenReturn(call);
resourceMgtService.queryNsiInstances(1, 100);
}
public void itCanQueryNsiInstancesByStatus() {
JSONObject object = new JSONObject();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSIByStatus(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, "activated"))
.thenReturn(successfulCall(object));
resourceMgtService.queryNsiInstancesByStatus("activated", 1, 100);
@Test
public void queryNsiInstancesByStatusWithThrowsException() {
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSIByStatus(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, "activated"))
.thenReturn(failedCall("aai is not exist!"));
resourceMgtService.queryNsiInstancesByStatus("activated", 1, 100);
@Test
public void emptyResponseWhenQueryNsiInstancesByStatus() {
Call<JSONObject> call = emptyBodyCall();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSIByStatus(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, "activated")).thenReturn(call);
resourceMgtService.queryNsiInstancesByStatus("activated", 1, 100);
}
public void itCanQueryNsiDetails() {
JSONObject object = new JSONObject();
String serviceInstanceId = "23er-56ty-4567-rgdf5";
- when(aaiSliceService
+ when(aaiSliceClient
.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, serviceInstanceId))
.thenReturn(successfulCall(object));
resourceMgtService.queryNsiDetails(serviceInstanceId);
public void queryNsiDetailsWithThrowsException() {
String serviceInstanceId = "23er-56ty-4567-rgdf5";
- when(aaiSliceService
+ when(aaiSliceClient
.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, serviceInstanceId))
.thenReturn(failedCall("aai is not exist!"));
resourceMgtService.queryNsiDetails(serviceInstanceId);
public void emptyResponseWhenQueryNsiDetails() {
Call<JSONObject> call = emptyBodyCall();
String serviceInstanceId = "23er-56ty-4567-rgdf5";
- when(aaiSliceService
+ when(aaiSliceClient
.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, serviceInstanceId)).thenReturn(call);
resourceMgtService.queryNsiDetails(serviceInstanceId);
}
public void itCanQueryNsiRelatedNssiInfo() {
JSONObject object = new JSONObject();
String nsiId = "23er-56ty-4567-rgdf5";
- when(aaiSliceService
+ when(aaiSliceClient
.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nsiId))
.thenReturn(successfulCall(object));
resourceMgtService.queryNsiRelatedNssiInfo(nsiId);
public void queryNsiRelatedNssiInfoWithThrowsException() {
String nsiId = "23er-56ty-4567-rgdf5";
- when(aaiSliceService
+ when(aaiSliceClient
.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nsiId))
.thenReturn(failedCall("aai is not exist!"));
resourceMgtService.queryNsiRelatedNssiInfo(nsiId);
public void emptyResponseWhenQuueryNsiRelatedNssiInfo() {
Call<JSONObject> call = emptyBodyCall();
String nsiId = "23er-56ty-4567-rgdf5";
- when(aaiSliceService
+ when(aaiSliceClient
.querySerAndSubInsByNSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nsiId)).thenReturn(call);
resourceMgtService.queryNsiRelatedNssiInfo(nsiId);
}
public void itCanQueryNssiInstances() {
JSONObject object = new JSONObject();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G))
.thenReturn(successfulCall(object));
resourceMgtService.queryNssiInstances(1, 100);
@Test
public void queryNssiInstancesWithThrowsException() {
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G))
.thenReturn(failedCall("aai is not exist!"));
resourceMgtService.queryNssiInstances(1, 100);
@Test
public void emptyResponseWhenQueryNssiInstances() {
Call<JSONObject> call = emptyBodyCall();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G)).thenReturn(call);
resourceMgtService.queryNssiInstances(1, 100);
}
public void itCanQueryNssiInstancesByStatus() {
JSONObject object = new JSONObject();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSSIByStatus(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, "activated"))
.thenReturn(successfulCall(object));
resourceMgtService.queryNssiInstancesByStatus("activated", 1, 100);
@Test
public void queryNssiInstancesByStatusWithThrowsException() {
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSSIByStatus(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, "activated"))
.thenReturn(failedCall("aai is not exist!"));
resourceMgtService.queryNssiInstancesByStatus("activated", 1, 100);
@Test
public void emptyResponseWhenQueryNssiInstancesByStatus() {
Call<JSONObject> call = emptyBodyCall();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSSIByStatus(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, "activated")).thenReturn(call);
resourceMgtService.queryNssiInstancesByStatus("activated", 1, 100);
}
public void itCanQueryNssiInstancesByEnvironment() {
JSONObject object = new JSONObject();
String environmentContext = "cn";
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSSIByEnv(NsmfParamConstant.CUSTOM_5G,
NsmfParamConstant.SERVICE_TYPE_5G, environmentContext))
.thenReturn(successfulCall(object));
@Test
public void queryNssiInstancesByEnvironmentWithThrowsException() {
String environmentContext = "cn";
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSSIByEnv(NsmfParamConstant.CUSTOM_5G,
NsmfParamConstant.SERVICE_TYPE_5G, environmentContext))
.thenReturn(failedCall("aai is not exist!"));
public void emptyResponseWhenQueryNssiInstancesByEnvironment() {
String environmentContext = "cn";
Call<JSONObject> call = emptyBodyCall();
- when(aaiSliceService
+ when(aaiSliceClient
.listServiceNSSIByEnv(NsmfParamConstant.CUSTOM_5G,
NsmfParamConstant.SERVICE_TYPE_5G, environmentContext)).thenReturn(call);
resourceMgtService.queryNssiInstancesByEnvironment(environmentContext, 1, 100);
public void itCanQueryNssiDetails() {
JSONObject object = new JSONObject();
String nssiId = "23er-56ty-4567-rgdf5";
- when(aaiSliceService
+ when(aaiSliceClient
.queryNSIByNSSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nssiId))
.thenReturn(successfulCall(object));
resourceMgtService.queryNssiDetails(nssiId);
public void queryNssiDetailsWithThrowsException() {
String nssiId = "23er-56ty-4567-rgdf5";
- when(aaiSliceService
+ when(aaiSliceClient
.queryNSIByNSSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nssiId))
.thenReturn(failedCall("aai is not exist!"));
resourceMgtService.queryNssiDetails(nssiId);
public void emptyResponseWhenQueryNssiDetails() {
String nssiId = "23er-56ty-4567-rgdf5";
Call<JSONObject> call = emptyBodyCall();
- when(aaiSliceService
+ when(aaiSliceClient
.queryNSIByNSSI(NsmfParamConstant.CUSTOM_5G, NsmfParamConstant.SERVICE_TYPE_5G, nssiId)).thenReturn(call);
resourceMgtService.queryNssiDetails(nssiId);
}
import org.onap.usecaseui.server.bean.nsmf.task.SlicingTaskCreationInfo;
import org.onap.usecaseui.server.bean.nsmf.task.SlicingTaskCreationProgress;
import org.onap.usecaseui.server.bean.nsmf.task.SlicingTaskList;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.ConnectionLink;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.ConnectionLinkList;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.RelationshipList;
public class TaskMgtServiceConvertTest {
TaskMgtServiceConvert taskMgtServiceConvert = null;
- AAISliceService aaiSliceService;
+ AAISliceClient aaiSliceClient;
GeneralConvertImpl generalConvert;
@Before
public void before() throws Exception {
- aaiSliceService = mock(AAISliceService.class);
+ aaiSliceClient = mock(AAISliceClient.class);
generalConvert = mock(GeneralConvertImpl.class);
- taskMgtServiceConvert = new TaskMgtServiceConvert(aaiSliceService);
+ taskMgtServiceConvert = new TaskMgtServiceConvert(aaiSliceClient);
taskMgtServiceConvert.setGeneralConvert(generalConvert);
}
@Test
public void convertSlicingTaskListWithThrowsException() {
- when(aaiSliceService.getConnectionLinks()).thenReturn(failedCall("so is not exist!"));
+ when(aaiSliceClient.getConnectionLinks()).thenReturn(failedCall("so is not exist!"));
SlicingTaskList targetSlicingTaskList = new SlicingTaskList();
SOTaskRsp soTaskRsp = new SOTaskRsp();
soTaskRsp.setTask(null);
logicalLink.add(connectionLink);
connectionLinkList.setLogicalLink(logicalLink);
- when(aaiSliceService.getConnectionLinks()).thenReturn(successfulCall(connectionLinkList));
+ when(aaiSliceClient.getConnectionLinks()).thenReturn(successfulCall(connectionLinkList));
taskMgtServiceConvert.queryEndPointId("123");
}
@Test
public void queryEndPointIdWithThrowsException() {
- when(aaiSliceService.getConnectionLinks()).thenReturn(failedCall("so is not exist!"));
+ when(aaiSliceClient.getConnectionLinks()).thenReturn(failedCall("so is not exist!"));
taskMgtServiceConvert.queryEndPointId("123");
}
}
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.RelationshipList;
import org.onap.usecaseui.server.service.slicingdomain.so.SOSliceService;
import org.onap.usecaseui.server.service.slicingdomain.so.bean.SOTask;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
+import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceClient;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.ConnectionLinkList;
public class TaskMgtServiceImplTest {
TaskMgtServiceImpl taskMgtService = null;
SOSliceService soSliceService = null;
- AAISliceService aaiSliceService = null;
+ AAISliceClient aaiSliceClient = null;
TaskMgtServiceConvert taskMgtServiceConvert = null;
@Before
public void before() throws Exception {
soSliceService = mock(SOSliceService.class);
- aaiSliceService = mock(AAISliceService.class);
- taskMgtService = new TaskMgtServiceImpl(soSliceService,aaiSliceService);
+ aaiSliceClient = mock(AAISliceClient.class);
+ taskMgtService = new TaskMgtServiceImpl(soSliceService,aaiSliceClient);
taskMgtServiceConvert = mock(TaskMgtServiceConvert.class);
taskMgtService.taskMgtServiceConvert = taskMgtServiceConvert;
}
@Test
public void queryConnectionLinksWithThrowsException() {
String taskId = "we23-345r-45ty-5687";
- when(aaiSliceService.getConnectionLinks()).thenReturn(failedCall("so is not exist!"));
+ when(aaiSliceClient.getConnectionLinks()).thenReturn(failedCall("so is not exist!"));
taskMgtService.queryConnectionLinks(3,5);
}
String name2 = "name2";
EndPointInfoList endPointInfoList = new EndPointInfoList();
- when(aaiSliceService.getConnectionLinks()).thenReturn(successfulCall(connectionLinkList));
- when(aaiSliceService.getEndpointByLinkName(name1)).thenReturn(successfulCall(endPointInfoList));
- when(aaiSliceService.getEndpointByLinkName2(name2)).thenReturn(successfulCall(endPointInfoList));
- when(aaiSliceService.getAllottedResource(taskId, taskId)).thenReturn(successfulCall(connectionLink));
+ when(aaiSliceClient.getConnectionLinks()).thenReturn(successfulCall(connectionLinkList));
+ when(aaiSliceClient.getEndpointByLinkName(name1)).thenReturn(successfulCall(endPointInfoList));
+ when(aaiSliceClient.getEndpointByLinkName2(name2)).thenReturn(successfulCall(endPointInfoList));
+ when(aaiSliceClient.getAllottedResource(taskId, taskId)).thenReturn(successfulCall(connectionLink));
taskMgtService.queryConnectionLinks(3,5);
}
<parent>
<groupId>org.onap.usecase-ui.server</groupId>
<artifactId>usecase-ui-server-parent</artifactId>
- <version>15.0.1-SNAPSHOT</version>
+ <version>15.0.3-SNAPSHOT</version>
</parent>
<artifactId>usecase-ui-server-standalone</artifactId>
<description>distribute binary files and docker image for usecase-ui server</description>
<properties>
- <usecaseui.version>15.0.1</usecaseui.version>
+ <usecaseui.version>15.0.3</usecaseui.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
major=15
minor=0
-patch=1
+patch=3
base_version=${major}.${minor}.${patch}
Code Review / usecase-ui / server.git / commitdiff