[MSO-8] Second step of the rebase for MSO

Second rebase containing additional features for MSO + total reworking
of the BPMN structure + Notification flow can now be added at the end of
some BPMN flows

Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

3 files changed, 234 insertions, 234 deletions

diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/authentication/AuthenticationMethodTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/authentication/AuthenticationMethodTest.java
index beb85a4a8e..ccfede7297 100644
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/authentication/AuthenticationMethodTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/authentication/AuthenticationMethodTest.java
@@ -1,115 +1,115 @@
-/*
- * ============LICENSE_START==========================================
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
- *
- */
-
-package org.openecomp.mso.cloud.authentication;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.junit.Test;
-import org.openecomp.mso.cloud.CloudIdentity;
-import org.openecomp.mso.cloud.authentication.models.RackspaceAuthentication;
-import org.openecomp.mso.openstack.exceptions.MsoException;
-
-import com.woorea.openstack.keystone.model.Authentication;
-import com.woorea.openstack.keystone.model.authentication.UsernamePassword;
-
-/**
- * A few JUnit tests to evaluate the new factory that manages authentication
- * types and their associated wrapper classes. Here it is assumed that core types
- * only are tested.
- *
- */
-public class AuthenticationMethodTest {
-
-	/**
-	 * 
-	 */
-	public AuthenticationMethodTest() {
-		// TODO Auto-generated constructor stub
-	}
-	
-	@Test
-	public void testCustomRackspaceAuth() {
-		CloudIdentity ci = new CloudIdentity();
-		ci.setIdentityAuthenticationType(CloudIdentity.IdentityAuthenticationType.RACKSPACE_APIKEY);
-		ci.setMsoPass("FD205490A48D48475607C36B9AD902BF");
-		ci.setMsoId("test");
-		
-		try {
-			Authentication auth = AuthenticationMethodFactory.getAuthenticationFor(ci);
-			assertTrue(RackspaceAuthentication.class.equals(auth.getClass()));
-		} catch (InstantiationException | IllegalAccessException | ClassNotFoundException | IOException
-				| URISyntaxException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test
-	public void testCoreUsernamePasswordAuth() {
-		CloudIdentity ci = new CloudIdentity();
-		ci.setIdentityAuthenticationType(CloudIdentity.IdentityAuthenticationType.USERNAME_PASSWORD);
-		ci.setMsoPass("FD205490A48D48475607C36B9AD902BF");
-		ci.setMsoId("someuser");
-		
-		try {
-			Authentication auth = AuthenticationMethodFactory.getAuthenticationFor(ci);
-			assertTrue(UsernamePassword.class.equals(auth.getClass()));
-		} catch (InstantiationException | IllegalAccessException | ClassNotFoundException | IOException
-				| URISyntaxException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test
-	public void testCustomRackspaceAuthFromCloudIdentity() {
-		CloudIdentity ci = new CloudIdentity();
-		ci.setIdentityAuthenticationType(CloudIdentity.IdentityAuthenticationType.RACKSPACE_APIKEY);
-		ci.setMsoPass("FD205490A48D48475607C36B9AD902BF");
-		ci.setMsoId("test");
-		
-		try {
-			Authentication auth = ci.getAuthentication();
-			assertTrue(RackspaceAuthentication.class.equals(auth.getClass()));
-		} catch (MsoException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test
-	public void testCoreUsernamePasswordAuthFromCloudIdentity() {
-		CloudIdentity ci = new CloudIdentity();
-		ci.setIdentityAuthenticationType(CloudIdentity.IdentityAuthenticationType.USERNAME_PASSWORD);
-		ci.setMsoPass("FD205490A48D48475607C36B9AD902BF");
-		ci.setMsoId("someuser");
-		
-		try {
-			Authentication auth = ci.getAuthentication();
-			assertTrue(UsernamePassword.class.equals(auth.getClass()));
-		} catch (MsoException e) {
-			e.printStackTrace();
-		}
-	}
-}
+/*

+ * ============LICENSE_START==========================================

+ * ===================================================================

+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.

+ * ===================================================================

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ *        http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END============================================

+ *

+ * ECOMP and OpenECOMP are trademarks

+ * and service marks of AT&T Intellectual Property.

+ *

+ */

+

+package org.openecomp.mso.cloud.authentication;

+

+import static org.junit.Assert.assertTrue;

+

+import java.io.IOException;

+import java.net.URISyntaxException;

+

+import org.junit.Test;

+import org.openecomp.mso.cloud.CloudIdentity;

+import org.openecomp.mso.cloud.authentication.models.RackspaceAuthentication;

+import org.openecomp.mso.openstack.exceptions.MsoException;

+

+import com.woorea.openstack.keystone.model.Authentication;

+import com.woorea.openstack.keystone.model.authentication.UsernamePassword;

+

+/**

+ * A few JUnit tests to evaluate the new factory that manages authentication

+ * types and their associated wrapper classes. Here it is assumed that core types

+ * only are tested.

+ *

+ */

+public class AuthenticationMethodTest {

+

+	/**

+	 * 

+	 */

+	public AuthenticationMethodTest() {

+		// TODO Auto-generated constructor stub

+	}

+	

+	@Test

+	public void testCustomRackspaceAuth() {

+		CloudIdentity ci = new CloudIdentity();

+		ci.setIdentityAuthenticationType(CloudIdentity.IdentityAuthenticationType.RACKSPACE_APIKEY);

+		ci.setMsoPass("FD205490A48D48475607C36B9AD902BF");

+		ci.setMsoId("test");

+		

+		try {

+			Authentication auth = AuthenticationMethodFactory.getAuthenticationFor(ci);

+			assertTrue(RackspaceAuthentication.class.equals(auth.getClass()));

+		} catch (InstantiationException | IllegalAccessException | ClassNotFoundException | IOException

+				| URISyntaxException e) {

+			e.printStackTrace();

+		}

+	}

+	

+	@Test

+	public void testCoreUsernamePasswordAuth() {

+		CloudIdentity ci = new CloudIdentity();

+		ci.setIdentityAuthenticationType(CloudIdentity.IdentityAuthenticationType.USERNAME_PASSWORD);

+		ci.setMsoPass("FD205490A48D48475607C36B9AD902BF");

+		ci.setMsoId("someuser");

+		

+		try {

+			Authentication auth = AuthenticationMethodFactory.getAuthenticationFor(ci);

+			assertTrue(UsernamePassword.class.equals(auth.getClass()));

+		} catch (InstantiationException | IllegalAccessException | ClassNotFoundException | IOException

+				| URISyntaxException e) {

+			e.printStackTrace();

+		}

+	}

+	

+	@Test

+	public void testCustomRackspaceAuthFromCloudIdentity() {

+		CloudIdentity ci = new CloudIdentity();

+		ci.setIdentityAuthenticationType(CloudIdentity.IdentityAuthenticationType.RACKSPACE_APIKEY);

+		ci.setMsoPass("FD205490A48D48475607C36B9AD902BF");

+		ci.setMsoId("test");

+		

+		try {

+			Authentication auth = ci.getAuthentication();

+			assertTrue(RackspaceAuthentication.class.equals(auth.getClass()));

+		} catch (MsoException e) {

+			e.printStackTrace();

+		}

+	}

+	

+	@Test

+	public void testCoreUsernamePasswordAuthFromCloudIdentity() {

+		CloudIdentity ci = new CloudIdentity();

+		ci.setIdentityAuthenticationType(CloudIdentity.IdentityAuthenticationType.USERNAME_PASSWORD);

+		ci.setMsoPass("FD205490A48D48475607C36B9AD902BF");

+		ci.setMsoId("someuser");

+		

+		try {

+			Authentication auth = ci.getAuthentication();

+			assertTrue(UsernamePassword.class.equals(auth.getClass()));

+		} catch (MsoException e) {

+			e.printStackTrace();

+		}

+	}

+}

diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/servertype/NewServerTypeUtils.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/servertype/NewServerTypeUtils.java
index 1cbba3c45e..4b4f2b8c94 100644
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/servertype/NewServerTypeUtils.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/servertype/NewServerTypeUtils.java
@@ -1,56 +1,56 @@
-/**
- * 
- */
-package org.openecomp.mso.cloud.servertype;
-
-import java.util.Map;
-
-import org.openecomp.mso.cloud.CloudIdentity;
-import org.openecomp.mso.openstack.beans.MsoTenant;
-import org.openecomp.mso.openstack.exceptions.MsoCloudSiteNotFound;
-import org.openecomp.mso.openstack.exceptions.MsoException;
-import org.openecomp.mso.openstack.utils.MsoTenantUtils;
-
-
-public class NewServerTypeUtils extends MsoTenantUtils {
-
-	/**
-	 * @param msoPropID
-	 */
-	public NewServerTypeUtils(String msoPropID) {
-		super(msoPropID);
-	}
-
-	@Override
-    public String createTenant(String tenantName, String cloudSiteId, Map<String, String> metadata, boolean backout)
-            throws MsoException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public MsoTenant queryTenant(String tenantId, String cloudSiteId) throws MsoException, MsoCloudSiteNotFound {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public MsoTenant queryTenantByName(String tenantName, String cloudSiteId)
-            throws MsoException, MsoCloudSiteNotFound {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public boolean deleteTenant(String tenantId, String cloudSiteId) throws MsoException {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public String getKeystoneUrl(String regionId, String msoPropID, CloudIdentity cloudIdentity)
-            throws MsoException {
-        return msoPropID + ":" + regionId + ":NewServerTypeKeystoneURL/" + cloudIdentity.getIdentityUrl();
-    }
-
-}
+/**

+ *

+ */

+package org.openecomp.mso.cloud.servertype;

+

+import java.util.Map;

+

+import org.openecomp.mso.cloud.CloudIdentity;

+import org.openecomp.mso.openstack.beans.MsoTenant;

+import org.openecomp.mso.openstack.exceptions.MsoCloudSiteNotFound;

+import org.openecomp.mso.openstack.exceptions.MsoException;

+import org.openecomp.mso.openstack.utils.MsoTenantUtils;

+

+

+public class NewServerTypeUtils extends MsoTenantUtils {

+

+	/**

+	 * @param msoPropID

+	 */

+	public NewServerTypeUtils(String msoPropID) {

+		super(msoPropID);

+	}

+

+	@Override

+    public String createTenant(String tenantName, String cloudSiteId, Map<String, String> metadata, boolean backout)

+            throws MsoException {

+        // TODO Auto-generated method stub

+        return null;

+    }

+

+    @Override

+    public MsoTenant queryTenant(String tenantId, String cloudSiteId) throws MsoException, MsoCloudSiteNotFound {

+        // TODO Auto-generated method stub

+        return null;

+    }

+

+    @Override

+    public MsoTenant queryTenantByName(String tenantName, String cloudSiteId)

+            throws MsoException, MsoCloudSiteNotFound {

+        // TODO Auto-generated method stub

+        return null;

+    }

+

+    @Override

+    public boolean deleteTenant(String tenantId, String cloudSiteId) throws MsoException {

+        // TODO Auto-generated method stub

+        return false;

+    }

+

+    @Override

+    public String getKeystoneUrl(String regionId, String msoPropID, CloudIdentity cloudIdentity)

+            throws MsoException {

+        return msoPropID + ":" + regionId + ":NewServerTypeKeystoneURL/" + cloudIdentity.getIdentityUrl();

+    }

+

+}

diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/servertype/ServerTypeTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/servertype/ServerTypeTest.java
index e2a0f865a0..9ac25136cc 100644
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/servertype/ServerTypeTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/servertype/ServerTypeTest.java
@@ -1,63 +1,63 @@
-/**
- * 
- */
-package org.openecomp.mso.cloud.servertype;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import org.junit.Test;
-import org.openecomp.mso.cloud.CloudIdentity;
-import org.openecomp.mso.cloud.CloudIdentity.IdentityServerType;
-import org.openecomp.mso.cloud.IdentityServerTypeAbstract;
-import org.openecomp.mso.openstack.exceptions.MsoException;
-
-public class ServerTypeTest {
-
-    @Test
-    public void testKeystoneServerType() {
-        IdentityServerTypeAbstract keystoneServerType = IdentityServerType.valueOf("KEYSTONE");
-        assertNotNull(keystoneServerType);
-    }
-    
-    @Test
-    public void testNewServerType() {
-        IdentityServerTypeAbstract customServerType = null;
-        try {
-            customServerType = new IdentityServerType("NewServerType", NewServerTypeUtils.class);
-           
-        } catch (IllegalArgumentException e) {
-            fail("An exception should not be raised when we register a new server type for the first time");
-        } finally {
-            System.out.println(IdentityServerType.values().toString());
-            assertEquals(customServerType, IdentityServerType.valueOf("NewServerType"));
-        }
-        
-        // Create it a second time
-        IdentityServerTypeAbstract customServerType2 = null;
-        try {
-            customServerType2 = new IdentityServerType("NewServerType", NewServerTypeUtils.class);
-            fail("An exception should be raised as server type does not exist");
-        } catch (IllegalArgumentException e) {
-            // Fail silently -- it simply indicates we already registered it
-        	customServerType2 = IdentityServerType.valueOf("NewServerType");
-        } finally {
-            System.out.println(IdentityServerType.values().toString());
-            assertEquals(customServerType2, IdentityServerType.valueOf("NewServerType"));
-        }
-        
-        // Check the KeystoneURL for this custom TenantUtils
-        CloudIdentity cloudIdentity = new CloudIdentity();
-        cloudIdentity.setIdentityUrl("LocalIdentity");
-        cloudIdentity.setIdentityAuthenticationType(CloudIdentity.IdentityAuthenticationType.RACKSPACE_APIKEY);
-        cloudIdentity.setIdentityServerType((CloudIdentity.IdentityServerType) CloudIdentity.IdentityServerType.valueOf("NewServerType"));
-        String regionId = "RegionA";
-        String msoPropID = "12345";
-        try {
-			assertEquals(cloudIdentity.getKeystoneUrl(regionId, msoPropID), msoPropID + ":" + regionId + ":NewServerTypeKeystoneURL/" + cloudIdentity.getIdentityUrl());
-		} catch (MsoException e) {
-			fail("No MSO Exception should have occured here");
-		}
-    }
-}
+/**

+ * 

+ */

+package org.openecomp.mso.cloud.servertype;

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.fail;

+

+import org.junit.Test;

+import org.openecomp.mso.cloud.CloudIdentity;

+import org.openecomp.mso.cloud.CloudIdentity.IdentityServerType;

+import org.openecomp.mso.cloud.IdentityServerTypeAbstract;

+import org.openecomp.mso.openstack.exceptions.MsoException;

+

+public class ServerTypeTest {

+

+    @Test

+    public void testKeystoneServerType() {

+        IdentityServerTypeAbstract keystoneServerType = IdentityServerType.valueOf("KEYSTONE");

+        assertNotNull(keystoneServerType);

+    }

+    

+    @Test

+    public void testNewServerType() {

+        IdentityServerTypeAbstract customServerType = null;

+        try {

+            customServerType = new IdentityServerType("NewServerType", NewServerTypeUtils.class);

+           

+        } catch (IllegalArgumentException e) {

+            fail("An exception should not be raised when we register a new server type for the first time");

+        } finally {

+            System.out.println(IdentityServerType.values().toString());

+            assertEquals(customServerType, IdentityServerType.valueOf("NewServerType"));

+        }

+        

+        // Create it a second time

+        IdentityServerTypeAbstract customServerType2 = null;

+        try {

+            customServerType2 = new IdentityServerType("NewServerType", NewServerTypeUtils.class);

+            fail("An exception should be raised as server type does not exist");

+        } catch (IllegalArgumentException e) {

+            // Fail silently -- it simply indicates we already registered it

+        	customServerType2 = IdentityServerType.valueOf("NewServerType");

+        } finally {

+            System.out.println(IdentityServerType.values().toString());

+            assertEquals(customServerType2, IdentityServerType.valueOf("NewServerType"));

+        }

+        

+        // Check the KeystoneURL for this custom TenantUtils

+        CloudIdentity cloudIdentity = new CloudIdentity();

+        cloudIdentity.setIdentityUrl("LocalIdentity");

+        cloudIdentity.setIdentityAuthenticationType(CloudIdentity.IdentityAuthenticationType.RACKSPACE_APIKEY);

+        cloudIdentity.setIdentityServerType((CloudIdentity.IdentityServerType) CloudIdentity.IdentityServerType.valueOf("NewServerType"));

+        String regionId = "RegionA";

+        String msoPropID = "12345";

+        try {

+			assertEquals(cloudIdentity.getKeystoneUrl(regionId, msoPropID), msoPropID + ":" + regionId + ":NewServerTypeKeystoneURL/" + cloudIdentity.getIdentityUrl());

+		} catch (MsoException e) {

+			fail("No MSO Exception should have occured here");

+		}

+    }

+}