diff options
16 files changed, 31 insertions, 31 deletions
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 4c74b4810..54eeaaca0 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 3501dbf3d..dec2de709 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 9746fad9a..748b0db8f 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 9746fad9a..748b0db8f 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 5f50eaa51..ced5dc101 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 235a05d27..58260b3cf 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 c2fd3f788..9dfe02372 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 @@ external-services: 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 d1183f14b..600f25aa3 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 6f9890b21..cd8707c69 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 cfca6a7da..70aa5dac5 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 9ac0a9c10..c33b6d701 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 e093a77d9..303ebb3bd 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 6c8e226fb..c67296937 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 9408d2902..729786905 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 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, |