Realize the update PNF API.

Issue-ID: AAI-1522

Change-Id: I606c0b1b305b26fd51d640899596dfccf4adfb34
Signed-off-by: Zi Li <li.zi30@zte.com.cn>

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/PnfManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/PnfManagerWrapper.java
index 0683769..7b5cf29 100644 (file)
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/PnfManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/PnfManagerWrapper.java
@@ -145,9 +145,17 @@ public class PnfManagerWrapper {
      * @param pnfId
      * @return
      */
      * @param pnfId
      * @return
      */

-    public Response updatePnf(PnfRegisterInfo pnf, String pnfId) {
-        // TODO Auto-generated method stub
-        return null;
+    public Response updatePnf(PnfRegisterInfo pnfRegisterInfo, String pnfId) {
+        String resourceVersion = getResourceVersion(pnfId);
+        Pnf pnf = pnfManagerUtil.pnfRegisterInfo2pnf(pnfRegisterInfo);
+        pnf.setResourceVersion(resourceVersion);
+        try {
+            networkProxy.registerPnf(pnfId, pnf);
+            return Response.ok().build();
+        } catch (ExtsysException e) {
+            LOG.error("Update PNF failed !", e);
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+        }

     }
 
     /**
     }
 
     /**

diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/PnfManagerWrapperTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/PnfManagerWrapperTest.java
index aa6a364..fe944d4 100644 (file)
--- a/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/PnfManagerWrapperTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/PnfManagerWrapperTest.java
@@ -135,4 +135,36 @@ public class PnfManagerWrapperTest {
             Assert.assertTrue(response.getStatus() == 204);
         }
     }
             Assert.assertTrue(response.getStatus() == 204);
         }
     }

+    
+    @Test
+    public void test_updatePnf() throws ExtsysException {
+        PnfRegisterInfo pnfRegisterInfo = new PnfRegisterInfo();
+        pnfRegisterInfo.setPnfId("pnf1");
+        pnfRegisterInfo.setUserLabel("PNF test");
+        pnfRegisterInfo.setSubnetId("subnetId1");
+        pnfRegisterInfo.setNeId("neId1");
+        pnfRegisterInfo.setManagementType("Test");
+        pnfRegisterInfo.setVendor("ZTE");
+        pnfRegisterInfo.setPnfdId("pnfdId1");
+        pnfRegisterInfo.setEmsId("emsId1");
+        pnfRegisterInfo.setLattitude("121.546");
+        pnfRegisterInfo.setLongitude("14.22");
+        String PnfStr = "{\"pnf-name\": \"pnf1\","
+                + "\"pnf-name2\": \"PNF test\","
+                + "\"pnf-id\": \"subnetId1-neId1\","
+                + "\"equip-type\": \"Test\","
+                + "\"equip-vendor\": \"ZTE\","
+                + "\"equip-model\": \"pnfdId1\","
+                + "\"management-option\": \"emsId1\","
+                + "\"in-maint\": false,"
+                + "\"frame-id\": \"121.546-14.22\"}";
+        NetworkProxy mockNetworkProxy = Mockito.mock(NetworkProxy.class);
+        Mockito.doNothing().when(mockNetworkProxy).registerPnf(Mockito.anyString(), (Pnf)Mockito.anyObject());
+        Mockito.when(mockNetworkProxy.queryPNF(Mockito.anyString())).thenReturn(PnfStr);
+        PnfManagerWrapper vnfmManagerWrapper = new PnfManagerWrapper(mockNetworkProxy);
+        Response response = vnfmManagerWrapper.updatePnf(pnfRegisterInfo, "pnf1");
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 200);
+        }
+    }

 }
 }