From 447b03f18a70c10bd4ff5a9a77620320cb71b0e4 Mon Sep 17 00:00:00 2001
From: micafer <micafer1@upv.es>
Date: Thu, 27 Jan 2022 10:02:55 +0100
Subject: [PATCH 01/10] Add missing OST props

---
 .../properties/ImageUrlProperty.java          | 30 +++++++++++++++++
 .../properties/MicroversionProperty.java      | 30 +++++++++++++++++
 .../properties/NetworkUrlProperty.java        | 30 +++++++++++++++++
 .../properties/VolumeUrlProperty.java         | 30 +++++++++++++++++
 .../providers/OpenStackCredentials.java       | 24 ++++++++++++++
 .../im/auth/credentials/PropertiesTest.java   | 32 +++++++++++++++++++
 6 files changed, 176 insertions(+)
 create mode 100644 src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/ImageUrlProperty.java
 create mode 100644 src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/MicroversionProperty.java
 create mode 100644 src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/NetworkUrlProperty.java
 create mode 100644 src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/VolumeUrlProperty.java

diff --git a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/ImageUrlProperty.java b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/ImageUrlProperty.java
new file mode 100644
index 0000000..23d6af3
--- /dev/null
+++ b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/ImageUrlProperty.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (C) GRyCAP - I3M - UPV 
+ *
+ * <p>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
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>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.
+ */
+
+package es.upv.i3m.grycap.im.auth.credentials.properties;
+
+import es.upv.i3m.grycap.im.auth.credentials.Credentials;
+
+public class ImageUrlProperty extends GenericProperty {
+
+  private static final String PROPERTY_NAME = "image_url";
+  private static final String ERROR_MESSAGE = "Image url must not be blank";
+
+  public BaseUrlProperty(Credentials credential, String imageUrl) {
+    super(credential, PROPERTY_NAME, imageUrl, ERROR_MESSAGE);
+  }
+
+}
diff --git a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/MicroversionProperty.java b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/MicroversionProperty.java
new file mode 100644
index 0000000..a76149a
--- /dev/null
+++ b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/MicroversionProperty.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (C) GRyCAP - I3M - UPV 
+ *
+ * <p>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
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>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.
+ */
+
+package es.upv.i3m.grycap.im.auth.credentials.properties;
+
+import es.upv.i3m.grycap.im.auth.credentials.Credentials;
+
+public class MicroversionProperty extends GenericProperty {
+
+  private static final String PROPERTY_NAME = "microversion";
+  private static final String ERROR_MESSAGE = "Microversion must not be blank";
+
+  public MicroversionProperty(Credentials credential, String tenant) {
+    super(credential, PROPERTY_NAME, microversion, ERROR_MESSAGE);
+  }
+
+}
diff --git a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/NetworkUrlProperty.java b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/NetworkUrlProperty.java
new file mode 100644
index 0000000..d0d5e65
--- /dev/null
+++ b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/NetworkUrlProperty.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (C) GRyCAP - I3M - UPV 
+ *
+ * <p>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
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>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.
+ */
+
+package es.upv.i3m.grycap.im.auth.credentials.properties;
+
+import es.upv.i3m.grycap.im.auth.credentials.Credentials;
+
+public class NetworkUrlProperty extends GenericProperty {
+
+  private static final String PROPERTY_NAME = "network_url";
+  private static final String ERROR_MESSAGE = "Network url must not be blank";
+
+  public NetworkUrlProperty(Credentials credential, String networkUrl) {
+    super(credential, PROPERTY_NAME, networkUrl, ERROR_MESSAGE);
+  }
+
+}
diff --git a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/VolumeUrlProperty.java b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/VolumeUrlProperty.java
new file mode 100644
index 0000000..5475ab7
--- /dev/null
+++ b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/VolumeUrlProperty.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (C) GRyCAP - I3M - UPV 
+ *
+ * <p>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
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>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.
+ */
+
+package es.upv.i3m.grycap.im.auth.credentials.properties;
+
+import es.upv.i3m.grycap.im.auth.credentials.Credentials;
+
+public class VolumeUrlProperty extends GenericProperty {
+
+  private static final String PROPERTY_NAME = "volume_url";
+  private static final String ERROR_MESSAGE = "Volume url must not be blank";
+
+  public VolumeUrlProperty(Credentials credential, String volumeUrl) {
+    super(credential, PROPERTY_NAME, volumeUrl, ERROR_MESSAGE);
+  }
+
+}
diff --git a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java
index 5fc98ee..62c40a0 100644
--- a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java
+++ b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java
@@ -24,6 +24,10 @@
 import es.upv.i3m.grycap.im.auth.credentials.properties.ServiceNameProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.ServiceRegionProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.TenantProperty;
+import es.upv.i3m.grycap.im.auth.credentials.properties.MicroversionProperty;
+import es.upv.i3m.grycap.im.auth.credentials.properties.ImageUrlProperty;
+import es.upv.i3m.grycap.im.auth.credentials.properties.NetworkUrlPropertyç;
+import es.upv.i3m.grycap.im.auth.credentials.properties.VolumeUrlProperty;
 
 public class OpenStackCredentials
     extends GenericCredentials<OpenStackCredentials> {
@@ -74,6 +78,26 @@ public OpenStackCredentials withDomain(String domain) {
     return this;
   }
 
+  public OpenStackCredentials withMicroversion(String microversion) {
+    setCredentials(new MicroversionProperty(getCredentials(), microversion));
+    return this;
+  }
+
+  public OpenStackCredentials withImageUrl(String image_url) {
+    setCredentials(new ImageUrlProperty(getCredentials(), image_url));
+    return this;
+  }
+
+  public OpenStackCredentials withNetworkUrl(String network_url) {
+    setCredentials(new NetworkUrlProperty(getCredentials(), network_url));
+    return this;
+  }
+
+  public OpenStackCredentials withVolumeUrl(String volume_url) {
+    setCredentials(new VolumeUrlProperty(getCredentials(), volume_url));
+    return this;
+  }
+
   /**
    * Sets the authorization version specific for OpenStack.
    */
diff --git a/src/test/java/es/upv/i3m/grycap/im/auth/credentials/PropertiesTest.java b/src/test/java/es/upv/i3m/grycap/im/auth/credentials/PropertiesTest.java
index 9e93345..f34db8b 100644
--- a/src/test/java/es/upv/i3m/grycap/im/auth/credentials/PropertiesTest.java
+++ b/src/test/java/es/upv/i3m/grycap/im/auth/credentials/PropertiesTest.java
@@ -34,6 +34,10 @@
 import es.upv.i3m.grycap.im.auth.credentials.properties.TokenProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.UserNameProperty;
 import es.upv.i3m.grycap.im.auth.credentials.providers.OpenStackAuthVersion;
+import es.upv.i3m.grycap.im.auth.credentials.providers.MicroversionProperty;
+import es.upv.i3m.grycap.im.auth.credentials.providers.ImageUrlProperty;
+import es.upv.i3m.grycap.im.auth.credentials.providers.NetworkUrlProperty;
+import es.upv.i3m.grycap.im.auth.credentials.providers.VolumeUrlProperty;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -231,4 +235,32 @@ public void testSubscriptionIdProperty() {
         p.serialize());
   }
 
+  @Test
+  public void testImageUrlProperty() {
+    BaseUrlProperty p = new ImageUrlProperty(BP, PROPERTY_VALUE);
+    Assert.assertEquals(BP_EXPECTED_RESULT + " ; image_url = " + PROPERTY_VALUE,
+        p.serialize());
+  }
+
+  @Test
+  public void testVolumeUrlProperty() {
+    BaseUrlProperty p = new VolumeUrlProperty(BP, PROPERTY_VALUE);
+    Assert.assertEquals(BP_EXPECTED_RESULT + " ; volume_url = " + PROPERTY_VALUE,
+        p.serialize());
+  }
+
+  @Test
+  public void testNetworkUrlProperty() {
+    BaseUrlProperty p = new NetworkUrlProperty(BP, PROPERTY_VALUE);
+    Assert.assertEquals(BP_EXPECTED_RESULT + " ; network_url = " + PROPERTY_VALUE,
+        p.serialize());
+  }
+
+  @Test
+  public void testMicroversioProperty() {
+    BaseUrlProperty p = new MicroversionProperty(BP, PROPERTY_VALUE);
+    Assert.assertEquals(BP_EXPECTED_RESULT + " ; microversion = " + PROPERTY_VALUE,
+        p.serialize());
+  }
+
 }

From 67be3bfddc3ad1b20056f793b1df1c8c85180de8 Mon Sep 17 00:00:00 2001
From: micafer <micafer1@upv.es>
Date: Thu, 27 Jan 2022 10:06:15 +0100
Subject: [PATCH 02/10] Bump

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5cee26d..a107879 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>es.upv.i3m.grycap</groupId>
   <artifactId>im-java-api</artifactId>
-  <version>0.4.14</version>
+  <version>0.4.15</version>
   <name>IM Java API</name>
   <description>Java client for the REST API of the IM</description>
 

From 7918e8113149225ba868a2fe7def22dfd91de861 Mon Sep 17 00:00:00 2001
From: micafer <micafer1@upv.es>
Date: Thu, 27 Jan 2022 10:11:44 +0100
Subject: [PATCH 03/10] Fix import order

---
 .../im/auth/credentials/providers/OpenStackCredentials.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java
index 62c40a0..47083eb 100644
--- a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java
+++ b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java
@@ -20,13 +20,13 @@
 import es.upv.i3m.grycap.im.auth.credentials.properties.AuthTokenProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.BaseUrlProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.DomainProperty;
+import es.upv.i3m.grycap.im.auth.credentials.properties.ImageUrlProperty;
+import es.upv.i3m.grycap.im.auth.credentials.properties.MicroversionProperty;
+import es.upv.i3m.grycap.im.auth.credentials.properties.NetworkUrlPropertyç;
 import es.upv.i3m.grycap.im.auth.credentials.properties.OpenStackAuthVersionProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.ServiceNameProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.ServiceRegionProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.TenantProperty;
-import es.upv.i3m.grycap.im.auth.credentials.properties.MicroversionProperty;
-import es.upv.i3m.grycap.im.auth.credentials.properties.ImageUrlProperty;
-import es.upv.i3m.grycap.im.auth.credentials.properties.NetworkUrlPropertyç;
 import es.upv.i3m.grycap.im.auth.credentials.properties.VolumeUrlProperty;
 
 public class OpenStackCredentials

From d1bf8d2ac1915ffe2efac407fb62fbf370c9280e Mon Sep 17 00:00:00 2001
From: micafer <micafer1@upv.es>
Date: Thu, 27 Jan 2022 10:13:47 +0100
Subject: [PATCH 04/10] Fix param names

---
 .../credentials/providers/OpenStackCredentials.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java
index 47083eb..273f6ac 100644
--- a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java
+++ b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java
@@ -83,18 +83,18 @@ public OpenStackCredentials withMicroversion(String microversion) {
     return this;
   }
 
-  public OpenStackCredentials withImageUrl(String image_url) {
-    setCredentials(new ImageUrlProperty(getCredentials(), image_url));
+  public OpenStackCredentials withImageUrl(String imageUrl) {
+    setCredentials(new ImageUrlProperty(getCredentials(), imageUrl));
     return this;
   }
 
-  public OpenStackCredentials withNetworkUrl(String network_url) {
-    setCredentials(new NetworkUrlProperty(getCredentials(), network_url));
+  public OpenStackCredentials withNetworkUrl(String networkUrl) {
+    setCredentials(new NetworkUrlProperty(getCredentials(), networkUrl));
     return this;
   }
 
-  public OpenStackCredentials withVolumeUrl(String volume_url) {
-    setCredentials(new VolumeUrlProperty(getCredentials(), volume_url));
+  public OpenStackCredentials withVolumeUrl(String volumeUrl) {
+    setCredentials(new VolumeUrlProperty(getCredentials(), volumeUrl));
     return this;
   }
 

From e187177310fc9888b77fd38e057e3ab895e18cb1 Mon Sep 17 00:00:00 2001
From: micafer <micafer1@upv.es>
Date: Thu, 27 Jan 2022 10:20:02 +0100
Subject: [PATCH 05/10] Fix typo

---
 .../grycap/im/auth/credentials/properties/ImageUrlProperty.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/ImageUrlProperty.java b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/ImageUrlProperty.java
index 23d6af3..040df24 100644
--- a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/ImageUrlProperty.java
+++ b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/ImageUrlProperty.java
@@ -23,7 +23,7 @@ public class ImageUrlProperty extends GenericProperty {
   private static final String PROPERTY_NAME = "image_url";
   private static final String ERROR_MESSAGE = "Image url must not be blank";
 
-  public BaseUrlProperty(Credentials credential, String imageUrl) {
+  public ImageUrlProperty(Credentials credential, String imageUrl) {
     super(credential, PROPERTY_NAME, imageUrl, ERROR_MESSAGE);
   }
 

From 7b04820fe88c0d1fdcde229dc863121a39c05747 Mon Sep 17 00:00:00 2001
From: micafer <micafer1@upv.es>
Date: Thu, 27 Jan 2022 10:24:08 +0100
Subject: [PATCH 06/10] Fix typos

---
 .../im/auth/credentials/properties/MicroversionProperty.java    | 2 +-
 .../im/auth/credentials/providers/OpenStackCredentials.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/MicroversionProperty.java b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/MicroversionProperty.java
index a76149a..22d0344 100644
--- a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/MicroversionProperty.java
+++ b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/properties/MicroversionProperty.java
@@ -23,7 +23,7 @@ public class MicroversionProperty extends GenericProperty {
   private static final String PROPERTY_NAME = "microversion";
   private static final String ERROR_MESSAGE = "Microversion must not be blank";
 
-  public MicroversionProperty(Credentials credential, String tenant) {
+  public MicroversionProperty(Credentials credential, String microversion) {
     super(credential, PROPERTY_NAME, microversion, ERROR_MESSAGE);
   }
 
diff --git a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java
index 273f6ac..f25668b 100644
--- a/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java
+++ b/src/main/java/es/upv/i3m/grycap/im/auth/credentials/providers/OpenStackCredentials.java
@@ -22,7 +22,7 @@
 import es.upv.i3m.grycap.im.auth.credentials.properties.DomainProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.ImageUrlProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.MicroversionProperty;
-import es.upv.i3m.grycap.im.auth.credentials.properties.NetworkUrlPropertyç;
+import es.upv.i3m.grycap.im.auth.credentials.properties.NetworkUrlProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.OpenStackAuthVersionProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.ServiceNameProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.ServiceRegionProperty;

From d6f874d320656e96dd5060010347af701898608a Mon Sep 17 00:00:00 2001
From: micafer <micafer1@upv.es>
Date: Thu, 27 Jan 2022 10:26:12 +0100
Subject: [PATCH 07/10] Fix imports

---
 .../i3m/grycap/im/auth/credentials/PropertiesTest.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/test/java/es/upv/i3m/grycap/im/auth/credentials/PropertiesTest.java b/src/test/java/es/upv/i3m/grycap/im/auth/credentials/PropertiesTest.java
index f34db8b..b6eee96 100644
--- a/src/test/java/es/upv/i3m/grycap/im/auth/credentials/PropertiesTest.java
+++ b/src/test/java/es/upv/i3m/grycap/im/auth/credentials/PropertiesTest.java
@@ -22,6 +22,9 @@
 import es.upv.i3m.grycap.im.auth.credentials.properties.DomainProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.GenericProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.HostProperty;
+import es.upv.i3m.grycap.im.auth.credentials.properties.ImageUrlProperty;
+import es.upv.i3m.grycap.im.auth.credentials.properties.MicroversionProperty;
+import es.upv.i3m.grycap.im.auth.credentials.properties.NetworkUrlProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.OpenStackAuthVersionProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.PasswordProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.PrivateKeyProperty;
@@ -33,11 +36,9 @@
 import es.upv.i3m.grycap.im.auth.credentials.properties.TenantProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.TokenProperty;
 import es.upv.i3m.grycap.im.auth.credentials.properties.UserNameProperty;
+import es.upv.i3m.grycap.im.auth.credentials.properties.VolumeUrlProperty;
 import es.upv.i3m.grycap.im.auth.credentials.providers.OpenStackAuthVersion;
-import es.upv.i3m.grycap.im.auth.credentials.providers.MicroversionProperty;
-import es.upv.i3m.grycap.im.auth.credentials.providers.ImageUrlProperty;
-import es.upv.i3m.grycap.im.auth.credentials.providers.NetworkUrlProperty;
-import es.upv.i3m.grycap.im.auth.credentials.providers.VolumeUrlProperty;
+
 
 import org.junit.Assert;
 import org.junit.Test;

From 1d1cad2566c45e843f030aab17086c03ac539274 Mon Sep 17 00:00:00 2001
From: micafer <micafer1@upv.es>
Date: Thu, 27 Jan 2022 10:27:21 +0100
Subject: [PATCH 08/10] Fix test

---
 .../i3m/grycap/im/auth/credentials/PropertiesTest.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/es/upv/i3m/grycap/im/auth/credentials/PropertiesTest.java b/src/test/java/es/upv/i3m/grycap/im/auth/credentials/PropertiesTest.java
index b6eee96..a4d2cd2 100644
--- a/src/test/java/es/upv/i3m/grycap/im/auth/credentials/PropertiesTest.java
+++ b/src/test/java/es/upv/i3m/grycap/im/auth/credentials/PropertiesTest.java
@@ -238,28 +238,28 @@ public void testSubscriptionIdProperty() {
 
   @Test
   public void testImageUrlProperty() {
-    BaseUrlProperty p = new ImageUrlProperty(BP, PROPERTY_VALUE);
+    ImageUrlProperty p = new ImageUrlProperty(BP, PROPERTY_VALUE);
     Assert.assertEquals(BP_EXPECTED_RESULT + " ; image_url = " + PROPERTY_VALUE,
         p.serialize());
   }
 
   @Test
   public void testVolumeUrlProperty() {
-    BaseUrlProperty p = new VolumeUrlProperty(BP, PROPERTY_VALUE);
+    VolumeUrlProperty p = new VolumeUrlProperty(BP, PROPERTY_VALUE);
     Assert.assertEquals(BP_EXPECTED_RESULT + " ; volume_url = " + PROPERTY_VALUE,
         p.serialize());
   }
 
   @Test
   public void testNetworkUrlProperty() {
-    BaseUrlProperty p = new NetworkUrlProperty(BP, PROPERTY_VALUE);
+    NetworkUrlProperty p = new NetworkUrlProperty(BP, PROPERTY_VALUE);
     Assert.assertEquals(BP_EXPECTED_RESULT + " ; network_url = " + PROPERTY_VALUE,
         p.serialize());
   }
 
   @Test
   public void testMicroversioProperty() {
-    BaseUrlProperty p = new MicroversionProperty(BP, PROPERTY_VALUE);
+    MicroversionProperty p = new MicroversionProperty(BP, PROPERTY_VALUE);
     Assert.assertEquals(BP_EXPECTED_RESULT + " ; microversion = " + PROPERTY_VALUE,
         p.serialize());
   }

From 1c0e77238fd53bc9561f565c91abb7637562bfa2 Mon Sep 17 00:00:00 2001
From: micafer <micafer1@upv.es>
Date: Thu, 27 Jan 2022 10:37:42 +0100
Subject: [PATCH 09/10] Move to new VMRC url

---
 .../i3m/grycap/im/auth/credentials/AuthorizationHeaderTest.java | 2 +-
 src/test/resources/auth.dat                                     | 2 +-
 src/test/resources/files/aut_no_internal_path_expected_result   | 2 +-
 src/test/resources/files/aut_one_internal_path_expected_result  | 2 +-
 .../files/aut_several_different_internal_path_expected_result   | 2 +-
 src/test/resources/files/auth_no_internal_path.dat              | 2 +-
 src/test/resources/files/auth_one_internal_path.dat             | 2 +-
 .../resources/files/auth_several_different_internal_path.dat    | 2 +-
 src/test/resources/files/auth_two_internal_path.dat             | 2 +-
 src/test/resources/files/double_escaped_lines_result            | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/test/java/es/upv/i3m/grycap/im/auth/credentials/AuthorizationHeaderTest.java b/src/test/java/es/upv/i3m/grycap/im/auth/credentials/AuthorizationHeaderTest.java
index f27dbcc..e315fe1 100644
--- a/src/test/java/es/upv/i3m/grycap/im/auth/credentials/AuthorizationHeaderTest.java
+++ b/src/test/java/es/upv/i3m/grycap/im/auth/credentials/AuthorizationHeaderTest.java
@@ -49,7 +49,7 @@ public void testAuthorizationHeader() throws ImClientException {
     getAuthorizationHeader().addCredential(cred);
     cred = VmrcCredentials.buildCredentials().withUsername("demo")
         .withPassword("demo")
-        .withHost("http://servproject.i3m.upv.es:8080/vmrc/vmrc");
+        .withHost("http://appsgrycap.i3m.upv.es:32080/vmrc/vmrc");
     getAuthorizationHeader().addCredential(cred);
     cred = DummyCredential.buildCredentials();
     getAuthorizationHeader().addCredential(cred);
diff --git a/src/test/resources/auth.dat b/src/test/resources/auth.dat
index 1bb6191..3e73980 100644
--- a/src/test/resources/auth.dat
+++ b/src/test/resources/auth.dat
@@ -1,3 +1,3 @@
 type = InfrastructureManager; username = imuser01; password = invitado
 id = dummy; type = Dummy
-type = VMRC; host = http://servproject.i3m.upv.es:8080/vmrc/vmrc; username = demo; password = demo
\ No newline at end of file
+type = VMRC; host = http://appsgrycap.i3m.upv.es:32080/vmrc/vmrc; username = demo; password = demo
\ No newline at end of file
diff --git a/src/test/resources/files/aut_no_internal_path_expected_result b/src/test/resources/files/aut_no_internal_path_expected_result
index c32a463..13b2244 100644
--- a/src/test/resources/files/aut_no_internal_path_expected_result
+++ b/src/test/resources/files/aut_no_internal_path_expected_result
@@ -1 +1 @@
-type = InfrastructureManager; username = imuser01; password = invitado\nid = dummy; type = Dummy;\ntype = VMRC; host = http://servproject.i3m.upv.es:8080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file
+type = InfrastructureManager; username = imuser01; password = invitado\nid = dummy; type = Dummy;\ntype = VMRC; host = http://appsgrycap.i3m.upv.es:32080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file
diff --git a/src/test/resources/files/aut_one_internal_path_expected_result b/src/test/resources/files/aut_one_internal_path_expected_result
index 42c2e6c..dbe78a9 100644
--- a/src/test/resources/files/aut_one_internal_path_expected_result
+++ b/src/test/resources/files/aut_one_internal_path_expected_result
@@ -1 +1 @@
-type = InfrastructureManager; username = imuser01; password = invitado\nid = dummy; type = Dummy; proxy = 12345678921 4242434 234 234\\n9876543212131 2 32423\\n1926838916 23423\ntype = VMRC; host = http://servproject.i3m.upv.es:8080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file
+type = InfrastructureManager; username = imuser01; password = invitado\nid = dummy; type = Dummy; proxy = 12345678921 4242434 234 234\\n9876543212131 2 32423\\n1926838916 23423\ntype = VMRC; host = http://appsgrycap.i3m.upv.es:32080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file
diff --git a/src/test/resources/files/aut_several_different_internal_path_expected_result b/src/test/resources/files/aut_several_different_internal_path_expected_result
index 11c8f2b..4f2514c 100644
--- a/src/test/resources/files/aut_several_different_internal_path_expected_result
+++ b/src/test/resources/files/aut_several_different_internal_path_expected_result
@@ -1 +1 @@
-type = InfrastructureManager; proxy = 12345678921 4242434 234 234\\n9876543212131 2 32423\\n1926838916 23423; username = imuser01; password = invitado\nid = dummy; type = Dummy; proxy = 123456789\nproxy = 123456789; type = VMRC; host = http://servproject.i3m.upv.es:8080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file
+type = InfrastructureManager; proxy = 12345678921 4242434 234 234\\n9876543212131 2 32423\\n1926838916 23423; username = imuser01; password = invitado\nid = dummy; type = Dummy; proxy = 123456789\nproxy = 123456789; type = VMRC; host = http://appsgrycap.i3m.upv.es:32080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file
diff --git a/src/test/resources/files/auth_no_internal_path.dat b/src/test/resources/files/auth_no_internal_path.dat
index 35de363..3b5fadd 100644
--- a/src/test/resources/files/auth_no_internal_path.dat
+++ b/src/test/resources/files/auth_no_internal_path.dat
@@ -1,3 +1,3 @@
 type = InfrastructureManager; username = imuser01; password = invitado
 id = dummy; type = Dummy;
-type = VMRC; host = http://servproject.i3m.upv.es:8080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file
+type = VMRC; host = http://appsgrycap.i3m.upv.es:32080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file
diff --git a/src/test/resources/files/auth_one_internal_path.dat b/src/test/resources/files/auth_one_internal_path.dat
index debca38..11f3963 100644
--- a/src/test/resources/files/auth_one_internal_path.dat
+++ b/src/test/resources/files/auth_one_internal_path.dat
@@ -1,3 +1,3 @@
 type = InfrastructureManager; username = imuser01; password = invitado
 id = dummy; type = Dummy; proxy = file(./src/test/resources/files/nested_file_path_content_several_lines)
-type = VMRC; host = http://servproject.i3m.upv.es:8080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file
+type = VMRC; host = http://appsgrycap.i3m.upv.es:32080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file
diff --git a/src/test/resources/files/auth_several_different_internal_path.dat b/src/test/resources/files/auth_several_different_internal_path.dat
index e7699be..947a072 100644
--- a/src/test/resources/files/auth_several_different_internal_path.dat
+++ b/src/test/resources/files/auth_several_different_internal_path.dat
@@ -1,3 +1,3 @@
 type = InfrastructureManager; proxy = file(./src/test/resources/files/nested_file_path_content_several_lines); username = imuser01; password = invitado
 id = dummy; type = Dummy; proxy = file(./src/test/resources/files/nested_file_path_content_one_line)
-proxy = file(./src/test/resources/files/nested_file_path_content_one_line); type = VMRC; host = http://servproject.i3m.upv.es:8080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file
+proxy = file(./src/test/resources/files/nested_file_path_content_one_line); type = VMRC; host = http://appsgrycap.i3m.upv.es:32080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file
diff --git a/src/test/resources/files/auth_two_internal_path.dat b/src/test/resources/files/auth_two_internal_path.dat
index 0486a19..ab3e82b 100644
--- a/src/test/resources/files/auth_two_internal_path.dat
+++ b/src/test/resources/files/auth_two_internal_path.dat
@@ -1,3 +1,3 @@
 type = InfrastructureManager; username = imuser01; password = invitado
 id = dummy; type = Dummy; proxy = file(./src/test/resources/files/nested_file_path_content_empty)
-type = VMRC; host = http://servproject.i3m.upv.es:8080/vmrc/vmrc; username = demo; password = demo; proxy = file(./src/test/resources/files/nested_file_path_content_several_lines)
\ No newline at end of file
+type = VMRC; host = http://appsgrycap.i3m.upv.es:32080/vmrc/vmrc; username = demo; password = demo; proxy = file(./src/test/resources/files/nested_file_path_content_several_lines)
\ No newline at end of file
diff --git a/src/test/resources/files/double_escaped_lines_result b/src/test/resources/files/double_escaped_lines_result
index 8437cef..2694efd 100644
--- a/src/test/resources/files/double_escaped_lines_result
+++ b/src/test/resources/files/double_escaped_lines_result
@@ -1 +1 @@
-type = InfrastructureManager; username = imuser01; password = invitado\\nid = dummy; type = Dummy;\\ntype = VMRC; host = http://servproject.i3m.upv.es:8080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file
+type = InfrastructureManager; username = imuser01; password = invitado\\nid = dummy; type = Dummy;\\ntype = VMRC; host = http://appsgrycap.i3m.upv.es:32080/vmrc/vmrc; username = demo; password = demo;
\ No newline at end of file

From 79d57ac85c908e188958b266b3ced611a3bbbee5 Mon Sep 17 00:00:00 2001
From: micafer <micafer1@upv.es>
Date: Thu, 27 Jan 2022 10:48:50 +0100
Subject: [PATCH 10/10] Bump jackson.version from 2.10.2 to 2.12.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a107879..de830b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
     <maven-assembly-plugin.version>2.6</maven-assembly-plugin.version>
     <jersey-client.version>2.22.2</jersey-client.version>
-    <jackson.version>2.10.2</jackson.version>
+    <jackson.version>2.12.1</jackson.version>
     <apache-commons.version>3.4</apache-commons.version>
     <junit.version>4.13.1</junit.version>
     <log4j.version>1.2.17</log4j.version>