From f45e1087ad03c0efe9547319e06df71328fa9c43 Mon Sep 17 00:00:00 2001 From: Lasse Kaihlavirta Date: Tue, 20 Oct 2020 18:12:07 +0300 Subject: Update AAI endpoints to /aai/v21 - 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 Change-Id: I6b150348b66e93b3d08ceaa49fa997d531ddb0e4 (cherry picked from commit bd6a6482f87626b4f1e49aa12e36e41a2e140168) --- .../mock/MockBlueprintWebClientService.kt | 2 +- .../rest/service/RestClientServiceTest.kt | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'ms/blueprintsprocessor') 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 53db7563f..316017415 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 @@ class MockBlueprintWebClientService(private var restClientProperties: RestClient 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 74e3807f7..f38c188a0 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 @@ class RestClientServiceTest { 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 @@ class RestClientServiceTest { 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 @@ class RestClientServiceTest { 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 @@ class RestClientServiceTest { 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 @@ class RestClientServiceTest { 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 @@ class RestClientServiceTest { 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 @@ open class SampleController { @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 @@ open class SampleController { "}" } - @PostMapping("/aai/v14/business/customers") + @PostMapping("/aai/v21/business/customers") fun postAaiCustomers( @RequestHeader(name = "X-TransactionId", required = true) transId: String, @@ -352,7 +352,7 @@ open class SampleController { 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 @@ open class SampleController { 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 @@ open class SampleController { 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, -- cgit 1.2.3-korg