Merge branch 'master' of github.com:Telecominfraproject/wlan-cloud-services into WIFI-2664

WIFI-2664 added private mac address filtering to /oui/list endpoint

manufacturer-service-remote/src/test/java/com/telecominfraproject/wlan/manufacturer/ManufacturerServiceRemoteTest.java

@@ -191,18 +191,18 @@ public class ManufacturerServiceRemoteTest extends BaseRemoteTest {
         Set<String> ouiList = new HashSet<>();
         ouiList.add(oui1);
         ouiListSearchResult = remoteInterface.getManufacturerDetailsForOuiSet(ouiList);
-        assertTrue(ouiListSearchResult.size() == 1);
+        assertTrue(ouiListSearchResult.size() == 2);
         assertTrue(ouiListSearchResult.get(oui1).equals(ret1));
         
         ouiList.add(oui2);
         ouiListSearchResult = remoteInterface.getManufacturerDetailsForOuiSet(ouiList);
-        assertTrue(ouiListSearchResult.size() == 2);
+        assertTrue(ouiListSearchResult.size() == 3);
         assertTrue(ouiListSearchResult.get(oui1).equals(ret1));
         assertTrue(ouiListSearchResult.get(oui2).equals(ret2));
         
         ouiList.add(oui3);
         ouiListSearchResult = remoteInterface.getManufacturerDetailsForOuiSet(ouiList);
-        assertTrue(ouiListSearchResult.size() == 3);
+        assertTrue(ouiListSearchResult.size() == 4);
         assertTrue(ouiListSearchResult.get(oui1).equals(ret1));
         assertTrue(ouiListSearchResult.get(oui2).equals(ret2));
         assertTrue(ouiListSearchResult.get(oui3).equals(ret3));
@@ -211,7 +211,7 @@ public class ManufacturerServiceRemoteTest extends BaseRemoteTest {
             ouiList.add(String.format("%06d", i));
         }
         ouiListSearchResult = remoteInterface.getManufacturerDetailsForOuiSet(ouiList);
-        assertEquals(3,ouiListSearchResult.size());
+        assertEquals(4,ouiListSearchResult.size());
         assertTrue(ouiListSearchResult.get(oui1).equals(ret1));
         assertTrue(ouiListSearchResult.get(oui2).equals(ret2));
         assertTrue(ouiListSearchResult.get(oui3).equals(ret3));

manufacturer-service/src/main/java/com/telecominfraproject/wlan/manufacturer/controller/ManufacturerController.java

@@ -35,7 +35,10 @@ import com.telecominfraproject.wlan.manufacturer.models.ManufacturerOuiDetails;
 public class ManufacturerController {
 
     private static final Logger LOG = LoggerFactory.getLogger(ManufacturerController.class);
-
+    
+    private static final int GLOBE_BIT = (0x1 << 1);
+    private static final ManufacturerOuiDetails PRIVATE_MAC_RESPONSE = new ManufacturerOuiDetails();
+    
     @Autowired
     private ManufacturerDatastoreInterface manufacturerDatastore;
 
@@ -43,6 +46,11 @@ public class ManufacturerController {
         private static final long serialVersionUID = -8035392255039609079L;
     }
 
+    static {
+    	PRIVATE_MAC_RESPONSE.setOui("ffffff");
+    	PRIVATE_MAC_RESPONSE.setManufacturerName("Unknown (Private Address)");
+    	PRIVATE_MAC_RESPONSE.setManufacturerAlias("Unknown");
+    }
     @PostMapping(value = "/oui")
     public ManufacturerOuiDetails createOuiDetails(@RequestBody ManufacturerOuiDetails ouiDetails) {
         LOG.debug("Creating OUI details {} ", ouiDetails);
@@ -76,9 +84,7 @@ public class ManufacturerController {
     @GetMapping(value = "/oui")
     public ManufacturerOuiDetails getByOui(@RequestParam String oui) {
         LOG.debug("Retrieving OUI details for OUI {} ", oui);
-
-        ManufacturerOuiDetails ret = manufacturerDatastore.getByOui(oui);
-
+        ManufacturerOuiDetails ret = isGlobalAddress(oui) ? manufacturerDatastore.getByOui(oui) : PRIVATE_MAC_RESPONSE;
         LOG.debug("Retrieved OUI details {} ", ret);
         return ret;
     }
@@ -157,7 +163,11 @@ public class ManufacturerController {
     public Map<String, ManufacturerOuiDetails> getManufacturerDetailsForOuiList(
             @RequestParam List<String> ouiList) {
         LOG.debug("calling getManufacturerDetailsForOuiList ");
-        return manufacturerDatastore.getManufacturerDetailsForOuiList(ouiList);
+        Map<String, ManufacturerOuiDetails> manufMap = manufacturerDatastore.getManufacturerDetailsForOuiList(ouiList);
+        
+        ouiList.forEach(oui -> {if (!isGlobalAddress(oui)) manufMap.put(oui, PRIVATE_MAC_RESPONSE);});
+        manufMap.put(PRIVATE_MAC_RESPONSE.getOui(), PRIVATE_MAC_RESPONSE);
+        return manufMap;
     }
     
     @PutMapping(value = "/oui/alias")
@@ -180,4 +190,14 @@ public class ManufacturerController {
         LOG.debug("Retrieving alias values that begin with {}", prefix);
         return manufacturerDatastore.getAliasValuesThatBeginWith(prefix, maxResults);
     }
+    
+    private boolean isGlobalAddress(String oui) {
+    	if (oui != null && oui.length() == 6) {
+            // we only need to check the first Byte of the OUI 
+    		Integer hex = Integer.parseInt(oui.substring(0, 2), 16);
+    		byte firstByte = hex.byteValue();
+    		return (firstByte & GLOBE_BIT) == 0;
+    	}
+    	return false;
+    }
 }