From: Marcin Przybysz <marcin.przybysz@nokia.com>
Date: Fri, 27 Mar 2020 07:31:28 +0000 (+0000)
Subject: Merge "Add trailing slash to context URIs"
X-Git-Tag: 6.0.0-ONAP~27
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5610022aea28c7484c2489eaa26e92d2da8dfc39;hp=3fb85fce4a1ca0e04744499cb37eb8d9c3faaa97;p=integration%2Fcsit.git

Merge "Add trailing slash to context URIs"
---

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=