diff options
author | ’zhaoyh6‘ <zhaoyh6@asiainfo.com> | 2021-10-13 09:50:55 +0800 |
---|---|---|
committer | zhao yehua <zhaoyh6@asiainfo.com> | 2021-10-13 02:19:29 +0000 |
commit | dcbfd5f2e9f4a16d90c4e49aeed2c5278dbf8f47 (patch) | |
tree | d803496ef9c574ac4845f89f771c459dbdab5647 | |
parent | 7e74254dd8ca499fbc7ed3a7d45e06d3e29f29b0 (diff) |
fix:Fix create instance problem
Issue-ID: USECASEUI-605
Signed-off-by: ’zhaoyh6‘ <zhaoyh6@asiainfo.com>
Change-Id: Ia9a6e9e3d3d635beb63a55520c43dcbcea687a10
4 files changed, 18 insertions, 21 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 a1a2f206..4a324a63 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 @@ -186,7 +186,7 @@ public class IntentController { private String load(String dirPath) { - String url = "http://uui-nlp.onap:33011/api/online/load"; + String url = "http://uui-nlp:33011/api/online/load"; HashMap<String, String> headers = new HashMap<>(); String bodyStr = "{" + "\"path\": \""+dirPath+"\"" + "}"; logger.info("request body: " + bodyStr); @@ -233,7 +233,7 @@ public class IntentController { throw new RuntimeException("The active model file does not support parsing the current text"); } - String url = "http://uui-nlp.onap:33011/api/online/predict"; + String url = "http://uui-nlp:33011/api/online/predict"; HashMap<String, String> headers = new HashMap<>(); String bodyStr = "{\"title\": \"predict\", \"text\": \"" + text + "\"}"; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/intent/IntentApiService.java b/server/src/main/java/org/onap/usecaseui/server/service/intent/IntentApiService.java index 76014340..2c636479 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/intent/IntentApiService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/intent/IntentApiService.java @@ -24,9 +24,7 @@ import retrofit2.http.*; public interface IntentApiService { @Headers({ - "X-TransactionId: 9999", - "X-FromAppId: MSO", - "Authorization: Basic QUFJOkFBSQ==", + "Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", "Accept: application/json" }) @POST("/so/infra/serviceIntent/v1/create") @@ -35,7 +33,7 @@ public interface IntentApiService { @Headers({ "X-TransactionId: 9999", "X-FromAppId: MSO", - "Authorization: Basic QUFJOkFBSQ==", + "Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", "Accept: application/json" }) @GET("/aai/v24/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/{resource-service-id}?depth=all") @@ -44,7 +42,7 @@ public interface IntentApiService { @Headers({ "X-TransactionId: 9999", "X-FromAppId: MSO", - "Authorization: Basic QUFJOkFBSQ==", + "Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", "Accept: application/json" }) @GET("/aai/v24/network/network-policies/network-policy/{networkPolicyId}?depth=all") @@ -53,28 +51,26 @@ public interface IntentApiService { @Headers({ "X-TransactionId: 9999", "X-FromAppId: MSO", - "Authorization: Basic QUFJOkFBSQ==", + "Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", "Accept: application/json" }) @GET("/aai/v24/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/{resource-service-id}/metadata") Call<JSONObject> getInstanceBandwidth(@Path("resource-service-id") String resourceServiceId); @Headers({ - "X-TransactionId: 9999", - "X-FromAppId: MSO", - "Authorization: Basic QUFJOkFBSQ==", + "Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", "Accept: application/json" }) - @POST("/so/infra/serviceIntent/v1/delete") + @DELETE("/so/infra/serviceIntent/v1/delete") Call<JSONObject> deleteIntentInstance(@Body RequestBody body); @Headers({ "X-TransactionId: 9999", "X-FromAppId: MSO", - "Authorization: Basic QUFJOkFBSQ==", + "Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", "Accept: application/json" }) - @POST("/aai/v24/network/network-routes") + @GET("/aai/v24/network/network-routes") Call<JSONObject> queryNetworkRoute(); } 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 1abd2515..fe8ee64f 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 @@ -492,8 +492,9 @@ public class IntentInstanceServiceImpl implements IntentInstanceService { Map<String, Object> result = new HashMap<>(); List<String> accessNodeList = new ArrayList<>(); List<String> cloudAccessNodeList = new ArrayList<>(); - JSONObject body = intentApiService.queryNetworkRoute().execute().body(); - JSONArray data = body.getJSONArray("data"); + Response<JSONObject> response = intentApiService.queryNetworkRoute().execute(); + JSONObject body = response.body(); + JSONArray data = body.getJSONArray("network-route"); for (int i = 0; i<data.size(); i++) { JSONObject nodeInfo = data.getJSONObject(i); if ("ROOT".equals(nodeInfo.getString("type"))) { diff --git a/standalone/src/main/assembly/resources/dbscripts/postgres/uui_create_table.sql b/standalone/src/main/assembly/resources/dbscripts/postgres/uui_create_table.sql index c1fb78f0..1a29c372 100644 --- a/standalone/src/main/assembly/resources/dbscripts/postgres/uui_create_table.sql +++ b/standalone/src/main/assembly/resources/dbscripts/postgres/uui_create_table.sql @@ -154,8 +154,8 @@ DROP TABLE IF EXISTS instance_performance; CREATE TABLE instance_performance ( id integer not null, - job_id varchar(32), - resource_instance_id varchar(64), + job_id varchar(36), + resource_instance_id varchar(36), bandwidth numeric, date date, max_bandwidth numeric, @@ -172,10 +172,10 @@ CREATE TABLE intent_instance constraint intent_instance_pk primary key, instance_id varchar(16), - job_id varchar(16), + job_id varchar(36), progress integer, status char, - resource_instance_id varchar(16), + resource_instance_id varchar(36), name varchar(255), cloud_point_name varchar(255), access_point_one_name varchar(255), @@ -198,5 +198,5 @@ create table intent_model create_time varchar(100) default NULL::character varying, size numeric(10, 3), active integer, - "modelType" integer default 0 + model_type integer default 0 ); |