summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2020-03-04 12:20:33 +0200
committerIttay Stern <ittay.stern@att.com>2020-03-04 12:20:33 +0200
commit03658e97c41cce22f20ac04d69038103089b4f05 (patch)
tree24bf95e85232ebb42b85b0d4d9d8ffa8609108b6
parent2b0c105bd2316f43f4a66d2500f3d2410c33ef69 (diff)
Upgrade AAI API version to v166.0.3
v16 is the recommended Dublin version: https://wiki.onap.org/display/DW/AAI+REST+API+Documentation+-+Dublin Issue-ID: VID-365 Change-Id: I3c84525382477d453dcdc0e5c1e061dc41526dc0 Signed-off-by: Ittay Stern <ittay.stern@att.com>
-rw-r--r--docs/consumedapis.rst18
-rwxr-xr-xepsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties4
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/util/AAIProperties.java6
-rw-r--r--vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_service_model_by_uuid.json2
-rw-r--r--vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_vlb_service_instances.json2
5 files changed, 12 insertions, 20 deletions
diff --git a/docs/consumedapis.rst b/docs/consumedapis.rst
index 14c49af71..e9c219a70 100644
--- a/docs/consumedapis.rst
+++ b/docs/consumedapis.rst
@@ -66,33 +66,33 @@ A&AI
+-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
| GET | Get all subscribers |
-| aai/v13/business/customers?subscriber-type=INFRA&depth=2 | |
+| aai/v16/business/customers?subscriber-type=INFRA&depth=2 | |
+-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
-| GET aai/v13/ | Get data for a specific subscriber including its available services |
+| GET aai/v16/ | Get data for a specific subscriber including its available services |
| business/customers/customer/<global_customer_id> | |
+-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
| GET | Get all service types |
-| aai/v13/service-design-and-creation/services | |
+| aai/v16/service-design-and-creation/services | |
+-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
| GET | Get services by owner entity id |
-| aai/v13/business/owning-entities?<owning_entitiy_ids> | |
+| aai/v16/business/owning-entities?<owning_entitiy_ids> | |
+-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
| GET | Get services by project name |
-| aai/v13/business/projects?<project-names> | |
+| aai/v16/business/projects?<project-names> | |
+-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
-| GET aai/v13/network/zones | Get all AIC zones |
+| GET aai/v16/network/zones | Get all AIC zones |
+-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
| POST search/named-query | Get data regarding an instance and the instance's related nodes |
+-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
-| GET aai/v13/ | Get AIC zones for a specific service instance |
+| GET aai/v16/ | Get AIC zones for a specific service instance |
| business/customers/customer/<global_customer_id>/ | |
| /service-subscriptions/service-subscription/<service_type>/service-instances/service-instance/<service_instance_id> | |
+-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
-| PUT Aai/v13/query?format=simple(types: | This is a custom query and has multiple types(declared in the url line)|
+| PUT aai/v16/query?format=simple(types: | This is a custom query and has multiple types(declared in the url line)|
| “query/vnfFromModelbyRegion?cloudRegionId”,” | |
| vnf-topology-fromServiceInstance”) | |
+-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
-| Aai/v13/ | Get the human readable version by version id |
+| aai/v16/ | Get the human readable version by version id |
| service-design-and-creation/models?depth=2 | |
+-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
| business/customers/customer/<global_customer_id>/service-subscriptions/service-subscription/<service_Subscription_Id>?depth=0 | Get all service subscriptions |
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
index 1e8a0ba15..5d8a340a5 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
@@ -63,9 +63,7 @@ role_management_activated = false
#aai related properties
aai.server.url.base=${VID_AAI_URL}/aai/
-aai.server.url=${VID_AAI_URL}/aai/v13/
-aai.oldserver.url.base=${VID_AAI_URL}/aai/servers/
-aai.oldserver.url=${VID_AAI_URL}/aai/servers/v3/
+aai.server.url=${VID_AAI_URL}/aai/v16/
aai.truststore.filename=${AAI_TRUSTSTORE_FILENAME}
aai.truststore.passwd.x=${AAI_TRUSTSTORE_PASSWD_X}
aai.keystore.filename=${AAI_KEYSTORE_FILENAME}
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIProperties.java b/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIProperties.java
index 114ec802e..767cf5dca 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIProperties.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIProperties.java
@@ -35,12 +35,6 @@ public class AAIProperties extends SystemProperties {
/** The Constant AAI_SERVER_URL. */
public static final String AAI_SERVER_URL = "aai.server.url";
- /** The Constant AAI_OLDSERVER_URL_BASE. */
- public static final String AAI_OLDSERVER_URL_BASE = "aai.oldserver.url.base";
-
- /** The Constant AAI_OLDSERVER_URL. */
- public static final String AAI_OLDSERVER_URL = "aai.oldserver.url";
-
/** The Constant AAI_TRUSTSTORE_FILENAME. */
public static final String AAI_TRUSTSTORE_FILENAME = "aai.truststore.filename";
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_service_model_by_uuid.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_service_model_by_uuid.json
index bd6952871..98759c09b 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_service_model_by_uuid.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_service_model_by_uuid.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "GET",
- "path": "/aai/v13/service-design-and-creation/models",
+ "path": "/aai/v../service-design-and-creation/models",
"queryParams": {
"depth": [
"2"
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_vlb_service_instances.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_vlb_service_instances.json
index 5e998e3a8..f14dc1aa6 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_vlb_service_instances.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_vlb_service_instances.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "PUT",
- "path": "/aai/v13/query",
+ "path": "/aai/v../query",
"queryParams": {
"format": ["simple"]
},