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 2af18af..b8cf9d7 100644 (file)
--- 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);