Update pnf-id to pnf-name in LCM API

In order to be compatible with Pnf entry in A&AI, update pnf-id to pnf-name.

Change-Id: Ibb76fd754c4a657a6f4af4453b3c819670fb96c2
Issue-ID: SDNC-856
Signed-off-by: Enbo Wang <wangenbo@huawei.com>

diff --git a/lcm/model/src/main/resources/lcm.20180329.json b/lcm/model/src/main/resources/lcm.20180329.json
index 18512fc..b841898 100644 (file)
--- a/lcm/model/src/main/resources/lcm.20180329.json
+++ b/lcm/model/src/main/resources/lcm.20180329.json
@@ -1628,7 +1628,7 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "identifies a specific VM within the given service/vnf to which\\n   this action is to be applied"
         },
-        "pnf-id": {
+        "pnf-name": {
           "$ref": "#/definitions/Optional.empty",
           "description": "identifies the PNF to which this action is to be applied."
         }
@@ -4358,7 +4358,7 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "identifies a specific VM within the given service/vnf to which\\n   this action is to be applied"
         },
-        "LCM:pnf-id": {
+        "LCM:pnf-name": {
           "$ref": "#/definitions/Optional.empty",
           "description": "identifies the PNF to which this action is to be applied."
         }

diff --git a/lcm/model/src/main/yang/lcm.yang b/lcm/model/src/main/yang/lcm.yang
index d2ca5fe..188068a 100644 (file)
--- a/lcm/model/src/main/yang/lcm.yang
+++ b/lcm/model/src/main/yang/lcm.yang
@@ -313,12 +313,11 @@ module LCM {
                 type string;
                 mandatory false;
             }
-            leaf pnf-id {
+            leaf pnf-name {
                 description "identifies the PNF to which this action is to be applied.";
                 type string;
                 mandatory false;
             }
-
         }
     }
 

diff --git a/lcm/provider/src/test/java/org/onap/ccsdk/sli/northbound/TestLcmProvider.java b/lcm/provider/src/test/java/org/onap/ccsdk/sli/northbound/TestLcmProvider.java
index a7e1e1f..b73151e 100644 (file)
--- a/lcm/provider/src/test/java/org/onap/ccsdk/sli/northbound/TestLcmProvider.java
+++ b/lcm/provider/src/test/java/org/onap/ccsdk/sli/northbound/TestLcmProvider.java
@@ -1171,7 +1171,7 @@ public class TestLcmProvider {
                aBuilder.setVfModuleId("vf-module-1");
                aBuilder.setVnfcName("my-vnfc");
                aBuilder.setVnfId("123");
-               aBuilder.setPnfId("456");
+               aBuilder.setPnfName("my-pnf");
                aBuilder.setVserverId("123");
                builder.setActionIdentifiers(aBuilder.build());
 
@@ -1206,7 +1206,7 @@ public class TestLcmProvider {
                aBuilder.setVfModuleId("vf-module-1");
                aBuilder.setVnfcName("my-vnfc");
                aBuilder.setVnfId("123");
-               aBuilder.setPnfId("456");
+               aBuilder.setPnfName("my-pnf");
                aBuilder.setVserverId("123");
                builder.setActionIdentifiers(aBuilder.build());