summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnbo Wang <wangenbo@huawei.com>2020-01-20 14:51:13 +0800
committerEnbo Wang <wangenbo@huawei.com>2020-01-20 14:51:13 +0800
commit6a90726a7134f16c36ce2aacfaf96e2f88476c4f (patch)
treeaaa4a6c66a6af89f5d4dc84ae9ee8ecb92537d9f
parent259dc1ff083206ea3a8425c8e9f3c6988d20e524 (diff)
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>
-rw-r--r--lcm/model/src/main/resources/lcm.20180329.json4
-rw-r--r--lcm/model/src/main/yang/lcm.yang3
-rw-r--r--lcm/provider/src/test/java/org/onap/ccsdk/sli/northbound/TestLcmProvider.java4
3 files changed, 5 insertions, 6 deletions
diff --git a/lcm/model/src/main/resources/lcm.20180329.json b/lcm/model/src/main/resources/lcm.20180329.json
index 18512fc3..b8418985 100644
--- 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 d2ca5feb..188068a6 100644
--- 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 a7e1e1f2..b73151e8 100644
--- 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());