merge with upstream

helix/calculators/ebom_calculator.py

@@ -88,8 +88,6 @@ class EbomCalculator(object):
         for monitor in monitors:
             if monitor['power_source'][0] == 'Switch Gear/External':
                 add_parts_to_list(part_list, {proper_monitor_controller: 1}, 1)
-            if (is_delta):
-                add_parts_to_list(part_list, {ethernet_plug: 2},1)
 
         if is_delta:
             clips_amount = inverter_count * self.row_count * 1.15

helix/calculators/seismic_calculator.py

@@ -4,9 +4,11 @@ from helix.calculators.subarray_helper import extract_subarray
 
 from helix.constants.global_constants import minimum_racking_capacity
 from helix.constants.panel_type import PanelType
+from helix.constants.file_validation_error import FileValidationMessage,FileValidationException
 from helix.models.subarray import Subarray
 
 
+
 class SeismicCalculator(object):
     def __init__(self, values, graph_repository):
         self.values = values
@@ -37,13 +39,20 @@ class SeismicCalculator(object):
         more_anchors_needed = True
         perimeter_covered = sds < 1.0
         anchor_threshold = 0
+        was_rung_empty = False
         while more_anchors_needed:
             rung = graph.pop_rung()
             interval = int(self.seismic_anchor_interval())
             nodes_since_last_anchor = interval
             if len(rung) == 0:
+                if was_rung_empty:
+                    # detected an infinite loop
+                    # something is wrong with the input file
+                    # probably panels overlapping
+                    raise FileValidationException(FileValidationMessage.PanelsTooClose.value)
                 graph.reset()
                 anchor_threshold += 1
+                was_rung_empty = True
                 continue
             while more_anchors_needed and interval >= 0:
                 for node in rung: