summaryrefslogtreecommitdiffstats
path: root/cadi
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-05-18 07:26:59 -0500
committerInstrumental <jonathan.gathman@att.com>2018-05-18 07:27:06 -0500
commit88aec4e738343856f89f39972e0b87635b80e8c3 (patch)
treeadd17e2aa2315a63504bb508703108fb18704926 /cadi
parent13df7fff629c4fae42de9c619f3bd5aeeeddf04a (diff)
Remove some attisms
Issue-ID: AAF-291 Change-Id: If20e87b3e1eb5738a32be448aa8219b04bd7520f Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'cadi')
-rw-r--r--cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java30
-rw-r--r--cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java2
-rw-r--r--cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/test/TestHClient.java2
-rw-r--r--cadi/core/src/main/java/org/onap/aaf/cadi/UserChain.java2
-rw-r--r--cadi/oauth-enduser/cadi.properties2
5 files changed, 19 insertions, 19 deletions
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java
index 31f60ee8..da81d75c 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java
@@ -252,7 +252,7 @@ public class Examples {
private static UserRoleRequest newUserRoleRequestv2_0(boolean optional) {
UserRoleRequest urr = new UserRoleRequest();
urr.setRole("org.osaaf.myns.myRole");
- urr.setUser("ab1234@csp.att.com");
+ urr.setUser("ab1234@people.osaaf.org");
if(optional) setOptional(urr);
return urr;
}
@@ -261,10 +261,10 @@ public class Examples {
private static NsRequest newNsRequestv2_0(boolean optional) {
NsRequest nr = new NsRequest();
nr.setName("org.osaaf.myns");
- nr.getResponsible().add("ab1234@csp.att.com");
- nr.getResponsible().add("cd5678@csp.att.com");
- nr.getAdmin().add("zy9876@csp.att.com");
- nr.getAdmin().add("xw5432@csp.att.com");
+ nr.getResponsible().add("ab1234@people.osaaf.org");
+ nr.getResponsible().add("cd5678@people.osaaf.org");
+ nr.getAdmin().add("zy9876@people.osaaf.org");
+ nr.getAdmin().add("xw5432@people.osaaf.org");
if(optional) {
nr.setDescription("This is my Namespace to set up");
nr.setType("APP");
@@ -281,18 +281,18 @@ public class Examples {
Nss nss = new Nss();
nss.getNs().add(ns = new Nss.Ns());
ns.setName("org.osaaf.myns");
- ns.getResponsible().add("ab1234@csp.att.com");
- ns.getResponsible().add("cd5678@csp.att.com");
- ns.getAdmin().add("zy9876@csp.att.com");
- ns.getAdmin().add("xw5432@csp.att.com");
+ ns.getResponsible().add("ab1234@people.osaaf.org");
+ ns.getResponsible().add("cd5678@people.osaaf.org");
+ ns.getAdmin().add("zy9876@people.osaaf.org");
+ ns.getAdmin().add("xw5432@people.osaaf.org");
ns.setDescription("This is my Namespace to set up");
nss.getNs().add(ns = new Nss.Ns());
ns.setName("org.osaaf.myOtherNs");
- ns.getResponsible().add("ab1234@csp.att.com");
- ns.getResponsible().add("cd5678@csp.att.com");
- ns.getAdmin().add("zy9876@csp.att.com");
- ns.getAdmin().add("xw5432@csp.att.com");
+ ns.getResponsible().add("ab1234@people.osaaf.org");
+ ns.getResponsible().add("cd5678@people.osaaf.org");
+ ns.getAdmin().add("zy9876@people.osaaf.org");
+ ns.getAdmin().add("xw5432@people.osaaf.org");
return nss;
}
@@ -327,12 +327,12 @@ public class Examples {
Users users = new Users();
users.getUser().add(user = new Users.User());
- user.setId("ab1234@csp.att.com");
+ user.setId("ab1234@people.osaaf.org");
GregorianCalendar gc = new GregorianCalendar();
user.setExpires(Chrono.timeStamp(gc));
users.getUser().add(user = new Users.User());
- user.setId("zy9876@csp.att.com");
+ user.setId("zy9876@people.osaaf.org");
user.setExpires(Chrono.timeStamp(gc));
return users;
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java
index 70b3e766..47950cdc 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java
@@ -203,7 +203,7 @@ public abstract class AAFCon<CLIENT> implements Connector {
app=FQI.reverseDomain(ss.getID());
//TODO Get Realm from AAF
- realm="csp.att.com";
+ realm="people.osaaf.org";
env = new RosettaEnv();
permsDF = env.newDataFactory(Perms.class);
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/test/TestHClient.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/test/TestHClient.java
index 9536cd90..b5262444 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/test/TestHClient.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/test/TestHClient.java
@@ -61,7 +61,7 @@ public class TestHClient {
hman = new HMangr(access,loc);
final String path = String.format("/authz/perms/user/%s",
- access.getProperty(Config.AAF_APPID,"xx9999@csp.att.com"));
+ access.getProperty(Config.AAF_APPID,"xx9999@people.osaaf.org"));
hman.best(ss, new Retryable<Void>() {
@Override
public Void code(Rcli<?> cli) throws APIException, CadiException {
diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/UserChain.java b/cadi/core/src/main/java/org/onap/aaf/cadi/UserChain.java
index e423b8b1..9d8f2b04 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/UserChain.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/UserChain.java
@@ -28,7 +28,7 @@ package org.onap.aaf.cadi;
*
* Where
* APP is name suitable for Logging (i.e. official App Acronym)
- * ID is official User or MechID, best if includes Identity Source (i.e. ab1234@csp.att.com)
+ * ID is official User or MechID, best if includes Identity Source (i.e. ab1234@people.osaaf.org)
* Protocol is the Security protocol,
*
* Format:<ID>:<APP>:<protocol>[:AS][,<ID>:<APP>:<protocol>]*
diff --git a/cadi/oauth-enduser/cadi.properties b/cadi/oauth-enduser/cadi.properties
index ecd5a3d5..411514f1 100644
--- a/cadi/oauth-enduser/cadi.properties
+++ b/cadi/oauth-enduser/cadi.properties
@@ -42,7 +42,7 @@ aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/locate/com.att.aaf.introspect:2
#ISAM
aaf_alt_oauth2_domain=isam.att.com
#aaf_alt_oauth2_client_id=<get from ISAM>
-#aaf_alt_oauth2_domain=csp.att.com
+#aaf_alt_oauth2_domain=people.osaaf.org
#ISAM TEST
aaf_alt_oauth2_token_url=https://oauth.stage.elogin.att.com/mga/sps/oauth/oauth20/token