commit bd09d6e07eff9bc41576a6c59272cfd6d85c583a
author Phaneendra Manda <phaneendra.manda@huawei.com> Fri Jul 15 19:47:51 2016 +0530
committer Jonathan Hart <jono@onlab.us> Thu Aug 04 00:08:37 2016 +0000
tree dced2fef85fa26bacf16e2fac15eee12a0e1f4c5
parent 65040997b25c101930d668b96223e86598d21f91

[ONOS-4895] Add a method to get VirtualPort based on mac

Change-Id: I3cd6c1ce43f33315f6b73342c6f6393376fff8de

apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/util/VirtualPortAdapter.java

diff --git a/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/util/VirtualPortAdapter.java b/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/util/VirtualPortAdapter.java
index e51c699..1409c99 100644
--- a/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/util/VirtualPortAdapter.java
+++ b/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/util/VirtualPortAdapter.java
@@ -20,6 +20,7 @@
 import java.util.concurrent.ConcurrentMap;
 
 import org.onlab.packet.IpAddress;
+import org.onlab.packet.MacAddress;
 import org.onosproject.net.DeviceId;
 import org.onosproject.vtnrsc.FixedIp;
 import org.onosproject.vtnrsc.TenantId;
@@ -52,6 +53,11 @@
     }
 
     @Override
+    public VirtualPort getPort(MacAddress mac) {
+        return null;
+    }
+
+    @Override
     public Collection<VirtualPort> getPorts() {
         return null;
     }

apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/VirtualPortService.java

diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/VirtualPortService.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/VirtualPortService.java
index 3808291..f8c12de 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/VirtualPortService.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/VirtualPortService.java
@@ -18,6 +18,7 @@
 import java.util.Collection;
 
 import org.onlab.packet.IpAddress;
+import org.onlab.packet.MacAddress;
 import org.onosproject.event.ListenerService;
 import org.onosproject.net.DeviceId;
 import org.onosproject.vtnrsc.FixedIp;
@@ -55,6 +56,14 @@
     VirtualPort getPort(FixedIp fixedIP);
 
     /**
+     * Returns the virtualPort associated with the mac address.
+     *
+     * @param mac the mac address
+     * @return virtualPort.
+     */
+    VirtualPort getPort(MacAddress mac);
+
+    /**
      * Returns the virtualPort associated with the networkId and ip.
      *
      * @param networkId   the TenantNetworkId identifier

apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java

diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java
index d352cb3..b0c5df8 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java
@@ -31,6 +31,7 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
 import org.onlab.packet.IpAddress;
+import org.onlab.packet.MacAddress;
 import org.onlab.util.KryoNamespace;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
@@ -79,6 +80,7 @@
     private static final String NETWORKID_NOT_NULL = "NetworkId  cannot be null";
     private static final String DEVICEID_NOT_NULL = "DeviceId  cannot be null";
     private static final String FIXEDIP_NOT_NULL = "FixedIp  cannot be null";
+    private static final String MAC_NOT_NULL = "Mac address  cannot be null";
     private static final String IP_NOT_NULL = "Ip  cannot be null";
     private static final String EVENT_NOT_NULL = "event cannot be null";
 
@@ -164,6 +166,21 @@
     }
 
     @Override
+    public VirtualPort getPort(MacAddress mac) {
+        checkNotNull(mac, MAC_NOT_NULL);
+        List<VirtualPort> vPorts = new ArrayList<>();
+        vPortStore.values().stream().forEach(p -> {
+            if (p.macAddress().equals(mac)) {
+                vPorts.add(p);
+            }
+        });
+        if (vPorts.size() == 0) {
+            return null;
+        }
+        return vPorts.get(0);
+    }
+
+    @Override
     public VirtualPort getPort(TenantNetworkId networkId, IpAddress ip) {
         checkNotNull(networkId, NETWORKID_NOT_NULL);
         checkNotNull(ip, IP_NOT_NULL);