aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-03-25 12:48:19 -0400
committerJim Hahn <jrh3@att.com>2020-03-25 16:10:15 -0400
commit5b7c6e50239a39fbc2c91aafc34f6abe5616f35f (patch)
tree48fb0e62ae0662c003875dcef8458792475733cf /scripts
parent513ee3f14abd1fcbb68836d0be5dea18602241f4 (diff)
Add trailing slash to context URIs
Also added various properties to drools/base.conf to keep it consistent with drools-apps/base.conf, as much as possible. I believe the old SO actor will break if we use the CONTEXT_URI, thus I'm leaving the SO_URL intact for now. Issue-ID: POLICY-2441 Change-Id: I1c4122ecec86ef1ef0e165560464e74ace2bdf34 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/policy/config/drools-apps/env/base.conf11
-rw-r--r--scripts/policy/config/drools/env/base.conf18
2 files changed, 19 insertions, 10 deletions
diff --git a/scripts/policy/config/drools-apps/env/base.conf b/scripts/policy/config/drools-apps/env/base.conf
index f32162fe..b5e7cbd1 100644
--- a/scripts/policy/config/drools-apps/env/base.conf
+++ b/scripts/policy/config/drools-apps/env/base.conf
@@ -80,7 +80,7 @@ PAP_PASSWORD=alpha123
PDP_HOST=pdp
PDP_PORT=6969
-PDP_CONTEXT_URI=policy/pdpx/v1
+PDP_CONTEXT_URI=policy/pdpx/v1/
PDP_USERNAME=testpdp
PDP_PASSWORD=alpha123
PDP_CLIENT_USERNAME=python
@@ -103,7 +103,6 @@ DMAAP_SERVERS=mr.api.simpledemo.onap.org
AAI_HOST=aai.api.simpledemo.onap.org
AAI_PORT=8443
AAI_CONTEXT_URI=
-AAI_URL=https://aai.api.simpledemo.onap.org:8443
AAI_USERNAME=policy@policy.onap.org
AAI_PASSWORD=demo123456!
@@ -111,7 +110,7 @@ AAI_PASSWORD=demo123456!
SO_HOST=vm1.mso.simpledemo.onap.org
SO_PORT=8080
-SO_CONTEXT_URI=onap/so/infra
+SO_CONTEXT_URI=onap/so/infra/
SO_URL=http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra
SO_USERNAME=InfraPortalClient
SO_PASSWORD=password1$
@@ -120,8 +119,7 @@ SO_PASSWORD=password1$
VFC_HOST=
VFC_PORT=
-VFC_CONTEXT_URI=api/nslcm/v1
-VFC_URL=
+VFC_CONTEXT_URI=api/nslcm/v1/
VFC_USERNAME=
VFC_PASSWORD=
@@ -129,7 +127,6 @@ VFC_PASSWORD=
SDNC_HOST=
SDNC_PORT=
-SDNC_CONTEXT_URI=restconf/operations
-SDNC_URL=
+SDNC_CONTEXT_URI=restconf/operations/
SDNC_USERNAME=
SDNC_PASSWORD=
diff --git a/scripts/policy/config/drools/env/base.conf b/scripts/policy/config/drools/env/base.conf
index 8fef8a28..891de49f 100644
--- a/scripts/policy/config/drools/env/base.conf
+++ b/scripts/policy/config/drools/env/base.conf
@@ -79,11 +79,14 @@ PAP_PASSWORD=
# PDP-X
PDP_HOST=
+PDP_PORT=
+PDP_CONTEXT_URI=policy/pdpx/v1/
PDP_USERNAME=
PDP_PASSWORD=
PDP_CLIENT_USERNAME=
PDP_CLIENT_PASSWORD=
PDP_ENVIRONMENT=
+GUARD_DISABLED=false
# DCAE DMaaP
@@ -97,24 +100,33 @@ DMAAP_SERVERS=mr.api.simpledemo.onap.org
# AAI
-AAI_URL=https://aai.api.simpledemo.onap.org:8443
+AAI_HOST=aai.api.simpledemo.onap.org
+AAI_PORT=8443
+AAI_CONTEXT_URI=
AAI_USERNAME=policy@policy.onap.org
AAI_PASSWORD=demo123456!
# MSO
+SO_HOST=vm1.mso.simpledemo.onap.org
+SO_PORT=8080
+SO_CONTEXT_URI=onap/so/infra/
SO_URL=http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra
SO_USERNAME=InfraPortalClient
SO_PASSWORD=password1$
# VFC
-VFC_URL=
+VFC_HOST=
+VFC_PORT=
+VFC_CONTEXT_URI=api/nslcm/v1/
VFC_USERNAME=
VFC_PASSWORD=
# SDNC
-SDNC_URL=
+SDNC_HOST=
+SDNC_PORT=
+SDNC_CONTEXT_URI=restconf/operations/
SDNC_USERNAME=
SDNC_PASSWORD=