Added a get device iterator as a result of query for devices.

src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java

@@ -54,6 +54,7 @@ import net.floodlightcontroller.devicemanager.IEntityClassListener;
 import net.floodlightcontroller.devicemanager.IEntityClassifierService;
 import net.floodlightcontroller.devicemanager.IDeviceListener;
 import net.floodlightcontroller.devicemanager.SwitchPort;
+import net.floodlightcontroller.devicemanager.IDeviceService.DeviceField;
 import net.floodlightcontroller.devicemanager.web.DeviceRoutable;
 import net.floodlightcontroller.flowcache.IFlowReconcileListener;
 import net.floodlightcontroller.flowcache.IFlowReconcileService;
@@ -473,6 +474,46 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
         
         return new MultiIterator<Device>(iterators.iterator());
     }
+    
+    protected Iterator<Device> getDeviceIteratorForQuery(Long macAddress,
+    		Short vlan,
+    		Integer ipv4Address,
+    		Long switchDPID,
+    		Integer switchPort) {
+    	DeviceIndex index = null;
+    	if (secondaryIndexMap.size() > 0) {
+    		EnumSet<DeviceField> keys =
+    				getEntityKeys(macAddress, vlan, ipv4Address,
+    						switchDPID, switchPort);
+    		index = secondaryIndexMap.get(keys);
+    	}
+
+    	Iterator<Device> deviceIterator = null;
+    	if (index == null) {
+    		// Do a full table scan
+    		deviceIterator = deviceMap.values().iterator();
+    	} else {
+    		// index lookup
+    		Entity entity = new Entity((macAddress == null ? 0 : macAddress),
+    				vlan,
+    				ipv4Address,
+    				switchDPID,
+    				switchPort,
+    				null);
+    		deviceIterator =
+    				new DeviceIndexInterator(this, index.queryByEntity(entity));
+    	}
+
+    	DeviceIterator di =
+    			new DeviceIterator(deviceIterator,
+    					null,
+    					macAddress,
+    					vlan,
+    					ipv4Address,
+    					switchDPID,
+    					switchPort);
+    	return di;
+    }
 
     @Override
     public void addListener(IDeviceListener listener) {