From 018883bdca2dedf22035af93d56a65f10c463776 Mon Sep 17 00:00:00 2001 From: "Lawrance, Edwin" Date: Wed, 28 Mar 2018 14:55:03 +0100 Subject: Updates to Model Loader test-config Updated ml properties and added babel client cert Change-Id: I069a93d66c5df5484d01f07be71a84a1ec774a3f Issue-ID: AAI-950 Signed-off-by: Lawrance, Edwin --- model-loader/appconfig/auth/babel-client-cert.p12 | Bin 0 -> 2556 bytes model-loader/appconfig/model-loader.properties | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 model-loader/appconfig/auth/babel-client-cert.p12 diff --git a/model-loader/appconfig/auth/babel-client-cert.p12 b/model-loader/appconfig/auth/babel-client-cert.p12 new file mode 100644 index 0000000..dbf4fca Binary files /dev/null and b/model-loader/appconfig/auth/babel-client-cert.p12 differ diff --git a/model-loader/appconfig/model-loader.properties b/model-loader/appconfig/model-loader.properties index b2db044..ee3ff7b 100644 --- a/model-loader/appconfig/model-loader.properties +++ b/model-loader/appconfig/model-loader.properties @@ -5,19 +5,24 @@ ml.distribution.CONSUMER_GROUP=aai-ml-group ml.distribution.CONSUMER_ID=aai-ml ml.distribution.ENVIRONMENT_NAME=AUTO ml.distribution.KEYSTORE_PASSWORD= -ml.distribution.KEYSTORE_FILE=asdc-client.jks +ml.distribution.KEYSTORE_FILE= ml.distribution.PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp ml.distribution.POLLING_INTERVAL=30 ml.distribution.POLLING_TIMEOUT=20 ml.distribution.USER=aai ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG +ml.distribution.MSG_BUS_ADDRESSES= # Model Loader AAI REST Client Configuration ml.aai.BASE_URL=https://c1.vm1.aai.simpledemo.openecomp.org:8443 -ml.aai.MODEL_URL=/aai/v10/service-design-and-creation/models/model/ -ml.aai.NAMED_QUERY_URL=/aai/v10/service-design-and-creation/named-queries/named-query/ -ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images +ml.aai.MODEL_URL=/aai/v*/service-design-and-creation/models/model/ +ml.aai.NAMED_QUERY_URL=/aai/v*/service-design-and-creation/named-queries/named-query/ +ml.aai.VNF_IMAGE_URL=/aai/v*/service-design-and-creation/vnf-images ml.aai.KEYSTORE_FILE=aai-os-cert.p12 -ml.aai.KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o -ml.aai.AUTH_USER=ModelLoader -ml.aai.AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw +ml.aai.KEYSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 + +# Model Loader Babel REST Client Configuration +ml.babel.BASE_URL=https://c1.vm1.aai.simpledemo.openecomp.org:9516 +ml.babel.GENERATE_ARTIFACTS_URL=/services/babel-service/v1/app/generateArtifacts +ml.babel.KEYSTORE_FILE=babel-client-cert.p12 +ml.babel.KEYSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 \ No newline at end of file -- cgit 1.2.3-korg