From be9fac943289592e1620bfa0db37a77c8cfcd24a Mon Sep 17 00:00:00 2001
From: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
Date: Tue, 24 Apr 2018 20:06:14 +0000
Subject: [PATCH] Add new model loader config parameters

Change-Id: I347f78d8d911664befcf35dbf1c5edd56b493a66
Issue-ID: AAI-1094
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
---
 .../resources/config/auth/babel-client-cert.p12          | Bin 0 -> 2556 bytes
 .../resources/config/model-loader.properties             |  15 +++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 kubernetes/aai/charts/aai-modelloader/resources/config/auth/babel-client-cert.p12

diff --git a/kubernetes/aai/charts/aai-modelloader/resources/config/auth/babel-client-cert.p12 b/kubernetes/aai/charts/aai-modelloader/resources/config/auth/babel-client-cert.p12
new file mode 100644
index 0000000000000000000000000000000000000000..dbf4fcacecf190fb0244dce0d1b438e6fea4500d
GIT binary patch
literal 2556
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
F_zSHP#{>WX

literal 0
HcmV?d00001

diff --git a/kubernetes/aai/charts/aai-modelloader/resources/config/model-loader.properties b/kubernetes/aai/charts/aai-modelloader/resources/config/model-loader.properties
index 5604c1f877..e9b24b667c 100644
--- a/kubernetes/aai/charts/aai-modelloader/resources/config/model-loader.properties
+++ b/kubernetes/aai/charts/aai-modelloader/resources/config/model-loader.properties
@@ -10,14 +10,21 @@ ml.distribution.PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go
 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.ARTIFACT_TYPES=MODEL_QUERY_SPEC,TOSCA_CSAR
+ml.distribution.MSG_BUS_ADDRESSES=message-router.{{.Release.Namespace}}
 
 # Model Loader AAI REST Client Configuration
 ml.aai.BASE_URL=https://aai.{{.Release.Namespace}}: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
+
+# Model Loader Babel REST Client Configuration\r
+ml.babel.BASE_URL=https://aai-babel.{{.Release.Namespace}}: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
-- 
2.16.6