Changed default password to admin

Change-Id: I6c9bf8196b6df73931d2531758c30b238ea2d3cc
Signed-off-by: Liem Nguyen <liem_m_nguyen@hp.com>

diff --git a/README.md b/README.md
index d01809754dde6c439e83e3e03bc02d6f9b24bea3..bde3b66275e9813dcf294ccf407906941cab69df 100644 (file)
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ Rebuild and re-install your REST resource.
 
 Once the installation finishes, one can authenticates with the Opendaylight controller by presenting a username/password and a domain name (scope) to be logged into:
 
-    curl -s -d 'grant_type=password&username=admin&password=odl&scope=sdn' http://<controller>:<port>/oauth2/token
+    curl -s -d 'grant_type=password&username=admin&password=admin&scope=sdn' http://<controller>:<port>/oauth2/token
 
 Upon successful authentication, the controller returns an access token with a configurable expiration in seconds, something similar to the followings:
 

diff --git a/aaa-authn-basic/src/test/java/org/opendaylight/aaa/basic/HttpBasicAuthTest.java b/aaa-authn-basic/src/test/java/org/opendaylight/aaa/basic/HttpBasicAuthTest.java
index df6c4f41b5bc757905058598abb4489791c3221b..6ed246813e714aeeb0052dcfa28e71ba1319d179 100644 (file)
--- a/aaa-authn-basic/src/test/java/org/opendaylight/aaa/basic/HttpBasicAuthTest.java
+++ b/aaa-authn-basic/src/test/java/org/opendaylight/aaa/basic/HttpBasicAuthTest.java
@@ -31,7 +31,7 @@ import com.sun.jersey.core.util.Base64;
 
 public class HttpBasicAuthTest {
     private static final String USERNAME = "admin";
-    private static final String PASSWORD = "odl";
+    private static final String PASSWORD = "admin";
     private HttpBasicAuth auth;
 
     @SuppressWarnings("unchecked")

diff --git a/aaa-authn-sts/src/test/java/org/opendaylight/aaa/sts/TokenEndpointTest.java b/aaa-authn-sts/src/test/java/org/opendaylight/aaa/sts/TokenEndpointTest.java
index 19324fb5106f03c91feabf2ede92413a3687b62f..0c30ed80d2b599d9da64832ca34fe874864e6090 100644 (file)
--- a/aaa-authn-sts/src/test/java/org/opendaylight/aaa/sts/TokenEndpointTest.java
+++ b/aaa-authn-sts/src/test/java/org/opendaylight/aaa/sts/TokenEndpointTest.java
@@ -39,7 +39,7 @@ import org.opendaylight.aaa.api.TokenStore;
 public class TokenEndpointTest {
     private static final long TOKEN_TIMEOUT_SECS = 10;
     private static final String CONTEXT = "/oauth2";
-    private static final String DIRECT_AUTH = "grant_type=password&username=admin&password=odl&scope=pepsi&client_id=dlux&client_secret=secrete";
+    private static final String DIRECT_AUTH = "grant_type=password&username=admin&password=admin&scope=pepsi&client_id=dlux&client_secret=secrete";
     private static final String REFRESH_TOKEN = "grant_type=refresh_token&refresh_token=whateverisgood&scope=pepsi";
 
     private static final Claim claim = new ClaimBuilder().setUser("bob")

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/IdmLightProxy.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/IdmLightProxy.java
index 4c0f51e90955a762d3b831998f014826de05e634..271427c20266d6202a3dd622fbe765bfa6542bd5 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/IdmLightProxy.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/IdmLightProxy.java
@@ -30,7 +30,7 @@ public class IdmLightProxy implements CredentialAuth<PasswordCredentials>,
     public Claim authenticate(PasswordCredentials creds, String tenant) {
         // TODO Get this from the database/REST
         if (creds.username().equalsIgnoreCase("admin")
-                && creds.password().equalsIgnoreCase("odl")) {
+                && creds.password().equalsIgnoreCase("admin")) {
             ClaimBuilder claim = new ClaimBuilder();
             claim.setUserId("1234").setUser(creds.username()).addRole("admin")
                     .addRole("user").setDomain("sdn").build();

diff --git a/aaa-it/src/test/java/org/opendaylight/aaa/AAATest.java b/aaa-it/src/test/java/org/opendaylight/aaa/AAATest.java
index bd8ff31f4818cc19ccc1ea9609d15c1c07b5d849..43939560651fce5924dcfe278176da864f02a658 100644 (file)
--- a/aaa-it/src/test/java/org/opendaylight/aaa/AAATest.java
+++ b/aaa-it/src/test/java/org/opendaylight/aaa/AAATest.java
@@ -59,7 +59,7 @@ public class AAATest {
         OAuthClientRequest request = OAuthClientRequest
                 .tokenLocation(TOKEN_URL).setGrantType(GrantType.PASSWORD)
                 .setClientId("dlux").setClientSecret("secrete")
-                .setUsername("admin").setPassword("odl").setScope("sdn")
+                .setUsername("admin").setPassword("admin").setScope("sdn")
                 .buildQueryMessage();
         OAuthClient client = new OAuthClient(new URLConnectionClient());
         OAuthJSONAccessTokenResponse resp = client.accessToken(request);
@@ -68,7 +68,7 @@ public class AAATest {
 
         // Test credential auth
         PasswordCredentials creds = new PasswordCredentialBuilder()
-                .setUserName("admin").setPassword("odl").build();
+                .setUserName("admin").setPassword("admin").build();
         Claim claim = ca.authenticate(creds, "sdn");
         assertEquals("admin", claim.user());
         assertFalse(claim.roles().isEmpty());