Issue #277, Issue #282

Author: gondor

core/src/main/java/org/openstack4j/model/network/builder/RouterBuilder.java

@@ -52,6 +52,10 @@ public interface RouterBuilder extends Builder<RouterBuilder, Router> {
 	 */
 	RouterBuilder externalGateway(ExternalGateway externalGateway);
 
+	/**
+	 * Removes the external gateway from the router during an update operation
+	 */
+	RouterBuilder clearExternalGateway();
 	/**
 	 * @see Router#getRoutes()
 	 */

core/src/main/java/org/openstack4j/openstack/compute/domain/NovaQuotaSetUpdate.java

@@ -18,17 +18,23 @@ public class NovaQuotaSetUpdate implements QuotaSetUpdate {
 
     @JsonProperty("injected_files")
     private Integer injectedFiles;
-
+    
+    @JsonProperty
     private Integer gigabytes;
+    
+    @JsonProperty
     private Integer ram;
 
     @JsonProperty("floating_ips")
     private Integer floatingIps;
 
+    @JsonProperty
     private Integer instances;
 
+    @JsonProperty
     private Integer volumes;
 
+    @JsonProperty
     private Integer cores;
 
     @JsonProperty("security_groups")

core/src/main/java/org/openstack4j/openstack/networking/domain/NeutronExternalGateway.java

@@ -2,6 +2,7 @@
 
 import org.openstack4j.model.network.ExternalGateway;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Objects;
 
@@ -21,7 +22,7 @@ public class NeutronExternalGateway implements ExternalGateway {
 	private String networkId;
 
 	@JsonProperty("enable_snat")
-	private boolean enableSnat = true;
+	private Boolean enableSnat;
 
 	public NeutronExternalGateway() { }
 
@@ -45,9 +46,10 @@ public String getNetworkId() {
 	/**
 	 * {@inheritDoc}
 	 */
+	@JsonIgnore
 	@Override
 	public boolean isEnableSnat() {
-		return enableSnat;
+		return enableSnat != null && enableSnat;
 	}
 
 	/**

core/src/main/java/org/openstack4j/openstack/networking/domain/NeutronRouter.java

@@ -207,6 +207,16 @@ public RouterBuilder externalGateway(ExternalGateway externalGateway) {
 			m.externalGatewayInfo = (NeutronExternalGateway) externalGateway;
 			return this;
 		}
+		
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public RouterBuilder clearExternalGateway() {
+		    m.externalGatewayInfo = new NeutronExternalGateway();
+		    return this;
+		}
+		
 
 		/**
 		 * {@inheritDoc}