diff options
Diffstat (limited to 'server/src/main/java/org/onap/usecaseui/server')
3 files changed, 57 insertions, 1 deletions
diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/IntentController.java b/server/src/main/java/org/onap/usecaseui/server/controller/IntentController.java index f63f9d99..b8d63f44 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/IntentController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/IntentController.java @@ -450,6 +450,29 @@ public class IntentController { } @IntentResponseBody + @ResponseBody + @PostMapping(value = {"/updateCCVPNInstance"}, consumes = MediaType.APPLICATION_JSON_VALUE, + produces = "application/json; charset=utf-8") + public Object updateCCVPNInstance(@RequestBody Object body) throws IOException { + String intentInstanceId = MapUtils.getString((Map)body,"instanceId"); + int accessPointOneBandWidth = MapUtils.getIntValue((Map)body,"bandwidth"); + + CCVPNInstance instance = new CCVPNInstance(); + instance.setInstanceId(intentInstanceId); + instance.setAccessPointOneBandWidth(accessPointOneBandWidth); + + int flag = intentInstanceService.updateCCVPNInstance(instance); + + if(flag == 1) { + return "OK"; + } + else { + throw new RuntimeException("create Instance error"); + } + } + + + @IntentResponseBody @GetMapping(value = {"/getFinishedInstanceInfo"}, produces = "application/json") public Object getFinishedInstanceInfo() { diff --git a/server/src/main/java/org/onap/usecaseui/server/service/intent/IntentInstanceService.java b/server/src/main/java/org/onap/usecaseui/server/service/intent/IntentInstanceService.java index cb922e7b..d0595ce6 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/intent/IntentInstanceService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/intent/IntentInstanceService.java @@ -63,4 +63,6 @@ public interface IntentInstanceService { Page<IntentInstance> getIntentInstanceList(int currentPage, int pageSize); ServiceResult createSlicingServiceWithIntent(Object slicingOrderBody); + + int updateCCVPNInstance(CCVPNInstance instance); } diff --git a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java index c54e591c..b62f3aa9 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java @@ -856,6 +856,37 @@ public class IntentInstanceServiceImpl implements IntentInstanceService { return serviceResult; } + @Override + public int updateCCVPNInstance(CCVPNInstance instance) { + Session session = getSession(); + Transaction tx = null; + try{ + if (null == instance){ + logger.error("instance is null!"); + return 0; + } + instance.setResourceInstanceId("cll-"+instance.getInstanceId()); + + CCVPNInstance ccvpnInstance = (CCVPNInstance)session.createQuery("from CCVPNInstance where instanceId = :instanceId") + .setParameter("instanceId", instance.getInstanceId()).uniqueResult(); + ccvpnInstance.setAccessPointOneBandWidth(instance.getAccessPointOneBandWidth()); + saveIntentInstanceToAAI(IntentConstant.INTENT_INSTANCE_ID_PREFIX + "-" + ccvpnInstance.getInstanceId(), ccvpnInstance); + + tx = session.beginTransaction(); + session.update(ccvpnInstance); + tx.commit(); + return 1; + } catch (Exception e) { + if (tx != null) { + tx.rollback(); + } + logger.error("Details:" + e.getMessage()); + return 0; + } finally { + session.close(); + } + } + public int getIntentInstanceAllCount() { Session session = getSession(); try{ @@ -917,7 +948,7 @@ public class IntentInstanceServiceImpl implements IntentInstanceService { params.put("service-instance-id", serviceInstanceId); params.put("service-instance-name", instance.getName()); params.put("service-type", IntentConstant.MODEL_TYPE_CCVPN); - params.put("environment-context", environmentContext); + params.put("environment-context", environmentContext.toJSONString()); params.put("service-instance-location-id", instance.getResourceInstanceId()); params.put("bandwidth-total", instance.getAccessPointOneBandWidth()); params.put("data-owner", IntentConstant.INTENT_INSTANCE_DATA_OWNER); |