Add OpenNebula auth header tests

Author: alpegon

…pennebula/OpennebulaTokenCredential.java …pennebula/OpenNebulaTokenCredential.javasrc/main/java/es/upv/i3m/grycap/im/auth/credential/opennebula/OpennebulaTokenCredential.java renamed to src/main/java/es/upv/i3m/grycap/im/auth/credential/opennebula/OpenNebulaTokenCredential.java src/main/java/es/upv/i3m/grycap/im/auth/credential/opennebula/OpennebulaTokenCredential.java renamed to src/main/java/es/upv/i3m/grycap/im/auth/credential/opennebula/OpenNebulaTokenCredential.java

@@ -3,12 +3,12 @@
 import es.upv.i3m.grycap.im.auth.credential.AbstractTokenCredential;
 import es.upv.i3m.grycap.im.auth.credential.ServiceType;
 
-public class OpennebulaTokenCredential
-    extends AbstractTokenCredential<OpennebulaTokenCredential> {
+public class OpenNebulaTokenCredential
+    extends AbstractTokenCredential<OpenNebulaTokenCredential> {
 
   private String host;
 
-  protected OpennebulaTokenCredential(
+  protected OpenNebulaTokenCredential(
       OpennebulaTokenCredentialBuilder builder) {
     super(builder);
     setHost(builder.getHost());
@@ -42,7 +42,7 @@ public static OpennebulaTokenCredentialBuilder getBuilder() {
   }
 
   public static class OpennebulaTokenCredentialBuilder extends
-      AbstractTokenCredentialBuilder<OpennebulaTokenCredentialBuilder, OpennebulaTokenCredential> {
+      AbstractTokenCredentialBuilder<OpennebulaTokenCredentialBuilder, OpenNebulaTokenCredential> {
 
     private String host;
 
@@ -56,8 +56,8 @@ public OpennebulaTokenCredentialBuilder withHost(String host) {
     }
 
     @Override
-    public OpennebulaTokenCredential build() {
-      return new OpennebulaTokenCredential(this);
+    public OpenNebulaTokenCredential build() {
+      return new OpenNebulaTokenCredential(this);
     }
   }
 }

…nnebula/OpennebulaUserPwdCredential.java …nnebula/OpenNebulaUserPwdCredential.javasrc/main/java/es/upv/i3m/grycap/im/auth/credential/opennebula/OpennebulaUserPwdCredential.java renamed to src/main/java/es/upv/i3m/grycap/im/auth/credential/opennebula/OpenNebulaUserPwdCredential.java src/main/java/es/upv/i3m/grycap/im/auth/credential/opennebula/OpennebulaUserPwdCredential.java renamed to src/main/java/es/upv/i3m/grycap/im/auth/credential/opennebula/OpenNebulaUserPwdCredential.java

@@ -3,8 +3,8 @@
 import es.upv.i3m.grycap.im.auth.credential.AbstractUsernamePasswordCredential;
 import es.upv.i3m.grycap.im.auth.credential.ServiceType;
 
-public class OpennebulaUserPwdCredential
-    extends AbstractUsernamePasswordCredential<OpennebulaUserPwdCredential> {
+public class OpenNebulaUserPwdCredential
+    extends AbstractUsernamePasswordCredential<OpenNebulaUserPwdCredential> {
 
   private String host;
 
@@ -31,7 +31,7 @@ public StringBuilder serialize(StringBuilder sb) {
     return sb;
   }
 
-  protected OpennebulaUserPwdCredential(
+  protected OpenNebulaUserPwdCredential(
       OpennebulaUserPwdCredentialBuilder builder) {
     super(builder);
     setHost(builder.getHost());
@@ -44,7 +44,7 @@ public static OpennebulaUserPwdCredentialBuilder getBuilder() {
   //@formatter:off
   public static class OpennebulaUserPwdCredentialBuilder extends
       AbstractUsernamePasswordCredentialBuilder<OpennebulaUserPwdCredentialBuilder, 
-      OpennebulaUserPwdCredential> {
+      OpenNebulaUserPwdCredential> {
     //@formatter:on
 
     private String host;
@@ -59,8 +59,8 @@ public OpennebulaUserPwdCredentialBuilder withHost(String host) {
     }
 
     @Override
-    public OpennebulaUserPwdCredential build() {
-      return new OpennebulaUserPwdCredential(this);
+    public OpenNebulaUserPwdCredential build() {
+      return new OpenNebulaUserPwdCredential(this);
     }
   }
 }

src/test/java/es/upv/i3m/grycap/im/auth/AuthorizationHeaderTest.java

@@ -5,6 +5,8 @@
 import es.upv.i3m.grycap.im.auth.credential.DummyCredential;
 import es.upv.i3m.grycap.im.auth.credential.im.ImCredential.ImUsernamePasswordCredential;
 import es.upv.i3m.grycap.im.auth.credential.occi.OcciCredential;
+import es.upv.i3m.grycap.im.auth.credential.opennebula.OpenNebulaTokenCredential;
+import es.upv.i3m.grycap.im.auth.credential.opennebula.OpenNebulaUserPwdCredential;
 import es.upv.i3m.grycap.im.auth.credential.openstack.OpenstackAuthVersion;
 import es.upv.i3m.grycap.im.auth.credential.openstack.OpenstackCredential;
 import es.upv.i3m.grycap.im.auth.credential.vmrc.VmrcCredential;
@@ -28,6 +30,10 @@ public class AuthorizationHeaderTest extends ImTestWatcher {
       "id = ost ; type = OpenStack ; username = usr ; password = pwd ; host = host ; service_region = region";
   private static final String OCCI_CREDS =
       "id = occi ; type = OCCI ; host = host ; proxy = proxy";
+  private static final String ONE_UP_CREDS =
+      "id = one ; type = OpenNebula ; username = usr ; password = pwd ; host = host";
+  private static final String ONE_TK_CREDS =
+      "  id = one ; type = OpenNebula ; token = token ; host = host";
 
   private static AuthorizationHeader ah;
 
@@ -74,6 +80,22 @@ public void testOpenStackCredentials() throws ImClientException {
     Assert.assertEquals(OST_CREDS, ah.serialize());
   }
 
+  @Test
+  public void testOpenNebulaUserPassCredentials() throws ImClientException {
+    Credential<?> cred = OpenNebulaUserPwdCredential.getBuilder().withId("one")
+        .withUsername("usr").withPassword("pwd").withHost("host").build();
+    ah.addCredential(cred);
+    Assert.assertEquals(ONE_UP_CREDS, ah.serialize());
+  }
+
+  @Test
+  public void testOpenNebulaTokenCredentials() throws ImClientException {
+    Credential<?> cred = OpenNebulaTokenCredential.getBuilder().withId("one")
+        .withToken("token").withHost("host").build();
+    ah.addCredential(cred);
+    Assert.assertEquals(ONE_TK_CREDS, ah.serialize());
+  }
+
   @Test
   public void testOcciCredentials() throws ImClientException {
     Credential<?> cred = OcciCredential.getBuilder().withId("occi")