aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorKAPIL SINGAL <ks220y@att.com>2020-10-21 13:12:53 +0000
committerGerrit Code Review <gerrit@onap.org>2020-10-21 13:12:53 +0000
commita6b53aac7ee7c2b201689dc7d0755d9dc3c01083 (patch)
tree6aeaab7b5f042298b3d8b7c3f2ad6c725edd36f0 /components
parent94e008c6ed3a9ff9c3adca069208a638f11988f3 (diff)
parent6b84093088b77a10764693760d83541b64e3d784 (diff)
Merge "Update AAI endpoints to /aai/v22 for Honolulu"
Diffstat (limited to 'components')
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json2
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json8
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/resources_definition_types.json4
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/resources_definition_types.json4
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json2
-rw-r--r--components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Definitions/resources_definition_types.json2
-rw-r--r--components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Tests/uat.yaml2
-rw-r--r--components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Definitions/resources_definition_types.json2
-rw-r--r--components/model-catalog/resource-dictionary/starter-dictionary/create-md-sal-vnf-param.json2
-rwxr-xr-xcomponents/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json2
-rwxr-xr-xcomponents/model-catalog/resource-dictionary/starter-dictionary/pnf-ipaddress-aai.json2
-rw-r--r--components/model-catalog/resource-dictionary/starter-dictionary/vdns_vf_module_id.json2
-rw-r--r--components/model-catalog/resource-dictionary/starter-dictionary/vf-module-assign.json2
-rw-r--r--components/model-catalog/resource-dictionary/starter-dictionary/vnf_assign_aai.json2
14 files changed, 19 insertions, 19 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 54eeaaca0..43782a4a2 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/v21/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path" : "/aai/v22/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 dec2de709..aee10fe2f 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/v21/network/generic-vnfs/generic-vnf/$vnf-id/nm-profile-name",
+ "url-path" : "/aai/v22/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/v21/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path" : "/aai/v22/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/v21/network/generic-vnfs/generic-vnf/$vnf-id/vf-modules/vf-module/$vf-module-id",
+ "url-path" : "/aai/v22/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/v21/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path" : "/aai/v22/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 748b0db8f..d98aae86b 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/v21/network/generic-vnfs/generic-vnf/$vnf-id/nm-profile-name",
+ "url-path" : "/aai/v22/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/v21/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path" : "/aai/v22/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 748b0db8f..d98aae86b 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/v21/network/generic-vnfs/generic-vnf/$vnf-id/nm-profile-name",
+ "url-path" : "/aai/v22/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/v21/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path" : "/aai/v22/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 ced5dc101..523329d95 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/v21/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path": "/aai/v22/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 58260b3cf..8cfebdb05 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/v21/network/pnfs/pnf/$pnf-id",
+ "url-path" : "/aai/v22/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 9dfe02372..bd005fd55 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/v21/network/pnfs/pnf, *pnfId]
+ path: [ /aai/v22/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 600f25aa3..8db0cee04 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/v21/network/pnfs/pnf/$pnf-id",
+ "url-path" : "/aai/v22/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 cd8707c69..be01c98c0 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/v21/network/generic-vnfs/generic-vnf/$vnf-id/nm-profile-name",
+ "url-path": "/aai/v22/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 70aa5dac5..895c6a954 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/v21/network/pnfs/pnf/$pnf-id",
+ "url-path": "/aai/v22/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 c33b6d701..9165d9910 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/v21/network/pnfs/pnf/$pnf-id",
+ "url-path": "/aai/v22/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 303ebb3bd..75a348415 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/v21/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path": "/aai/v22/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 c67296937..9108ef8a6 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/v21/network/generic-vnfs/generic-vnf/$vnf-id/vf-modules/vf-module/$vf-module-id",
+ "url-path": "/aai/v22/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 729786905..133df841b 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/v21/network/generic-vnfs/generic-vnf/$vnf-id",
+ "url-path": "/aai/v22/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": {