Merge pull request openstack4j#226 from slankka/issue-152

Fix openstack4j#152 Cinder:create snapshot 'display_description' was unexpected

Author: olivergondza

core-test/src/main/java/org/openstack4j/api/AbstractTest.java

@@ -16,6 +16,7 @@
 import okhttp3.mockwebserver.RecordedRequest;
 import org.openstack4j.api.OSClient.OSClientV2;
 import org.openstack4j.api.OSClient.OSClientV3;
+import org.openstack4j.api.exceptions.ConnectorNotFoundException;
 import org.openstack4j.core.transport.internal.HttpExecutor;
 import org.openstack4j.openstack.OSFactory;
 import org.openstack4j.openstack.identity.v2.domain.KeystoneAccess;
@@ -53,7 +54,12 @@ protected void startServer() throws UnknownHostException {
 
         InetAddress inetAddress = InetAddress.getByName("localhost");
         LOG.info("localhost inet address: " + inetAddress.toString());
-        LOG.info("Tests using connector: " + HttpExecutor.create().getExecutorName() + " on " + getHost());
+
+        try {
+            LOG.info("Tests using connector: " + HttpExecutor.create().getExecutorName() + " on " + getHost());
+        } catch (ConnectorNotFoundException ex) {
+            LOG.info("Tests without any connector");
+        }
 
         try {
             LOG.info("Starting server on port " + service().port);

core-test/src/main/java/org/openstack4j/api/storage/VolumeSnapshotTests.java

@@ -4,14 +4,17 @@
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import okhttp3.mockwebserver.RecordedRequest;
 import org.openstack4j.api.AbstractTest;
+import org.openstack4j.core.transport.ObjectMapperSingleton;
 import org.openstack4j.model.storage.block.VolumeSnapshot;
+import org.openstack4j.openstack.storage.block.domain.CinderVolumeSnapshot;
 import org.testng.annotations.Test;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.*;
 
 
 @Test(suiteName = "Block Storage Tests")
@@ -47,4 +50,14 @@ public void listVolumeSnaphotsV1() throws Exception {
         assertTrue(filteredListRequest.getPath().matches("/v[12]/\\p{XDigit}*/snapshots\\?display_name=" + volName));
     }
 
+    @Test
+    public void createVolumeSnapshotV2() throws JsonProcessingException {
+        ObjectMapper objectMapper = ObjectMapperSingleton.getContext(Object.class);
+        VolumeSnapshot disc = CinderVolumeSnapshot.builder().description("disc").build();
+        String value = objectMapper.writeValueAsString(disc);
+        JsonNode jsonNode = objectMapper.valueToTree(value);
+        //see https://github.com/openstack4j/openstack4j/issues/152
+        assertFalse(jsonNode.has("display_description"));
+    }
+
 }

core/src/main/java/org/openstack4j/core/transport/internal/HttpExecutor.java

@@ -34,8 +34,8 @@ private HttpExecutorService service() {
 
         Iterator<HttpExecutorService> it = ServiceLoader.load(HttpExecutorService.class, getClass().getClassLoader()).iterator();
         if (!it.hasNext()) {
-            LOG.error("No OpenStack4j connector found in classpath");
-            throw new ConnectorNotFoundException("No OpenStack4j connector found in classpath");
+            LOG.error("No OpenStack4j connector found in classpath, see https://github.com/ContainX/openstack4j/issues/832");
+            throw new ConnectorNotFoundException("No OpenStack4j connector found in classpath, see https://github.com/ContainX/openstack4j/issues/832");
         }
         return service = it.next();
     }

core/src/main/java/org/openstack4j/openstack/storage/block/domain/CinderVolumeSnapshot.java

@@ -98,6 +98,7 @@ public String getDescription() {
      * {@inheritDoc}
      */
     @Override
+    @JsonIgnore
     public String getDisplayDescription() {
         return displayDescription;
     }