- Update all /aai/v14 references to /aai/v21 to resolve certificate
problems in CDS when trying to resolve attribute values with aai-data source
Issue-ID: CCSDK-2914
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: I6b150348b66e93b3d08ceaa49fa997d531ddb0e4
16 files changed:
"properties" : {
"type" : "JSON",
"verb" : "GET",
"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"
"path" : "",
"input-key-mapping" : {
"vnf-id" : "vnf-id"
"properties" : {
"verb" : "PATCH",
"type" : "JSON",
"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" : {
"payload" : "{\"nm-profile-name\":\"$vf-module-id\"}",
"path" : "",
"input-key-mapping" : {
"properties" : {
"verb" : "GET",
"type" : "JSON",
"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"
"path" : "",
"input-key-mapping" : {
"vnf-id" : "vnf-id"
"headers" : {
"Content-Type" : "application/merge-patch+json"
},
"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" : {
"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" : {
"headers" : {
"Content-Type" : "application/merge-patch+json"
},
"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" : {
"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" : {
"properties" : {
"verb" : "PATCH",
"type" : "JSON",
"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" : {
"payload" : "{\"nm-profile-name\":\"$vf-module-id\"}",
"path" : "",
"input-key-mapping" : {
"properties" : {
"verb" : "GET",
"type" : "JSON",
"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"
"path" : "",
"input-key-mapping" : {
"vnf-id" : "vnf-id"
"properties" : {
"verb" : "PATCH",
"type" : "JSON",
"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" : {
"payload" : "{\"nm-profile-name\":\"$vf-module-id\"}",
"path" : "",
"input-key-mapping" : {
"properties" : {
"verb" : "GET",
"type" : "JSON",
"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"
"path" : "",
"input-key-mapping" : {
"vnf-id" : "vnf-id"
"properties": {
"type": "JSON",
"verb": "GET",
"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"
"path": "",
"input-key-mapping": {
"vnf-id": "vnf-id"
"properties" : {
"type" : "JSON",
"verb" : "GET",
"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"
"path" : "/ipaddress-v4-oam",
"input-key-mapping" : {
"pnf-id" : "pnf-id"
expectations:
- request:
method: GET
expectations:
- request:
method: GET
- path: [ /aai/v14/network/pnfs/pnf, *pnfId]
+ path: [ /aai/v21/network/pnfs/pnf, *pnfId]
headers:
Accept: application/json
response:
headers:
Accept: application/json
response:
"properties" : {
"type" : "JSON",
"verb" : "GET",
"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"
"path" : "/ipaddress-v4-oam",
"input-key-mapping" : {
"pnf-id" : "pnf-id"
"properties": {
"verb": "PATCH",
"type": "JSON",
"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": {
"payload": "{\"nm-profile-name\":\"$vf-module-id\"}",
"path": "",
"input-key-mapping": {
"properties": {
"verb": "GET",
"type": "JSON",
"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",
"path": "/pnf-name",
"headers" : {
"Accept": "application/json",
"properties": {
"type": "JSON",
"verb": "GET",
"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"
"path": "/ipaddress-v4-oam",
"input-key-mapping": {
"pnf-id": "pnf-id"
"properties": {
"verb": "GET",
"type": "JSON",
"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"
"path": "",
"input-key-mapping": {
"vnf-id": "vnf-id"
"headers": {
"Content-Type": "application/merge-patch+json"
},
"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": {
"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": {
"headers": {
"Content-Type": "application/merge-patch+json"
},
"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": {
"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": {
headers = defaultHeaders()
// Create expected requests and responses
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/" +
setRequest(
"GET",
"/config/GENERIC-RESOURCE-API:services/service/10/service-data/vnfs/vnf/123456/" +
val get1 = async(start = CoroutineStart.LAZY) {
restClientService.exchangeNB(
HttpMethod.GET.name,
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
}
Customer::class.java
).body
}
val get2 = async(start = CoroutineStart.LAZY) {
restClientService.exchangeNB(
HttpMethod.GET.name,
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
}
Customer::class.java
).body
}
val post = async(start = CoroutineStart.LAZY) {
restClientService.exchangeNB(
HttpMethod.POST.name,
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
}
String::class.java
).body
}
val put = async(start = CoroutineStart.LAZY) {
restClientService.exchangeNB(
HttpMethod.PUT.name,
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
}
String::class.java
).body
}
val patch = async(start = CoroutineStart.LAZY) {
restClientService.exchangeNB(
HttpMethod.PATCH.name,
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
}
String::class.java
).body
}
val delete = async(start = CoroutineStart.LAZY) {
restClientService.exchangeNB(
HttpMethod.DELETE.name,
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
}
String::class.java
).body
}
@GetMapping("/basic")
fun getBasic(): String = "Basic request arrived successfully"
@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,
fun getAaiCustomers(
@RequestHeader(name = "X-TransactionId", required = true)
transId: String,
- @PostMapping("/aai/v14/business/customers")
+ @PostMapping("/aai/v21/business/customers")
fun postAaiCustomers(
@RequestHeader(name = "X-TransactionId", required = true)
transId: String,
fun postAaiCustomers(
@RequestHeader(name = "X-TransactionId", required = true)
transId: String,
return "The message is successfully posted"
}
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,
fun putAaiCustomers(
@RequestHeader(name = "X-TransactionId", required = true)
transId: String,
return "The put request is success"
}
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,
fun patchAaiCustomers(
@RequestHeader(name = "X-TransactionId", required = true)
transId: String,
return "The patch request is success"
}
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,
fun deleteAaiCustomers(
@RequestHeader(name = "X-TransactionId", required = true)
transId: String,