Merge pull request #199 from n-r-anderson/master

Added AllowedAddressPair to NeutronPort

Author: gondor

core/src/main/java/org/openstack4j/model/network/AllowedAddressPair.java

@@ -0,0 +1,18 @@
+package org.openstack4j.model.network;
+
+import org.openstack4j.model.ModelEntity;
+
+
+/**
+ * Allowed Address Pair for Neutron Port
+ * 
+ * @author Nathan Anderson
+ */
+public interface AllowedAddressPair extends ModelEntity {
+
+  /**
+   * @return the ip address
+   */
+  String getIpAddress();
+	
+}

core/src/main/java/org/openstack4j/model/network/Port.java

@@ -43,6 +43,8 @@ public interface Port extends Resource, Buildable<PortBuilder> {
    * @return the set of fixed IPs this port has been assigned
    */
   Set<? extends IP> getFixedIps();
+  
+  Set<? extends AllowedAddressPair> getAllowedAddressPairs();
 
   /**
    * @return the MacAddress of this port

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

@@ -66,6 +66,26 @@ public interface PortBuilder extends Builder<PortBuilder, Port> {
    */
 	PortBuilder removeFixedIp(String address, String subnetId);
 
+	
+	/**
+   * Adds an allowed address pair to the current list of allowed addresses
+   * @param address the Subnet Address (i.e. 192.168.1.0/24)
+   * @return PortBuilder
+   * @see Port#getAllowedAddressPairs()
+   */
+	PortBuilder allowedAddressPair(String address);
+	
+	
+
+  /**
+   * Removes an allowed address pair from the current list of allowed addresses
+   * @param address the Subnet Address (i.e. 192.168.1.0/24)
+   * @return PortBuilder
+   * @see Port#getAllowedAddressPairs()
+   */
+	PortBuilder removeAddressPair(String address);
+	
+	
 	/**
 	 * @see Port#isAdminStateUp()
 	 */

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

@@ -0,0 +1,42 @@
+package org.openstack4j.openstack.networking.domain;
+
+import org.openstack4j.model.network.AllowedAddressPair;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Objects;
+
+/**
+ * A Fixed IP Address
+ * 
+ * @author Jeremy Unruh
+ */
+public class NeutronAllowedAddressPair implements AllowedAddressPair {
+
+	private static final long serialVersionUID = 1L;
+
+  @JsonProperty("ip_address")
+  private String ipAddress;
+	
+  public NeutronAllowedAddressPair() { }
+  
+  public NeutronAllowedAddressPair(String address) {
+  	this.ipAddress = address;
+  }
+  
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getIpAddress() {
+		return ipAddress;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString() {
+		return Objects.toStringHelper(this).omitNullValues().add("ipAddress", ipAddress).toString();
+	}
+
+}

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

@@ -6,6 +6,7 @@
 import java.util.Set;
 
 import org.openstack4j.model.common.builder.ResourceBuilder;
+import org.openstack4j.model.network.AllowedAddressPair;
 import org.openstack4j.model.network.ExtraDhcpOptCreate;
 import org.openstack4j.model.network.IP;
 import org.openstack4j.model.network.Port;
@@ -45,6 +46,9 @@ public class NeutronPort implements Port {
 
 	@JsonProperty("fixed_ips")
 	private Set<NeutronIP> fixedIps;
+	
+	@JsonProperty("allowed_address_pairs")
+	private Set<NeutronAllowedAddressPair> allowedAddressPairs;
 
 	@JsonProperty("mac_address")
 	private String macAddress;
@@ -61,7 +65,7 @@ public class NeutronPort implements Port {
 	@JsonProperty("security_groups")
 	private List<String> securityGroups;
 
-        @JsonProperty("extra_dhcp_opts")
+	@JsonProperty("extra_dhcp_opts")
 	private List<NeutronExtraDhcpOptCreate> extraDhcpOptCreates = Lists.newArrayList();
 
 	public static PortBuilder builder() {
@@ -144,6 +148,14 @@ public String getDeviceOwner() {
 	public Set<? extends IP> getFixedIps() {
 		return fixedIps;
 	}
+	
+	/**
+   * {@inheritDoc}
+   */
+  @Override
+  public Set<? extends AllowedAddressPair> getAllowedAddressPairs() {
+    return allowedAddressPairs;
+  }
 
 	/**
 	 * {@inheritDoc}
@@ -194,6 +206,7 @@ public String toString() {
 				    .add("id", id).add("name", name).add("adminStateUp", adminStateUp).add("deviceId", deviceId)
 				    .add("deviceOwner", deviceOwner).add("fixedIps", fixedIps).add("macAddress", macAddress)
 				    .add("networkId", networkId).add("tenantId", tenantId).add("securityGroups", securityGroups)
+				    .add("allowed_address_pairs", allowedAddressPairs)
 				    .toString();
 	}
 
@@ -271,6 +284,33 @@ public PortBuilder removeFixedIp(String address, String subnetId) {
 
       return this;
     }
+    
+    @Override
+    public PortBuilder allowedAddressPair(String address) {
+      if (m.allowedAddressPairs == null)
+        m.allowedAddressPairs = Sets.newHashSet();
+      
+      m.allowedAddressPairs.add(new NeutronAllowedAddressPair(address));
+      return this;
+    }
+    
+    @Override
+    public PortBuilder removeAddressPair(String address) {
+      if (m.allowedAddressPairs == null)
+        m.allowedAddressPairs = Sets.newHashSet();
+      
+      Iterator<NeutronAllowedAddressPair> iter = m.allowedAddressPairs.iterator();
+      
+      while (iter.hasNext()) {
+        NeutronAllowedAddressPair allowedAddress = iter.next();
+        if (allowedAddress.getIpAddress() != null && allowedAddress.getIpAddress().equals(address)) {
+          iter.remove();
+        }
+      }
+      
+      return this;
+    }
+    
 
 		@Override
 		public PortBuilder adminState(boolean adminStateUp) {
@@ -300,11 +340,11 @@ protected Port reference() {
 			return m;
 		}
 
-                @Override
-                public PortBuilder extraDhcpOpt(ExtraDhcpOptCreate extraDhcpOptCreate) {
-                        m.extraDhcpOptCreates.add((NeutronExtraDhcpOptCreate)extraDhcpOptCreate);
-                        return this;
-                }
+    @Override
+    public PortBuilder extraDhcpOpt(ExtraDhcpOptCreate extraDhcpOptCreate) {
+            m.extraDhcpOptCreates.add((NeutronExtraDhcpOptCreate)extraDhcpOptCreate);
+            return this;
+    }
 
 		@Override
 		public PortBuilder securityGroup(String groupName) {
@@ -314,9 +354,5 @@ public PortBuilder securityGroup(String groupName) {
 			m.securityGroups.add(groupName);
 			return this;
 		}
-		
-		
-                
-                
 	}
 }