Bug 4789 - model allowed address pairs

Allowed address pairs doesn't include port id according to neutron spec.
actually ip_address is ip address or network address.
So for simplicity, networking-odl should pass always pass network address.
in case of ip address case, address/32 will be passed.
This patch should be merged after
https://git.opendaylight.org/gerrit/#/c/31402/
is merged

Change-Id: I40b0142cd9a1af8fd30d1fa987ae7b8a5fa49db2
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

diff --git a/model/src/main/yang/neutron-ports.yang b/model/src/main/yang/neutron-ports.yang
index ce99257474ec4c3921b403f98cbcb3628a0f6124..4f8a6536553abd81d9a7cbcc05f09ef6f161cd7b 100644 (file)
--- a/model/src/main/yang/neutron-ports.yang
+++ b/model/src/main/yang/neutron-ports.yang
@@ -38,10 +38,7 @@ module neutron-ports {
                         ip_address of a port is prevented. This is because that would
                         have no effect since traffic matching the mac_address and ip_address
                         is already allowed to pass through the port";
-            key "port-id";
-            leaf port-id {
-                type string;
-            }
+            key "mac-address ip-address";
             leaf mac-address {
                 type string;
             }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairs.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairs.java
index 626a87032d96fa7720de4c351a1cb6eebc69899a..22e2e1c948084b3d2144ee68a073eca67a6ffbf8 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairs.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairs.java
@@ -20,9 +20,6 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class NeutronPort_AllowedAddressPairs implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "port_id")
-    String portID;
-
     @XmlElement (name = "mac_address")
     String macAddress;
 
@@ -32,16 +29,11 @@ public class NeutronPort_AllowedAddressPairs implements Serializable {
     public NeutronPort_AllowedAddressPairs() {
     }
 
-    public NeutronPort_AllowedAddressPairs(String portID, String macAddress, String ipAddress) {
-        this.portID = portID;
+    public NeutronPort_AllowedAddressPairs(String macAddress, String ipAddress) {
         this.macAddress = macAddress;
         this.ipAddress = ipAddress;
     }
 
-    public String getPortID() { return(portID); }
-
-    public void setPortID(String portID) { this.portID = portID; }
-
     public String getMacAddress() { return(macAddress); }
 
     public void setMacAddress(String macAddress) { this.macAddress = macAddress; }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairsJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairsJAXBTest.java
index 5539748633cb2e838160a99ff30e6315899b60b2..90579b59786d4fef0116b908c68c4be771ebf4ab 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairsJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairsJAXBTest.java
@@ -16,7 +16,7 @@ import org.opendaylight.neutron.spi.NeutronPort_AllowedAddressPairs;
 public class NeutronPort_AllowedAddressPairsJAXBTest {
 
     private static final String NeutronPort_AllowedAddressPairs_sourceJson = "{ "
-            + "\"ip_address\": \"192.168.199.1\", " + "\"port_id\": \"65c0ee9f-d634-4522-8954-51021b570b0d\", "
+            + "\"ip_address\": \"192.168.199.1\", "
             + "\"mac_address\": \"fa:16:3e:c9:cb:f0\" }";
 
     @Test
@@ -28,9 +28,6 @@ public class NeutronPort_AllowedAddressPairsJAXBTest {
             Assert.assertEquals("NeutronPort Allowed Address Pairs JAXB Test 1: Testing ip_address failed",
                     "192.168.199.1", testObject.getIpAddress());
 
-            Assert.assertEquals("NeutronPort Allowed Address Pairs JAXB Test 2: Testing port_id failed",
-                    "65c0ee9f-d634-4522-8954-51021b570b0d", testObject.getPortID());
-
             Assert.assertEquals("NeutronPort Allowed Address Pairs JAXB Test 10: Testing mac_address failed",
                     "fa:16:3e:c9:cb:f0", testObject.getMacAddress());
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
index fc75f13f3945a0a23e90b030344bf7225f04f4f6..886c023b841b33f57066af0e6d24fb718bceb208 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
@@ -144,7 +144,6 @@ public class NeutronPortInterface extends AbstractNeutronInterface<Port, Ports,
                 NeutronPort_AllowedAddressPairs pair = new NeutronPort_AllowedAddressPairs();
                 pair.setIpAddress(mdPair.getIpAddress());
                 pair.setMacAddress(mdPair.getMacAddress());
-                pair.setPortID(mdPair.getPortId());
                 pairs.add(pair);
             }
             result.setAllowedAddressPairs(pairs);
@@ -231,7 +230,6 @@ public class NeutronPortInterface extends AbstractNeutronInterface<Port, Ports,
                     AllowedAddressPairsBuilder allowedAddressPairsBuilder = new AllowedAddressPairsBuilder();
                     allowedAddressPairsBuilder.setIpAddress(allowedAddressPairs.getIpAddress());
                     allowedAddressPairsBuilder.setMacAddress(allowedAddressPairs.getMacAddress());
-                    allowedAddressPairsBuilder.setPortId(allowedAddressPairs.getPortID());
                     listAllowedAddressPairs.add(allowedAddressPairsBuilder.build());
             }
             portBuilder.setAllowedAddressPairs(listAllowedAddressPairs);