Add Keystone V3 Support

update JEL with explicit getVariable call
set project object into scope object
add camunda properties as defaults in application.yaml
added exception handling to keystone v3 case
added in password method to identity object
initial commit of keystone v3 auth support
updated json property values with "_name"
added new columns to cloud identity

Change-Id: Ie08e9893c34d7199197efdb21fe4dd5413b25f44
Issue-ID: SO-1225
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

2 files changed, 53 insertions, 10 deletions

diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/cloud/authentication/AuthenticationMethodTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/cloud/authentication/AuthenticationMethodTest.java
index 95e4352e05..a5abe75af2 100644
--- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/cloud/authentication/AuthenticationMethodTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/cloud/authentication/AuthenticationMethodTest.java
@@ -20,19 +20,23 @@
 
 package org.onap.so.cloud.authentication;
 
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.so.BaseTest;
+import org.onap.so.cloud.authentication.models.RackspaceAuthentication;
 import org.onap.so.db.catalog.beans.AuthenticationType;
 import org.onap.so.db.catalog.beans.CloudIdentity;
-import org.onap.so.cloud.authentication.models.RackspaceAuthentication;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.onap.so.utils.CryptoUtils;
 
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.woorea.openstack.keystone.model.Authentication;
 import com.woorea.openstack.keystone.model.authentication.UsernamePassword;
 
@@ -42,10 +46,9 @@ import com.woorea.openstack.keystone.model.authentication.UsernamePassword;
  * only are tested.
  *
  */
-public class AuthenticationMethodTest extends BaseTest {
+public class AuthenticationMethodTest {
 
-	@Autowired
-	private AuthenticationMethodFactory authenticationMethodFactory;
+	private AuthenticationMethodFactory authenticationMethodFactory = new AuthenticationMethodFactory();
 	/**
 	 * 
 	 */
@@ -99,4 +102,20 @@ public class AuthenticationMethodTest extends BaseTest {
 		assertTrue(UsernamePassword.class.equals(auth.getClass()));
 	
 	}
+	
+	@Test
+	public void getAuthenticationForV3Test() throws JsonParseException, JsonMappingException, IOException {
+		
+		CloudIdentity identity = new CloudIdentity();
+		identity.setMsoId("my-username");
+		identity.setMsoPass(CryptoUtils.encryptCloudConfigPassword("my-password"));
+		identity.setProjectDomainName("test-domain");
+		identity.setUserDomainName("user-domain");
+		ObjectMapper mapper = new ObjectMapper();
+		com.woorea.openstack.keystone.v3.model.Authentication expected = 
+				mapper.readValue(new String(Files.readAllBytes(Paths.get("src/test/resources/__files/KeystoneV3Payload.json"))), com.woorea.openstack.keystone.v3.model.Authentication.class);
+		com.woorea.openstack.keystone.v3.model.Authentication actual = authenticationMethodFactory.getAuthenticationForV3(identity, "project-x");
+		
+		assertThat(actual, sameBeanAs(expected));
+	}
 }
diff --git a/adapters/mso-adapter-utils/src/test/resources/__files/KeystoneV3Payload.json b/adapters/mso-adapter-utils/src/test/resources/__files/KeystoneV3Payload.json
new file mode 100644
index 0000000000..dc6588ed36
--- /dev/null
+++ b/adapters/mso-adapter-utils/src/test/resources/__files/KeystoneV3Payload.json
@@ -0,0 +1,24 @@
+{
+	"identity": {
+		"methods": [
+			"password"
+		],
+		"password": {
+			"user": {
+				"domain": {
+					"name": "user-domain"
+				},
+				"name": "my-username",
+				"password": "my-password"
+			}
+		}
+	},
+	"scope": {
+		"project": {
+			"domain": {
+				"name": "test-domain"
+			},
+			"id": "project-x"
+		}
+	}
+}