Change AAF URL AAI_NS -> onap.org.osaaf.aaf

Issue-ID: AAI-2554
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: I7c560ff182f75599aaa590e65a4a5ba625b7f6b2

9 files changed, 23 insertions, 23 deletions

diff --git a/components/aai-champ/resources/rproxy/config/cadi.properties b/components/aai-champ/resources/rproxy/config/cadi.properties
index 1878a4d..4a375d3 100644
--- a/components/aai-champ/resources/rproxy/config/cadi.properties
+++ b/components/aai-champ/resources/rproxy/config/cadi.properties
@@ -11,8 +11,8 @@
 cadi_loglevel=DEBUG
 
 # OAuth2
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.0/token
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.0/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.token:2.1/token
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.introspect:2.1/introspect
 
 cadi_latitude=37.78187
 cadi_longitude=-122.26147
@@ -21,7 +21,7 @@ cadi_longitude=-122.26147
 aaf_locate_url=https://aaf-locate.{{.Release.Namespace}}:8095
 
 # AAF URL
-aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.0
+aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
 
 cadi_keyfile=/opt/app/rproxy/config/security/keyfile
 cadi_keystore=/opt/app/rproxy/config/auth/org.onap.aai.p12
diff --git a/components/aai-gizmo/resources/rproxy/config/cadi.properties b/components/aai-gizmo/resources/rproxy/config/cadi.properties
index 51ac56a..f82d11e 100644
--- a/components/aai-gizmo/resources/rproxy/config/cadi.properties
+++ b/components/aai-gizmo/resources/rproxy/config/cadi.properties
@@ -11,8 +11,8 @@
 cadi_loglevel=DEBUG
 
 # OAuth2
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.0/token
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.0/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.token:2.1/token
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.introspect:2.1/introspect
 
 cadi_latitude=37.78187
 cadi_longitude=-122.26147
@@ -21,7 +21,7 @@ cadi_longitude=-122.26147
 aaf_locate_url=https://aaf-locate.{{.Release.Namespace}}:8095
 
 # AAF URL
-aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.0
+aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
 
 cadi_keyfile=/opt/app/rproxy/config/security/keyfile
 cadi_keystore=/opt/app/rproxy/config/auth/org.onap.aai.p12
diff --git a/components/aai-resources/resources/config/aaf/cadi.properties b/components/aai-resources/resources/config/aaf/cadi.properties
index c8d0b04..ec5fd55 100644
--- a/components/aai-resources/resources/config/aaf/cadi.properties
+++ b/components/aai-resources/resources/config/aaf/cadi.properties
@@ -3,6 +3,6 @@ cadi_loglevel=INFO
 cadi_prop_files=/opt/app/aai-resources/resources/aaf/org.osaaf.location.props:/opt/app/aai-resources/resources/aaf/org.onap.aai.props
 
 # OAuth2
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.0/token
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.0/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.token:2.1/token
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.introspect:2.1/introspect
 
diff --git a/components/aai-resources/resources/config/aaf/org.osaaf.location.props b/components/aai-resources/resources/config/aaf/org.osaaf.location.props
index 77c3d53..8ae66aa 100644
--- a/components/aai-resources/resources/config/aaf/org.osaaf.location.props
+++ b/components/aai-resources/resources/config/aaf/org.osaaf.location.props
@@ -12,13 +12,13 @@ aaf_locate_url=https://aaf-locate.{{.Release.Namespace}}:8095
 
 
 # AAF URL
-aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.0
+aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
 
 # AAF Environment Designation
 aaf_env=DEV
 
 # OAuth2 Endpoints
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.0/token
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.0/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.token:2.1/token
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.introspect:2.1/introspect
 
 
diff --git a/components/aai-resources/resources/rproxy/config/cadi.properties b/components/aai-resources/resources/rproxy/config/cadi.properties
index c2b628d..4980071 100644
--- a/components/aai-resources/resources/rproxy/config/cadi.properties
+++ b/components/aai-resources/resources/rproxy/config/cadi.properties
@@ -11,8 +11,8 @@
 cadi_loglevel=DEBUG
 
 # OAuth2
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.0/token
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.0/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.token:2.1/token
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.introspect:2.1/introspect
 
 cadi_latitude=37.78187
 cadi_longitude=-122.26147
@@ -21,7 +21,7 @@ cadi_longitude=-122.26147
 aaf_locate_url=https://aaf-locate.{{.Release.Namespace}}:8095
 
 # AAF URL
-aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.0
+aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
 
 cadi_keyfile=/opt/app/rproxy/config/security/keyfile
 cadi_keystore=/opt/app/rproxy/config/auth/org.onap.aai.p12
diff --git a/components/aai-search-data/resources/rproxy/config/cadi.properties b/components/aai-search-data/resources/rproxy/config/cadi.properties
index c2b628d..4980071 100644
--- a/components/aai-search-data/resources/rproxy/config/cadi.properties
+++ b/components/aai-search-data/resources/rproxy/config/cadi.properties
@@ -11,8 +11,8 @@
 cadi_loglevel=DEBUG
 
 # OAuth2
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.0/token
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.0/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.token:2.1/token
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.introspect:2.1/introspect
 
 cadi_latitude=37.78187
 cadi_longitude=-122.26147
@@ -21,7 +21,7 @@ cadi_longitude=-122.26147
 aaf_locate_url=https://aaf-locate.{{.Release.Namespace}}:8095
 
 # AAF URL
-aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.0
+aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
 
 cadi_keyfile=/opt/app/rproxy/config/security/keyfile
 cadi_keystore=/opt/app/rproxy/config/auth/org.onap.aai.p12
diff --git a/components/aai-sparky-be/resources/config/portal/cadi.properties b/components/aai-sparky-be/resources/config/portal/cadi.properties
index 41a49a0..1f154b6 100644
--- a/components/aai-sparky-be/resources/config/portal/cadi.properties
+++ b/components/aai-sparky-be/resources/config/portal/cadi.properties
@@ -1,6 +1,6 @@
 # Configure AAF
 aaf_locate_url=https://aaf-locate.{{.Release.Namespace}}:8095
-aaf_url=<%=https://AAF_LOCATE_URL/AAF_NS.service:2.0
+aaf_url=<%=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
 
 #aaf_url=https://DME2RESOLVE/service=com.att.authz.AuthorizationService/version=2.0/envContext=TEST/routeOffer=BAU_SE
 # AAF Environment Designation
diff --git a/components/aai-traversal/resources/config/aaf/cadi.properties b/components/aai-traversal/resources/config/aaf/cadi.properties
index 9523367..2b19da9 100644
--- a/components/aai-traversal/resources/config/aaf/cadi.properties
+++ b/components/aai-traversal/resources/config/aaf/cadi.properties
@@ -3,6 +3,6 @@ cadi_loglevel=INFO
 cadi_prop_files=/opt/app/aai-traversal/resources/aaf/org.osaaf.location.props:/opt/app/aai-traversal/resources/aaf/org.onap.aai.props
 
 # OAuth2
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.0/token
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.0/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.token:2.1/token
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.introspect:2.1/introspect
 
diff --git a/components/aai-traversal/resources/config/aaf/org.osaaf.location.props b/components/aai-traversal/resources/config/aaf/org.osaaf.location.props
index 132fb24..b9ec6b4 100644
--- a/components/aai-traversal/resources/config/aaf/org.osaaf.location.props
+++ b/components/aai-traversal/resources/config/aaf/org.osaaf.location.props
@@ -11,13 +11,13 @@ cadi_longitude=-122.26147
 aaf_locate_url=https://aaf-locate.{{.Release.Namespace}}:8095
 
 # AAF URL
-aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.0
+aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
 
 # AAF Environment Designation
 aaf_env=DEV
 
 # OAuth2 Endpoints
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.0/token
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.0/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.token:2.1/token
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.introspect:2.1/introspect