X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=neutron-spi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fneutron%2Fspi%2FNeutronFirewallRule.java;h=360f9cb7c4abe8000bc4edd4f1105c5927d16133;hb=refs%2Fchanges%2F32%2F46432%2F4;hp=bf8c28d940e84704a461bff38a3ae792f4b2c9e0;hpb=17de7ea1543fcf9259c71491aec71de722cef06d;p=neutron.git diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java index bf8c28d94..360f9cb7c 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Red Hat, Inc. + * Copyright (C) 2015 Red Hat, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, @@ -8,13 +8,12 @@ package org.opendaylight.neutron.spi; +import java.io.Serializable; +import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import java.io.Serializable; -import java.util.Iterator; -import java.util.List; /** * OpenStack Neutron v2.0 Firewall as a service @@ -24,48 +23,30 @@ import java.util.List; * * tenant_id uuid-str * name String - * description String * admin_state_up Bool - * status String * shared Bool * firewall_policy_id uuid-str * protocol String * ip_version Integer * source_ip_address String (IP addr or CIDR) * destination_ip_address String (IP addr or CIDR) - * source_port Integer - * destination_port Integer + * source_port_range_min Integer + * source_port_range_max Integer + * destination_port_range_min Integer + * destination_port_range_max Integer * position Integer * action String * enabled Bool * id uuid-str * http://docs.openstack.org/api/openstack-network/2.0/openstack-network.pdf + * */ @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) - -public class NeutronFirewallRule implements Serializable { +public final class NeutronFirewallRule extends NeutronBaseAttributes implements Serializable { private static final long serialVersionUID = 1L; - @XmlElement(name = "id") - String firewallRuleUUID; - - @XmlElement(name = "tenant_id") - String firewallRuleTenantID; - - @XmlElement(name = "name") - String firewallRuleName; - - @XmlElement(name = "description") - String firewallRuleDescription; - - @XmlElement(defaultValue = "true", name = "admin_state_up") - Boolean firewallRuleAdminStateIsUp; - - @XmlElement(name = "status") - String firewallRuleStatus; - @XmlElement(defaultValue = "false", name = "shared") Boolean firewallRuleIsShared; @@ -84,11 +65,17 @@ public class NeutronFirewallRule implements Serializable { @XmlElement(name = "destination_ip_address") String firewallRuleDstIpAddr; - @XmlElement(name = "source_port") - Integer firewallRuleSrcPort; + @XmlElement(name = "source_port_range_min") + Integer firewallRuleSrcPortRangeMin; + + @XmlElement(name = "source_port_range_max") + Integer firewallRuleSrcPortRangeMax; + + @XmlElement(name = "destination_port_range_min") + Integer firewallRuleDstPortRangeMin; - @XmlElement(name = "destination_port") - Integer firewallRuleDstPort; + @XmlElement(name = "destination_port_range_max") + Integer firewallRuleDstPortRangeMax; @XmlElement(name = "position") Integer firewallRulePosition; @@ -123,20 +110,36 @@ public class NeutronFirewallRule implements Serializable { this.firewallRulePosition = firewallRulePosition; } - public Integer getFirewallRuleDstPort() { - return firewallRuleDstPort; + public Integer getFirewallRuleDstPortRangeMin() { + return firewallRuleDstPortRangeMin; } - public void setFirewallRuleDstPort(Integer firewallRuleDstPort) { - this.firewallRuleDstPort = firewallRuleDstPort; + public void setFirewallRuleDstPortRangeMin(Integer firewallRuleDstPortRangeMin) { + this.firewallRuleDstPortRangeMin = firewallRuleDstPortRangeMin; } - public Integer getFirewallRuleSrcPort() { - return firewallRuleSrcPort; + public Integer getFirewallRuleDstPortRangeMax() { + return firewallRuleDstPortRangeMax; } - public void setFirewallRuleSrcPort(Integer firewallRuleSrcPort) { - this.firewallRuleSrcPort = firewallRuleSrcPort; + public void setFirewallRuleDstPortRangeMax(Integer firewallRuleDstPortRangeMax) { + this.firewallRuleDstPortRangeMax = firewallRuleDstPortRangeMax; + } + + public Integer getFirewallRuleSrcPortRangeMin() { + return firewallRuleSrcPortRangeMin; + } + + public void setFirewallRuleSrcPortRangeMin(Integer firewallRuleSrcPortRangeMin) { + this.firewallRuleSrcPortRangeMin = firewallRuleSrcPortRangeMin; + } + + public Integer getFirewallRuleSrcPortRangeMax() { + return firewallRuleSrcPortRangeMax; + } + + public void setFirewallRuleSrcPortRangeMax(Integer firewallRuleSrcPortRangeMax) { + this.firewallRuleSrcPortRangeMax = firewallRuleSrcPortRangeMax; } public String getFirewallRuleDstIpAddr() { @@ -175,7 +178,7 @@ public class NeutronFirewallRule implements Serializable { return firewallRulePolicyID; } - public void setFirewallRulesPolicyID(String firewallRulePolicyID) { + public void setFirewallRulePolicyID(String firewallRulePolicyID) { this.firewallRulePolicyID = firewallRulePolicyID; } @@ -187,82 +190,15 @@ public class NeutronFirewallRule implements Serializable { this.firewallRuleIsShared = firewallRuleIsShared; } - public String getFirewallRuleStatus() { - return firewallRuleStatus; - } - - public void setFirewallRuleStatus(String firewallRuleStatus) { - this.firewallRuleStatus = firewallRuleStatus; - } - - public Boolean getFirewallRuleAdminStateIsUp() { - return firewallRuleAdminStateIsUp; - } - - public void setFirewallRuleAdminStateIsUp(Boolean firewallRuleAdminStateIsUp) { - this.firewallRuleAdminStateIsUp = firewallRuleAdminStateIsUp; - } - - public String getFirewallRuleDescription() { - return firewallRuleDescription; - } - - public void setFirewallRuleDescription(String firewallRuleDescription) { - this.firewallRuleDescription = firewallRuleDescription; - } - - public String getFirewallRuleName() { - return firewallRuleName; - } - - public void setFirewallRuleName(String firewallRuleName) { - this.firewallRuleName = firewallRuleName; - } - - public String getFirewallRuleTenantID() { - return firewallRuleTenantID; - } - - public void setFirewallRuleTenantID(String firewallRuleTenantID) { - this.firewallRuleTenantID = firewallRuleTenantID; - } - - public String getFirewallRuleUUID() { - return firewallRuleUUID; - } - - public void setFirewallRuleUUID(String firewallRuleUUID) { - this.firewallRuleUUID = firewallRuleUUID; - } - public NeutronFirewallRule extractFields(List fields) { NeutronFirewallRule ans = new NeutronFirewallRule(); - Iterator i = fields.iterator(); - while (i.hasNext()) { - String s = i.next(); - if (s.equals("id")) { - ans.setFirewallRuleUUID(this.getFirewallRuleUUID()); - } - if (s.equals("tenant_id")) { - ans.setFirewallRuleTenantID(this.getFirewallRuleTenantID()); - } - if (s.equals("name")) { - ans.setFirewallRuleName(this.getFirewallRuleName()); - } - if (s.equals("description")) { - ans.setFirewallRuleDescription(this.getFirewallRuleDescription()); - } - if (s.equals("admin_state_up")) { - ans.setFirewallRuleAdminStateIsUp(firewallRuleAdminStateIsUp); - } - if (s.equals("status")) { - ans.setFirewallRuleStatus(this.getFirewallRuleStatus()); - } + for (String s : fields) { + extractField(s, ans); if (s.equals("shared")) { ans.setFirewallRuleIsShared(firewallRuleIsShared); } if (s.equals("firewall_policy_id")) { - ans.setFirewallRulesPolicyID(this.getFirewallRulePolicyID()); + ans.setFirewallRulePolicyID(this.getFirewallRulePolicyID()); } if (s.equals("protocol")) { ans.setFirewallRuleProtocol(this.getFirewallRuleProtocol()); @@ -273,11 +209,17 @@ public class NeutronFirewallRule implements Serializable { if (s.equals("destination_ip_address")) { ans.setFirewallRuleDstIpAddr(this.getFirewallRuleDstIpAddr()); } - if (s.equals("source_port")) { - ans.setFirewallRuleSrcPort(this.getFirewallRuleSrcPort()); + if (s.equals("source_port_range_min")) { + ans.setFirewallRuleSrcPortRangeMin(this.getFirewallRuleSrcPortRangeMin()); } - if (s.equals("destination_port")) { - ans.setFirewallRuleDstPort(this.getFirewallRuleDstPort()); + if (s.equals("source_port_range_max")) { + ans.setFirewallRuleSrcPortRangeMax(this.getFirewallRuleSrcPortRangeMax()); + } + if (s.equals("destination_port_range_min")) { + ans.setFirewallRuleDstPortRangeMin(this.getFirewallRuleDstPortRangeMin()); + } + if (s.equals("destination_port_range_max")) { + ans.setFirewallRuleDstPortRangeMax(this.getFirewallRuleDstPortRangeMax()); } if (s.equals("position")) { ans.setFirewallRulePosition(this.getFirewallRulePosition()); @@ -295,27 +237,18 @@ public class NeutronFirewallRule implements Serializable { @Override public String toString() { - return "firewallPolicyRules{" + - "firewallRuleUUID='" + firewallRuleUUID + '\'' + - ", firewallRuleTenantID='" + firewallRuleTenantID + '\'' + - ", firewallRuleName='" + firewallRuleName + '\'' + - ", firewallRuleDescription='" + firewallRuleDescription + '\'' + - ", firewallRuleAdminStateIsUp=" + firewallRuleAdminStateIsUp + - ", firewallRuleStatus='" + firewallRuleStatus + '\'' + - ", firewallRuleIsShared=" + firewallRuleIsShared + - ", firewallRulePolicyID=" + firewallRulePolicyID + - ", firewallRuleProtocol='" + firewallRuleProtocol + '\'' + - ", firewallRuleIpVer=" + firewallRuleIpVer + - ", firewallRuleSrcIpAddr='" + firewallRuleSrcIpAddr + '\'' + - ", firewallRuleDstIpAddr='" + firewallRuleDstIpAddr + '\'' + - ", firewallRuleSrcPort=" + firewallRuleSrcPort + - ", firewallRuleDstPort=" + firewallRuleDstPort + - ", firewallRulePosition=" + firewallRulePosition + - ", firewallRuleAction='" + firewallRuleAction + '\'' + - ", firewallRuleIsEnabled=" + firewallRuleIsEnabled + - '}'; + return "firewallPolicyRules{" + "firewallRuleUUID='" + uuid + '\'' + ", firewallRuleTenantID='" + tenantID + + '\'' + ", firewallRuleName='" + name + '\'' + ", firewallRuleIsShared=" + + firewallRuleIsShared + ", firewallRulePolicyID=" + firewallRulePolicyID + ", firewallRuleProtocol='" + + firewallRuleProtocol + '\'' + ", firewallRuleIpVer=" + firewallRuleIpVer + ", firewallRuleSrcIpAddr='" + + firewallRuleSrcIpAddr + '\'' + ", firewallRuleDstIpAddr='" + firewallRuleDstIpAddr + '\'' + + ", firewallRuleSrcPort=" + firewallRuleSrcPortRangeMin + ':' + firewallRuleSrcPortRangeMax + + ", firewallRuleDstPort=" + firewallRuleDstPortRangeMin + ':' + firewallRuleDstPortRangeMax + + ", firewallRulePosition=" + firewallRulePosition + ", firewallRuleAction='" + firewallRuleAction + + '\'' + ", firewallRuleIsEnabled=" + firewallRuleIsEnabled + '}'; } + @Override public void initDefaults() { } }