X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetworkconfiguration%2Fneutron%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetworkconfig%2Fneutron%2FNeutronPort.java;h=38539883533d89104f1e060081ee566d7edb707d;hp=680a07453b94b3f56072804b2981006574837f5a;hb=c31509c7a6630e54a9f9749a643fed5e1a1ad380;hpb=0552aa7d15d9482a9c24062786a743adca4ab74a diff --git a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronPort.java b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronPort.java index 680a07453b..3853988353 100644 --- a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronPort.java +++ b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronPort.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.networkconfig.neutron; + import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; @@ -19,13 +20,11 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.opendaylight.controller.configuration.ConfigurationObject; - @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) -public class NeutronPort extends ConfigurationObject implements Serializable { +public class NeutronPort implements Serializable, INeutronObject { private static final long serialVersionUID = 1L; // See OpenStack Network API v2.0 Reference for description of @@ -64,6 +63,16 @@ public class NeutronPort extends ConfigurationObject implements Serializable { @XmlElement (name="security_groups") List securityGroups; + @XmlElement (namespace= "binding", name="host_id") + String bindinghostID; + + @XmlElement (namespace= "binding", name="vnic_type") + String bindingvnicType; + + @XmlElement (namespace= "binding", name="vif_type") + String bindingvifType; + + /* this attribute stores the floating IP address assigned to * each fixed IP address */ @@ -76,6 +85,8 @@ public class NeutronPort extends ConfigurationObject implements Serializable { public String getID() { return portUUID; } + public void setID(String id) { this.portUUID = id; } + public String getPortUUID() { return portUUID; } @@ -169,6 +180,30 @@ public class NeutronPort extends ConfigurationObject implements Serializable { this.securityGroups = securityGroups; } + public String getBindinghostID() { + return bindinghostID; + } + + public void setBindinghostID(String bindinghostID) { + this.bindinghostID = bindinghostID; + } + + public String getBindingvnicType() { + return bindingvnicType; + } + + public void setBindingvnicType(String bindingvnicType) { + this.bindingvnicType = bindingvnicType; + } + + public String getBindingvifType() { + return bindingvifType; + } + + public void setBindingvifType(String bindingvifType) { + this.bindingvifType = bindingvifType; + } + public NeutronFloatingIP getFloatingIP(String key) { if (!floatingIPMap.containsKey(key)) { return null; @@ -233,6 +268,11 @@ public class NeutronPort extends ConfigurationObject implements Serializable { if (s.equals("tenant_id")) { ans.setTenantID(this.getTenantID()); } + if (s.equals("security_groups")) { + List securityGroups = new ArrayList(); + securityGroups.addAll(this.getSecurityGroups()); + ans.setSecurityGroups(securityGroups); + } } return ans; } @@ -266,6 +306,8 @@ public class NeutronPort extends ConfigurationObject implements Serializable { return "NeutronPort [portUUID=" + portUUID + ", networkUUID=" + networkUUID + ", name=" + name + ", adminStateUp=" + adminStateUp + ", status=" + status + ", macAddress=" + macAddress + ", fixedIPs=" + fixedIPs + ", deviceID=" + deviceID + ", deviceOwner=" + deviceOwner + ", tenantID=" - + tenantID + ", floatingIPMap=" + floatingIPMap + ", securityGroups=" + securityGroups + "]"; + + tenantID + ", floatingIPMap=" + floatingIPMap + ", securityGroups=" + securityGroups + + ", bindinghostID=" + bindinghostID + ", bindingvnicType=" + bindingvnicType + + ", bindingvnicType=" + bindingvnicType + "]"; } }