From abe16d208c3a76040ff3b49f459e331dd5bd9c9f Mon Sep 17 00:00:00 2001 From: Venkata Harish K Kajur Date: Mon, 22 May 2017 11:53:58 -0400 Subject: Update the ajsc to use 2.1.0 for all dependencies Add the named query jsons that was rejected due to another problem Update the necessary files to make it compatible with ajsc 2.1.0 Change-Id: I4f26e21ef69edff1003a21ead849d10c9cbb8e3a Signed-off-by: Venkata Harish K Kajur --- .../appprops/PostProcessorInterceptors.properties | 2 +- .../appprops/PreProcessorInterceptors.properties | 2 +- .../etc/appprops/aaiconfig.properties | 10 +- .../closed-loop-named-query-1.0.json | 78 +++++++++++++++ .../getServiceInstanceModel-1.0.json | 72 ++++++++++++++ .../named-query-json/getVserver-1.0.json | 105 +++++++++++++++++++++ 6 files changed, 264 insertions(+), 5 deletions(-) create mode 100644 aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json create mode 100644 aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getServiceInstanceModel-1.0.json create mode 100644 aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getVserver-1.0.json (limited to 'aai-traversal/bundleconfig-local/etc') diff --git a/aai-traversal/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties b/aai-traversal/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties index f4fed40..29f5f7c 100644 --- a/aai-traversal/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties +++ b/aai-traversal/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties @@ -1,3 +1,3 @@ #This properties file is for defining any PostProcessorInterceptors that have been created for your AJSC service. -/**=ajsc.beans.interceptors.CsiPostInterceptor,org.openecomp.aai.interceptors.PostAaiAjscInterceptor +/**=org.openecomp.aai.interceptors.PostAaiAjscInterceptor diff --git a/aai-traversal/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties b/aai-traversal/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties index a6dfe01..e803374 100644 --- a/aai-traversal/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties +++ b/aai-traversal/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties @@ -1,3 +1,3 @@ #This properties file is for defining any PreProcessorInterceptors that have been created for your AJSC service. -/**=com.att.ajsc.csi.restmethodmap.RestMethodMapInterceptor,ajsc.beans.interceptors.CsiPreInterceptor,org.openecomp.aai.interceptors.PreAaiAjscInterceptor +/**=com.att.ajsc.csi.restmethodmap.RestMethodMapInterceptor,org.openecomp.aai.interceptors.PreAaiAjscInterceptor diff --git a/aai-traversal/bundleconfig-local/etc/appprops/aaiconfig.properties b/aai-traversal/bundleconfig-local/etc/appprops/aaiconfig.properties index a24c341..4cbbd38 100644 --- a/aai-traversal/bundleconfig-local/etc/appprops/aaiconfig.properties +++ b/aai-traversal/bundleconfig-local/etc/appprops/aaiconfig.properties @@ -21,9 +21,13 @@ aai.transaction.logging=true aai.transaction.logging.get=true aai.transaction.logging.post=true -aai.server.url.base=https://localhost:8446/aai/ -aai.server.url=https://localhost:8446/aai/v10/ -aai.global.callback.url=https://localhost:8446/aai/ +aai.tools.enableBasicAuth=true +aai.tools.username=AAI +aai.tools.password=AAI + +aai.server.url.base=https://localhost:8443/aai/ +aai.server.url=https://localhost:8443/aai/v10/ +aai.global.callback.url=https://localhost:8443/aai/ aai.auth.cspcookies_on=false aai.dbmodel.filename=ex5.json diff --git a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json new file mode 100644 index 0000000..c9b463e --- /dev/null +++ b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json @@ -0,0 +1,78 @@ +{ + "named-query-uuid" : "4ff56a54-9e3f-46b7-a337-07a1d3c6b469", + "named-query-name" : "closed-loop-named-query", + "named-query-version" : "1.0", + "description" : "Named Query - For closed loop flow", + "named-query-elements" : { + "named-query-element" : [ { + "named-query-elements" : { + "named-query-element" : [ { + "named-query-elements" : { + "named-query-element" : [ { + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "2a160989-b202-47dd-874b-4a0f275998f7" + } ] + } ] + } + } ] + }, + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "abcc54bc-bb74-49dc-9043-7f7171707545" + } ] + } ] + } + }, { + "named-query-elements" : { + "named-query-element" : [ { + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "c00563ae-812b-4e62-8330-7c4d0f47088a" + } ] + } ] + } + }, { + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "46b92144-923a-4d20-b85a-3cbd847668a9" + } ] + } ] + } + } ] + }, + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "93a6166f-b3d5-4f06-b4ba-aed48d009ad9" + } ] + } ] + } + } ] + }, + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "8ecb2c5d-7176-4317-a255-26274edfdd53" + } ] + } ] + } + } ] + } +} \ No newline at end of file diff --git a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getServiceInstanceModel-1.0.json b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getServiceInstanceModel-1.0.json new file mode 100644 index 0000000..aaee8d9 --- /dev/null +++ b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getServiceInstanceModel-1.0.json @@ -0,0 +1,72 @@ +{ + "named-query-uuid" : "3fb4d3d3-36c1-4162-9fe9-3e2c68a9da81", + "named-query-name" : "getServiceInstanceModel-1.0", + "named-query-version" : "1.0", + "description" : "Named query - Get service instance model", + "named-query-elements" : { + "named-query-element" : [ { + "named-query-elements" : { + "named-query-element" : [ { + "named-query-elements" : { + "named-query-element" : [ { + "related-lookups" : { + "related-lookup" : [ { + "source-node-type" : "vf-module", + "source-node-property" : "persona-model-id", + "target-node-type" : "model", + "target-node-property" : "model-id", + "property-collect-list" : [ "model-name-version-id", "model-type", "model-name", "model-id", "model-version" ] + } ] + }, + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "c00563ae-812b-4e62-8330-7c4d0f47088a" + } ] + } ] + } + } ] + }, + "related-lookups" : { + "related-lookup" : [ { + "source-node-type" : "generic-vnf", + "source-node-property" : "persona-model-id", + "target-node-type" : "model", + "target-node-property" : "model-id", + "property-collect-list" : [ "model-name-version-id", "model-type", "model-name", "model-id", "model-version" ] + } ] + }, + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "93a6166f-b3d5-4f06-b4ba-aed48d009ad9" + } ] + } ] + } + } ] + }, + "related-lookups" : { + "related-lookup" : [ { + "source-node-type" : "service-instance", + "source-node-property" : "persona-model-id", + "target-node-type" : "model", + "target-node-property" : "model-id", + "property-collect-list" : [ "model-name-version-id", "model-type", "model-name", "model-id", "model-version" ] + } ] + }, + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "46b92144-923a-4d20-b85a-3cbd847668a9" + } ] + } ] + } + } ] + } +} \ No newline at end of file diff --git a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getVserver-1.0.json b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getVserver-1.0.json new file mode 100644 index 0000000..624a4ec --- /dev/null +++ b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getVserver-1.0.json @@ -0,0 +1,105 @@ +{ + "named-query-uuid" : "f199cb88-5e69-4b1f-93e0-6f257877d066", + "named-query-name" : "getVserver-1.0", + "named-query-version" : "1.0", + "description" : "Named query - Get vserver", + "named-query-elements" : { + "named-query-element" : [ { + "named-query-elements" : { + "named-query-element" : [ { + "named-query-elements" : { + "named-query-element" : [ { + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "2a160989-b202-47dd-874b-4a0f275998f7" + } ] + } ] + } + } ] + }, + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "abcc54bc-bb74-49dc-9043-7f7171707545" + } ] + } ] + } + }, { + "named-query-elements" : { + "named-query-element" : [ { + "related-lookups" : { + "related-lookup" : [ { + "source-node-type" : "vf-module", + "source-node-property" : "persona-model-id", + "target-node-type" : "model", + "target-node-property" : "model-id", + "property-collect-list" : [ "model-name-version-id", "model-type", "model-name", "model-id", "model-version" ] + } ] + }, + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "c00563ae-812b-4e62-8330-7c4d0f47088a" + } ] + } ] + } + }, { + "related-lookups" : { + "related-lookup" : [ { + "source-node-type" : "service-instance", + "source-node-property" : "persona-model-id", + "target-node-type" : "model", + "target-node-property" : "model-id", + "property-collect-list" : [ "model-name-version-id", "model-type", "model-name", "model-id", "model-version" ] + } ] + }, + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "46b92144-923a-4d20-b85a-3cbd847668a9" + } ] + } ] + } + } ] + }, + "related-lookups" : { + "related-lookup" : [ { + "source-node-type" : "generic-vnf", + "source-node-property" : "persona-model-id", + "target-node-type" : "model", + "target-node-property" : "model-id", + "property-collect-list" : [ "model-name-version-id", "model-type", "model-name", "model-id", "model-version" ] + } ] + }, + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "93a6166f-b3d5-4f06-b4ba-aed48d009ad9" + } ] + } ] + } + } ] + }, + "relationship-list" : { + "relationship" : [ { + "related-to" : "model", + "relationship-data" : [ { + "relationship-key" : "model.model-name-version-id", + "relationship-value" : "8ecb2c5d-7176-4317-a255-26274edfdd53" + } ] + } ] + } + } ] + } +} \ No newline at end of file -- cgit 1.2.3-korg