Change VFC parser API URL

Change-Id: I82b06b7ddf71d825a38b45d3d7b1ada09c00b53b
Issue-ID: USECASEUI-264
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/ServiceBean.java b/server/src/main/java/org/onap/usecaseui/server/bean/ServiceBean.java
index 34c756d..8a8b0f2 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/bean/ServiceBean.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/ServiceBean.java
@@ -40,9 +40,6 @@ public class ServiceBean {
        @Column(name = "usecase_type")
        private String serviceDomain;
        
-       @Column(name = "parent_service_instance_id")
-       private String parentServiceInstanceId;
-       
        @Column(name = "uuid")
        private String uuid;
        
@@ -53,13 +50,12 @@ public class ServiceBean {
        }
 
        public ServiceBean(String id, String serviceInstanceId, String customerId, String serviceType, String serviceDomain,
-                       String parentServiceInstanceId, String uuid, String invariantUuuid) {
+                       String uuid, String invariantUuuid) {
                this.id = id;
                this.serviceInstanceId = serviceInstanceId;
                this.customerId = customerId;
                this.serviceType = serviceType;
                this.serviceDomain = serviceDomain;
-               this.parentServiceInstanceId = parentServiceInstanceId;
                this.uuid = uuid;
                this.invariantUuuid = invariantUuuid;
        }
@@ -104,14 +100,6 @@ public class ServiceBean {
                this.serviceDomain = serviceDomain;
        }
 
-       public String getParentServiceInstanceId() {
-               return parentServiceInstanceId;
-       }
-
-       public void setParentServiceInstanceId(String parentServiceInstanceId) {
-               this.parentServiceInstanceId = parentServiceInstanceId;
-       }
-
        public String getUuid() {
                return uuid;
        }

diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java
index a766c0a..7a821ee 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java
@@ -258,7 +258,7 @@ public class PackageDistributionController {
        String object = packageDistributionService.instantiateNetworkServiceInstance(request,ns_instance_id);
        JSONObject jobObject = JSONObject.parseObject(object);
        String jobId = jobObject.getString("jobId");
-       ServiceBean serviceBean = new ServiceBean(UuiCommonUtil.getUUID(),ns_instance_id,customerId,serviceType,serviceDomain,null,null,null);
+       ServiceBean serviceBean = new ServiceBean(UuiCommonUtil.getUUID(),ns_instance_id,customerId,serviceType,serviceDomain,null,null);
        ServiceInstanceOperations serviceOpera = new ServiceInstanceOperations(ns_instance_id,jobId,Constant.CREATING_CODE,"0",Constant.IN_PROGRESS_CODE,DateUtils.dateToString(DateUtils.now()),null);
        serviceLcmService.saveOrUpdateServiceInstanceOperation(serviceOpera);
        serviceLcmService.saveOrUpdateServiceBean(serviceBean);

diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java
index 6206ffb..9b3e382 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java
@@ -61,8 +61,7 @@ public class ServiceLcmController {
        String serviceDomain = request.getParameter("serviceDomain");
         String uuid = request.getParameter("uuid");
         String invariantUuuid = request.getParameter("invariantUuuid");
-       String parentServiceInstanceId = request.getParameter("parentServiceInstanceId");
-       ServiceBean serviceBean = new ServiceBean(UuiCommonUtil.getUUID(),null,customerId,serviceType,serviceDomain,parentServiceInstanceId,uuid,invariantUuuid);
+       ServiceBean serviceBean = new ServiceBean(UuiCommonUtil.getUUID(),null,customerId,serviceType,serviceDomain,uuid,invariantUuuid);
        ServiceOperation serviceOperation = serviceLcmService.instantiateService(request);
        String serviceId = serviceOperation.getService().getServiceId();
        String operationId = serviceOperation.getService().getOperationId();

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/vfc/VfcService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/vfc/VfcService.java
index 6ddec94..8e94a61 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/vfc/VfcService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/vfc/VfcService.java
@@ -52,7 +52,7 @@ public interface VfcService {
     @POST("/api/catalog/v1/parsernsd")
     Call<ResponseBody> fetchNsTemplateData(@Body RequestBody body);
     
-    @POST("/api/parser/v1/parser")
+    @POST("/api/parser/v1")
     Call<ResponseBody> fetchTemplateInfo(@Body RequestBody body);
     
     @GET("/api/nslcm/v1/ns")