Update aai schema to v19

In order to use orchestration-type in "Browse SDC Service Models", newer schema version is needed.
Moreover v19 is recomended versino in Frankfurt releas https://wiki.onap.org/display/DW/AAI+REST+API+Documentation+-+Frankfurt.

Issue-ID: VID-602
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Change-Id: Ib9bf098b19e62ed5868909c043cd7df0c1a4caf6

diff --git a/docs/consumedapis.rst b/docs/consumedapis.rst
index e9c219a..e1a7227 100644 (file)
--- a/docs/consumedapis.rst
+++ b/docs/consumedapis.rst
@@ -66,33 +66,33 @@ A&AI
 
 +-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
 | GET                                                                                                                           | Get all subscribers                                                    |
-|   aai/v16/business/customers?subscriber-type=INFRA&depth=2                                                                    |                                                                        |
+|   aai/v19/business/customers?subscriber-type=INFRA&depth=2                                                                    |                                                                        |
 +-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
-| GET aai/v16/                                                                                                                  | Get data for a specific subscriber including its available services    |
+| GET aai/v19/                                                                                                                  | Get data for a specific subscriber including its available services    |
 |   business/customers/customer/<global_customer_id>                                                                            |                                                                        |
 +-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
 | GET                                                                                                                           | Get all service types                                                  |
-|   aai/v16/service-design-and-creation/services                                                                                |                                                                        |
+|   aai/v19/service-design-and-creation/services                                                                                |                                                                        |
 +-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
 | GET                                                                                                                           | Get services by owner entity id                                        |
-|   aai/v16/business/owning-entities?<owning_entitiy_ids>                                                                       |                                                                        |
+|   aai/v19/business/owning-entities?<owning_entitiy_ids>                                                                       |                                                                        |
 +-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
 | GET                                                                                                                           | Get services by project name                                           |
-|   aai/v16/business/projects?<project-names>                                                                                   |                                                                        |
+|   aai/v19/business/projects?<project-names>                                                                                   |                                                                        |
 +-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
-| GET aai/v16/network/zones                                                                                                     | Get all AIC zones                                                      |
+| GET aai/v19/network/zones                                                                                                     | Get all AIC zones                                                      |
 +-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
 | POST search/named-query                                                                                                       | Get data regarding an instance and the instance's related nodes        |
 +-------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------+
-| GET aai/v16/                                                                                                                  | Get AIC zones for a specific service instance                          |
+| GET aai/v19/                                                                                                                  | 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/v16/query?format=simple(types:                                                                                        | This is a custom query and has multiple types(declared in the url line)|
+| PUT aai/v19/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/v16/                                                                                                                      | Get the human readable version by version id                           |
+| aai/v19/                                                                                                                      | 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.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
index 41e50c3..231e3e1 100755 (executable)
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
@@ -65,7 +65,7 @@ role_management_activated = true
 
 #aai related properties
 aai.server.url.base=http://localhost:1080/aai/
-aai.server.url=http://localhost:1080/aai/v14/
+aai.server.url=http://localhost:1080/aai/v19/
 aai.truststore.filename=tomcat_keystore
 aai.truststore.passwd.x=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp
 aai.keystore.filename=tomcat_keystore

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 5d8a340..8ca30a3 100755 (executable)
--- 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,7 +63,7 @@ role_management_activated = false
 
 #aai related properties
 aai.server.url.base=${VID_AAI_URL}/aai/
-aai.server.url=${VID_AAI_URL}/aai/v16/
+aai.server.url=${VID_AAI_URL}/aai/v19/
 aai.truststore.filename=${AAI_TRUSTSTORE_FILENAME}
 aai.truststore.passwd.x=${AAI_TRUSTSTORE_PASSWD_X}
 aai.keystore.filename=${AAI_KEYSTORE_FILENAME}