1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/CloudIdentityTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/CloudIdentityTest.java
index 377a7243ca..fb33a2856e 100644
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/CloudIdentityTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/CloudIdentityTest.java
@@ -39,6 +39,9 @@ public class CloudIdentityTest {
         id.setMsoId ("msoId");
         id.setMsoPass (CloudIdentity.encryptPassword ("password"));
         id.setTenantMetadata (true);
+        id.setIdentityServerType(null);
+        id.setIdentityAuthenticationType(null);
+        
 
         assertTrue (id.getAdminTenant ().equals ("AdminTenant"));
         assertTrue (id.getId ().equals ("id"));
@@ -48,6 +51,7 @@ public class CloudIdentityTest {
         assertTrue (id.getMsoPass ().equals ("password"));
         assertTrue (id.hasTenantMetadata ());
 //        assertTrue (id.toString ().contains ("keystone"));
+        assertTrue(id.toString().contains("null"));
     }
 
     @Test
@@ -56,4 +60,5 @@ public class CloudIdentityTest {
         assertTrue (encrypted != null);
         assertTrue (!encrypted.equals ("password"));
     }
+    
 }