Merge pull request #916 from Wireless-Innovation-Forum/updated-neighborhood-oob-dpa-handling

DPA updated neighborhoods OOB handling, cat B default 0

Author: FW-ccaparanga

src/harness/reference_models/dpa/dpa_mgr.py

@@ -881,7 +881,9 @@ def BuildDpa(dpa_name, protection_points_method=None, portal_dpa_filename=None,
                           dpa_zone.catA_Outdoor_NeighborhoodDistanceKm,
                           dpa_zone.catA_Outdoor_6m_NeighborhoodDistanceKm,
                           dpa_zone.catBNeighborhoodDistanceKm,
-                          dpa_zone.catB_6m_NeighborhoodDistanceKm)
+                          dpa_zone.catB_6m_NeighborhoodDistanceKm,
+                          dpa_zone.catAOOBNeighborhoodDistanceKm,
+                          dpa_zone.catBOOBNeighborhoodDistanceKm)
   else:
     neighbor_distances = (dpa_zone.catANeighborhoodDistanceKm,
                           dpa_zone.catBNeighborhoodDistanceKm,

src/harness/reference_models/dpa/move_list.py

@@ -40,7 +40,7 @@
 from __future__ import print_function
 
 from collections import namedtuple, defaultdict
-from enum import Enum
+from enum import Enum, IntEnum
 import functools
 from functools import partial
 import logging
@@ -96,6 +96,26 @@ class DpaType(Enum):
   OUT_OF_BAND = 2
 
 
+# Define int enum for DPA neighbor_distances list indices
+class DpaNeighborhood(IntEnum):
+  CATA = 0
+  CATB = 1
+  CATA_OOB = 2
+  CATB_OOB = 3
+
+
+# Define int enum for updated DPA neighbor_distances list indices
+class DpaNeighborhoodUpdated(IntEnum):
+  CATA_INDOOR = 0
+  CATA_INDOOR_6m = 1
+  CATA_OUTDOOR = 2
+  CATA_OUTDOOR_6m = 3
+  CATB = 4
+  CATB_6m = 5
+  CATA_OOB = 6
+  CATB_OOB = 7
+
+
 def findDpaType(low_freq, high_freq):
   """Finds the DPA protection type for a given frequency range.
 
@@ -142,7 +162,7 @@ def findGrantsInsideNeighborhood(grants, constraint,
       [cata_dist, catb_dist, cata_oob_dist, catb_oob_dist]
       or
       [cata_indoor_dist, cata_indoor_6m_dist, cata_outdoor_dist,
-        cata_outdoor_6m_dist, catb_dist, catb_6m_dist]
+        cata_outdoor_6m_dist, catb_dist, catb_6m_dist, cata_oob_dist, catb_oob_dist]
 
   Returns:
     A tuple of:
@@ -176,31 +196,37 @@ def findGrantsInsideNeighborhood(grants, constraint,
     if len(neighbor_distances) == 4:
       if dpa_type is DpaType.CO_CHANNEL:
         if grant.cbsd_category == 'A':
-          neighbor_dist = neighbor_distances[0]
+          neighbor_dist = neighbor_distances[DpaNeighborhood.CATA]
         else:
-          neighbor_dist = neighbor_distances[1]
+          neighbor_dist = neighbor_distances[DpaNeighborhood.CATB]
       else:
         if grant.cbsd_category == 'A':
-          neighbor_dist = neighbor_distances[2]
+          neighbor_dist = neighbor_distances[DpaNeighborhood.CATA_OOB]
         else:
-          neighbor_dist = neighbor_distances[3]
-    elif len(neighbor_distances) == 6:
-      if grant.cbsd_category == 'A':
-        if grant.indoor_deployment:
-          if grant.height_agl > 6:
-            neighbor_dist = neighbor_distances[0]
+          neighbor_dist = neighbor_distances[DpaNeighborhood.CATB_OOB]
+    elif len(neighbor_distances) == 8:
+      if dpa_type is DpaType.OUT_OF_BAND:
+        if grant.cbsd_category == 'A':
+          neighbor_dist = neighbor_distances[DpaNeighborhoodUpdated.CATA_OOB]
+        else:
+          neighbor_dist = neighbor_distances[DpaNeighborhoodUpdated.CATB_OOB]
+      else:
+        if grant.cbsd_category == 'A':
+          if grant.indoor_deployment:
+            if grant.height_agl > 6:
+              neighbor_dist = neighbor_distances[DpaNeighborhoodUpdated.CATA_INDOOR]
+            else:
+              neighbor_dist = neighbor_distances[DpaNeighborhoodUpdated.CATA_INDOOR_6m]
           else:
-            neighbor_dist = neighbor_distances[1]
+            if grant.height_agl > 6:
+              neighbor_dist = neighbor_distances[DpaNeighborhoodUpdated.CATA_OUTDOOR]
+            else:
+              neighbor_dist = neighbor_distances[DpaNeighborhoodUpdated.CATA_OUTDOOR_6m]
         else:
           if grant.height_agl > 6:
-            neighbor_dist = neighbor_distances[2]
+            neighbor_dist = neighbor_distances[DpaNeighborhoodUpdated.CATB]
           else:
-            neighbor_dist = neighbor_distances[3]
-      else:
-        if grant.height_agl > 6:
-          neighbor_dist = neighbor_distances[4]
-        else:
-          neighbor_dist = neighbor_distances[5]
+            neighbor_dist = neighbor_distances[DpaNeighborhoodUpdated.CATB_6m]
     else:
       raise ValueError('Invalid neighborhood distances size')
     if dist_km > neighbor_dist:

src/harness/reference_models/dpa/move_list_test.py

@@ -222,7 +222,7 @@ def test_movelist_new_neighborhoods(self):
 
     move_grants, nbor_grants = move_list.moveListConstraint(
         point, 3600e6, 3610e6, grants,
-        50, 2000, -144, 3, (10, 20, 30, 40, 50, 60))
+        50, 2000, -144, 3, (10, 20, 30, 40, 50, 60, 70, 80))
 
     self.assertListEqual(nbor_grants, grants)
     self.assertListEqual(move_grants, [])
@@ -238,7 +238,7 @@ def test_movelist_new_neighborhoods(self):
 
     move_grants, nbor_grants = move_list.moveListConstraint(
         point, 3600e6, 3610e6, grants,
-        50, 2000, -144, 3, (10, 20, 30, 40, 50, 60))
+        50, 2000, -144, 3, (10, 20, 30, 40, 50, 60, 70, 80))
 
     self.assertListEqual(nbor_grants, [])
     self.assertListEqual(move_grants, [])

src/harness/reference_models/geo/zones.py

@@ -437,7 +437,7 @@ def _LoadDpaZones(kml_path, properties, fix_invalid=True):
     if np.isnan(zone.catAOOBNeighborhoodDistanceKm):
       zone.catAOOBNeighborhoodDistanceKm = 0
     if np.isnan(zone.catBOOBNeighborhoodDistanceKm):
-      zone.catBOOBNeighborhoodDistanceKm = 25
+      zone.catBOOBNeighborhoodDistanceKm = 0
 
   return dpa_zones