From: guochuyicmri <guochuyi@chinamobile.com>
Date: Tue, 11 Sep 2018 11:04:19 +0000 (+0800)
Subject: getpInterfaceBypnfName do not get data
X-Git-Tag: 1.2.0~16
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F65805%2F1;p=usecase-ui%2Fserver.git

getpInterfaceBypnfName do not get data

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

diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java b/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java
index b201f614..2af18af7 100644
--- a/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java
@@ -160,6 +160,9 @@ public class SotnController {
 				NetWorkResource netResource = new NetWorkResource();
 				List<Pnf> pnfs = new ArrayList<Pnf>();
 				String networkId=netNode.get(i).get("network-id").toString();
+				if(networkId.indexOf("\"")!=-1){
+					networkId = networkId.substring(1, networkId.length()-1);
+				}
 				netResource.setNetworkId(networkId);
 				if(UuiCommonUtil.isNotNullOrEmpty(netNode.get(i).get("relationship-list"))){
 					String relationJson = netNode.get(i).get("relationship-list").toString();
@@ -170,7 +173,13 @@ public class SotnController {
 						Pnf pnf = new Pnf();
 						JsonNode shipDataNode = shipNode.get(j).get("relationship-data");
 						String shipDataValue = shipDataNode.get(0).get("relationship-value").toString();
+						if(shipDataValue.indexOf("\"")!=-1){
+							shipDataValue = shipDataValue.substring(1, shipDataValue.length()-1);
+						}
 						String shipDataKey = shipDataNode.get(0).get("relationship-key").toString();
+						if(shipDataKey.indexOf("\"")!=-1){
+							shipDataKey = shipDataKey.substring(1, shipDataKey.length()-1);
+						}
 						if("ext-aai-network.aai-id".equals(shipDataKey)){
 							netResource.setAaiId(shipDataKey);
 						}
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java
index 734cc614..0612fc4a 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java
@@ -99,7 +99,7 @@ public interface AAIService {
         "Authorization: Basic QUFJOkFBSQ==",
         "Accept: application/json"
     })
-	@GET("api/aai-network/v13/network-resources")
+	@GET("/api/aai-network/v13/network-resources")
 	Call<ResponseBody> listNetWorkResources();
     
     @Headers({