From: guochuyicmri <guochuyi@chinamobile.com>
Date: Wed, 12 Sep 2018 03:07:38 +0000 (+0800)
Subject: getNetWorkResource error
X-Git-Tag: 1.2.0~15
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1da57ea41695d5a48a8a4ce046acd8bb3964a391;p=usecase-ui%2Fserver.git

getNetWorkResource error

Change-Id: I1e58b4952abddc4b201c8468d79d29c852771e1b
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 2af18af7..b8cf9d76 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
@@ -173,15 +173,16 @@ 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);
+							continue;
+						}
+						if(shipDataValue.indexOf("\"")!=-1){
+							shipDataValue = shipDataValue.substring(1, shipDataValue.length()-1);
 						}
 						pnf.setPnfName(shipDataValue);
 						pnfs.add(pnf);