Merge "Update AAI endpoints to /aai/v21"
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
index 4c74b48..54eeaac 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
@@ -1347,7 +1347,7 @@
"properties" : {
"type" : "JSON",
"verb" : "GET",
- "url-path" : "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path" : "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id",
"path" : "",
"input-key-mapping" : {
"vnf-id" : "vnf-id"
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json
index 3501dbf..dec2de7 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json
@@ -87,7 +87,7 @@
"properties" : {
"verb" : "PATCH",
"type" : "JSON",
- "url-path" : "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id/nm-profile-name",
+ "url-path" : "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id/nm-profile-name",
"payload" : "{\"nm-profile-name\":\"$vf-module-id\"}",
"path" : "",
"input-key-mapping" : {
@@ -1426,7 +1426,7 @@
"properties" : {
"verb" : "GET",
"type" : "JSON",
- "url-path" : "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path" : "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id",
"path" : "",
"input-key-mapping" : {
"vnf-id" : "vnf-id"
@@ -1457,7 +1457,7 @@
"headers" : {
"Content-Type" : "application/merge-patch+json"
},
- "url-path" : "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id/vf-modules/vf-module/$vf-module-id",
+ "url-path" : "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id/vf-modules/vf-module/$vf-module-id",
"payload" : "{\r\n\"vf-module-name\":\"${vf-module-name}\", \r\n\"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/${service-instance-id}/service-data/vnfs/vnf/${vnf-id}/vnf-data/vf-modules/vf-module/${vf-module-id}/vf-module-data/vf-module-topology/\"\r\n \r\n}",
"path" : "",
"input-key-mapping" : {
@@ -2214,7 +2214,7 @@
"headers" : {
"Content-Type" : "application/merge-patch+json"
},
- "url-path" : "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path" : "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id",
"payload" : "{\r\n\"vnf-name\":\"${vnf_name}\", \r\n \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/${service-instance-id}/service-data/vnfs/vnf/${vnf-id}/vnf-data/vnf-topology/\"\r\n}",
"path" : "",
"input-key-mapping" : {
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/resources_definition_types.json
index 9746fad..748b0db 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/resources_definition_types.json
@@ -87,7 +87,7 @@
"properties" : {
"verb" : "PATCH",
"type" : "JSON",
- "url-path" : "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id/nm-profile-name",
+ "url-path" : "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id/nm-profile-name",
"payload" : "{\"nm-profile-name\":\"$vf-module-id\"}",
"path" : "",
"input-key-mapping" : {
@@ -1426,7 +1426,7 @@
"properties" : {
"verb" : "GET",
"type" : "JSON",
- "url-path" : "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path" : "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id",
"path" : "",
"input-key-mapping" : {
"vnf-id" : "vnf-id"
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/resources_definition_types.json
index 9746fad..748b0db 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/resources_definition_types.json
@@ -87,7 +87,7 @@
"properties" : {
"verb" : "PATCH",
"type" : "JSON",
- "url-path" : "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id/nm-profile-name",
+ "url-path" : "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id/nm-profile-name",
"payload" : "{\"nm-profile-name\":\"$vf-module-id\"}",
"path" : "",
"input-key-mapping" : {
@@ -1426,7 +1426,7 @@
"properties" : {
"verb" : "GET",
"type" : "JSON",
- "url-path" : "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path" : "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id",
"path" : "",
"input-key-mapping" : {
"vnf-id" : "vnf-id"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
index 5f50eaa..ced5dc1 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
@@ -101,7 +101,7 @@
"properties": {
"type": "JSON",
"verb": "GET",
- "url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path": "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id",
"path": "",
"input-key-mapping": {
"vnf-id": "vnf-id"
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Definitions/resources_definition_types.json
index 235a05d..58260b3 100644
--- a/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Definitions/resources_definition_types.json
@@ -28,7 +28,7 @@
"properties" : {
"type" : "JSON",
"verb" : "GET",
- "url-path" : "/aai/v14/network/pnfs/pnf/$pnf-id",
+ "url-path" : "/aai/v21/network/pnfs/pnf/$pnf-id",
"path" : "/ipaddress-v4-oam",
"input-key-mapping" : {
"pnf-id" : "pnf-id"
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Tests/uat.yaml b/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Tests/uat.yaml
index c2fd3f7..9dfe023 100644
--- a/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Tests/uat.yaml
+++ b/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Tests/uat.yaml
@@ -157,7 +157,7 @@
expectations:
- request:
method: GET
- path: [ /aai/v14/network/pnfs/pnf, *pnfId]
+ path: [ /aai/v21/network/pnfs/pnf, *pnfId]
headers:
Accept: application/json
response:
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Definitions/resources_definition_types.json
index d1183f1..600f25a 100644
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Definitions/resources_definition_types.json
@@ -28,7 +28,7 @@
"properties" : {
"type" : "JSON",
"verb" : "GET",
- "url-path" : "/aai/v14/network/pnfs/pnf/$pnf-id",
+ "url-path" : "/aai/v21/network/pnfs/pnf/$pnf-id",
"path" : "/ipaddress-v4-oam",
"input-key-mapping" : {
"pnf-id" : "pnf-id"
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/create-md-sal-vnf-param.json b/components/model-catalog/resource-dictionary/starter-dictionary/create-md-sal-vnf-param.json
index 6f9890b..cd8707c 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/create-md-sal-vnf-param.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/create-md-sal-vnf-param.json
@@ -38,7 +38,7 @@
"properties": {
"verb": "PATCH",
"type": "JSON",
- "url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id/nm-profile-name",
+ "url-path": "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id/nm-profile-name",
"payload": "{\"nm-profile-name\":\"$vf-module-id\"}",
"path": "",
"input-key-mapping": {
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json
index cfca6a7..70aa5da 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json
@@ -17,7 +17,7 @@
"properties": {
"verb": "GET",
"type": "JSON",
- "url-path": "/aai/v14/network/pnfs/pnf/$pnf-id",
+ "url-path": "/aai/v21/network/pnfs/pnf/$pnf-id",
"path": "/pnf-name",
"headers" : {
"Accept": "application/json",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipaddress-aai.json b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipaddress-aai.json
index 9ac0a9c..c33b6d7 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipaddress-aai.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipaddress-aai.json
@@ -13,7 +13,7 @@
"properties": {
"type": "JSON",
"verb": "GET",
- "url-path": "/aai/v14/network/pnfs/pnf/$pnf-id",
+ "url-path": "/aai/v21/network/pnfs/pnf/$pnf-id",
"path": "/ipaddress-v4-oam",
"input-key-mapping": {
"pnf-id": "pnf-id"
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_vf_module_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_vf_module_id.json
index e093a77..303ebb3 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_vf_module_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_vf_module_id.json
@@ -37,7 +37,7 @@
"properties": {
"verb": "GET",
"type": "JSON",
- "url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path": "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id",
"path": "",
"input-key-mapping": {
"vnf-id": "vnf-id"
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-assign.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-assign.json
index 6c8e226..c672969 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-assign.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-assign.json
@@ -16,7 +16,7 @@
"headers": {
"Content-Type": "application/merge-patch+json"
},
- "url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id/vf-modules/vf-module/$vf-module-id",
+ "url-path": "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id/vf-modules/vf-module/$vf-module-id",
"payload": "{\r\n\"vf-module-name\":\"${vf-module-name}\", \r\n\"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/${service-instance-id}/service-data/vnfs/vnf/${vnf-id}/vnf-data/vf-modules/vf-module/${vf-module-id}/vf-module-data/vf-module-topology/\"\r\n \r\n}",
"path": "",
"input-key-mapping": {
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_assign_aai.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_assign_aai.json
index 9408d29..7297869 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_assign_aai.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_assign_aai.json
@@ -16,7 +16,7 @@
"headers": {
"Content-Type": "application/merge-patch+json"
},
- "url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path": "/aai/v21/network/generic-vnfs/generic-vnf/$vnf-id",
"payload": "{\r\n\"vnf-name\":\"${vnf_name}\", \r\n \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/${service-instance-id}/service-data/vnfs/vnf/${vnf-id}/vnf-data/vnf-topology/\"\r\n}",
"path": "",
"input-key-mapping": {
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/mock/MockBlueprintWebClientService.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/mock/MockBlueprintWebClientService.kt
index 53db756..3160174 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/mock/MockBlueprintWebClientService.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/mock/MockBlueprintWebClientService.kt
@@ -40,7 +40,7 @@
headers = defaultHeaders()
// Create expected requests and responses
- setRequest("GET", "/aai/v14/network/generic-vnfs/generic-vnf/123456")
+ setRequest("GET", "/aai/v21/network/generic-vnfs/generic-vnf/123456")
setRequest(
"GET",
"/config/GENERIC-RESOURCE-API:services/service/10/service-data/vnfs/vnf/123456/" +
diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestClientServiceTest.kt b/ms/blueprintsprocessor/modules/commons/rest-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestClientServiceTest.kt
index 74e3807..f38c188 100644
--- a/ms/blueprintsprocessor/modules/commons/rest-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestClientServiceTest.kt
+++ b/ms/blueprintsprocessor/modules/commons/rest-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestClientServiceTest.kt
@@ -222,7 +222,7 @@
val get1 = async(start = CoroutineStart.LAZY) {
restClientService.exchangeNB(
HttpMethod.GET.name,
- "/sample/aai/v14/business/customers", "", headers,
+ "/sample/aai/v21/business/customers", "", headers,
Customer::class.java
).body
}
@@ -230,7 +230,7 @@
val get2 = async(start = CoroutineStart.LAZY) {
restClientService.exchangeNB(
HttpMethod.GET.name,
- "/sample/aai/v14/business/customers", "", headers,
+ "/sample/aai/v21/business/customers", "", headers,
Customer::class.java
).body
}
@@ -238,7 +238,7 @@
val post = async(start = CoroutineStart.LAZY) {
restClientService.exchangeNB(
HttpMethod.POST.name,
- "/sample/aai/v14/business/customers", post1, headers,
+ "/sample/aai/v21/business/customers", post1, headers,
String::class.java
).body
}
@@ -246,7 +246,7 @@
val put = async(start = CoroutineStart.LAZY) {
restClientService.exchangeNB(
HttpMethod.PUT.name,
- "/sample/aai/v14/business/customers", post1, headers,
+ "/sample/aai/v21/business/customers", post1, headers,
String::class.java
).body
}
@@ -254,7 +254,7 @@
val patch = async(start = CoroutineStart.LAZY) {
restClientService.exchangeNB(
HttpMethod.PATCH.name,
- "/sample/aai/v14/business/customers", post1, headers,
+ "/sample/aai/v21/business/customers", post1, headers,
String::class.java
).body
}
@@ -262,7 +262,7 @@
val delete = async(start = CoroutineStart.LAZY) {
restClientService.exchangeNB(
HttpMethod.DELETE.name,
- "/sample/aai/v14/business/customers", "", headers,
+ "/sample/aai/v21/business/customers", "", headers,
String::class.java
).body
}
@@ -321,7 +321,7 @@
@GetMapping("/basic")
fun getBasic(): String = "Basic request arrived successfully"
- @GetMapping("/aai/v14/business/customers")
+ @GetMapping("/aai/v21/business/customers")
fun getAaiCustomers(
@RequestHeader(name = "X-TransactionId", required = true)
transId: String,
@@ -339,7 +339,7 @@
"}"
}
- @PostMapping("/aai/v14/business/customers")
+ @PostMapping("/aai/v21/business/customers")
fun postAaiCustomers(
@RequestHeader(name = "X-TransactionId", required = true)
transId: String,
@@ -352,7 +352,7 @@
return "The message is successfully posted"
}
- @PutMapping("/aai/v14/business/customers")
+ @PutMapping("/aai/v21/business/customers")
fun putAaiCustomers(
@RequestHeader(name = "X-TransactionId", required = true)
transId: String,
@@ -365,7 +365,7 @@
return "The put request is success"
}
- @PatchMapping("/aai/v14/business/customers")
+ @PatchMapping("/aai/v21/business/customers")
fun patchAaiCustomers(
@RequestHeader(name = "X-TransactionId", required = true)
transId: String,
@@ -378,7 +378,7 @@
return "The patch request is success"
}
- @DeleteMapping("/aai/v14/business/customers")
+ @DeleteMapping("/aai/v21/business/customers")
fun deleteAaiCustomers(
@RequestHeader(name = "X-TransactionId", required = true)
transId: String,