Expand AAF_NS to onap.org.osaaf.aaf

Change-Id: I19f284842976ca5e27e5baaa3f21a229ef18ec04
Issue-ID: POLICY-1959
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

2 files changed, 12 insertions, 12 deletions

diff --git a/ONAP-PDP-REST/xacml.pdp.properties b/ONAP-PDP-REST/xacml.pdp.properties
index fc826b3e1..64cfa0626 100644
--- a/ONAP-PDP-REST/xacml.pdp.properties
+++ b/ONAP-PDP-REST/xacml.pdp.properties
@@ -172,7 +172,7 @@ xacml.rest.pep.idfile=client.properties
 enable_aaf=false
 policy.aaf.namespace=org.onap.policy
 policy.aaf.root.permission=org.onap.policy.pdpx
-cm_url=https://aaf-onap-test.osaaf.org:8095/AAF_NS.cm:2.1
+cm_url=https://aaf-onap-test.osaaf.org:8095/onap.org.osaaf.aaf.cm:2.1
 cadi_latitude=38.000
 cadi.longitude=72.000
 cadi_alias=policy@policy.onap.org
@@ -185,12 +185,12 @@ cadi_keystore_password=Pol1cy_0nap
 cadi_truststore=../packages/base/src/files/etc/ssl/policy-truststore
 cadi_truststore_password=Pol1cy_0nap
 aaf_env=DEV
-aaf_url=https://aaf-onap-test.osaaf.org:8095/AAF_NS.service:2.1
+aaf_url=https://aaf-onap-test.osaaf.org:8095/onap.org.osaaf.aaf.service:2.1
 aaf_fqdn=aaf-onap-test.osaaf.org
-aaf_oauth2_introspect_url=https://aaf-onap-test.osaaf.org:8095/AAF_NS.introspect:2.1/introspect
-aaf_oauth2_token_url=https://aaf-onap-test.osaaf.org:8095/AAF_NS.token:2.1/token
-fs_url=https://aaf-onap-test.osaaf.org:8095/AAF_NS.fs.2.1
-gui_url=https://aaf-onap-test.osaaf.org:8095/AAF_NS.gui.2.1
+aaf_oauth2_introspect_url=https://aaf-onap-test.osaaf.org:8095/onap.org.osaaf.aaf.introspect:2.1/introspect
+aaf_oauth2_token_url=https://aaf-onap-test.osaaf.org:8095/onap.org.osaaf.aaf.token:2.1/token
+fs_url=https://aaf-onap-test.osaaf.org:8095/onap.org.osaaf.aaf.fs.2.1
+gui_url=https://aaf-onap-test.osaaf.org:8095/onap.org.osaaf.aaf.gui.2.1
 
 #TOSCA MS model yaml file directory which can be changed based on systems. 
 #msToscaModel.home=C://home//msyamlFiles//
diff --git a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
index e8e28793a..d90b6f075 100644
--- a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
+++ b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
@@ -140,7 +140,7 @@ xacml.rest.pep.idfile = client.properties
 enable_aaf=false
 policy.aaf.namespace = ${{AAF_NAMESPACE}}
 policy.aaf.root.permission=${{AAF_NAMESPACE}}.pdpx
-cm_url=https://${{AAF_HOST}}:8095/AAF_NS.cm:2.1
+cm_url=https://${{AAF_HOST}}:8095/onap.org.osaaf.aaf.cm:2.1
 cadi_latitude=38.000
 cadi.longitude=72.000
 cadi_alias=policy@policy.onap.org
@@ -154,12 +154,12 @@ cadi_key_password=${{KEYSTORE_PASSWD}}
 cadi_truststore=${{POLICY_HOME}}/etc/ssl/policy-truststore
 cadi_truststore_password=${{TRUSTSTORE_PASSWD}}
 aaf_env=DEV
-aaf_url=https://${{AAF_HOST}}:8095/AAF_NS.service:2.1
+aaf_url=https://${{AAF_HOST}}:8095/onap.org.osaaf.aaf.service:2.1
 aaf_fqdn=${{AAF_HOST}}
-aaf_oauth2_introspect_url=https://${{AAF_HOST}}:8095/AAF_NS.introspect:2.1/introspect
-aaf_oauth2_token_url=https://${{AAF_HOST}}:8095/AAF_NS.token:2.1/token
-fs_url=https://${{AAF_HOST}}:8095/AAF_NS.fs.2.1
-gui_url=https://${{AAF_HOST}}:8095/AAF_NS.gui.2.1
+aaf_oauth2_introspect_url=https://${{AAF_HOST}}:8095/onap.org.osaaf.aaf.introspect:2.1/introspect
+aaf_oauth2_token_url=https://${{AAF_HOST}}:8095/onap.org.osaaf.aaf.token:2.1/token
+fs_url=https://${{AAF_HOST}}:8095/onap.org.osaaf.aaf.fs.2.1
+gui_url=https://${{AAF_HOST}}:8095/onap.org.osaaf.aaf.gui.2.1
 
 # Decision Response settings. 
 # can be either PERMIT or DENY.