UPD prepare for bcd assignment for changed insert

api/patch_request.py

@@ -94,7 +94,7 @@ async def get_insert_types(token: APIToken = Depends(check_auth), conn=Depends(g
             for i in suffix_list if len(suffix_list) > 0 else ['']:
                 cmp_ports.append({
                     **tmp_port,
-                    'port_name_suffix': i
+                    'port_name_suffix': i + '::'
                 })
         tmp_ports = cmp_ports
 
@@ -108,7 +108,7 @@ async def get_insert_types(token: APIToken = Depends(check_auth), conn=Depends(g
             for i in prefix_list if len(prefix_list) > 0 else ['']:
                 cmp_ports.append({
                     **tmp_port,
-                    'port_name_prefix': i
+                    'port_name_prefix': '::' + i
                 })
         tmp_ports = cmp_ports
 
@@ -227,6 +227,26 @@ def validate_patch_request_actions(conn, user, actions: list[APIPatchRequestActi
                 detail='BCD is required for patch action'
             )
 
+        if action.action != PatchActionType.CHANGE_INSERT and len(action.new_insert_assignment) > 0:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail='New insert assignments are only allowed for change_insert actions'
+            )
+
+        for insert_assignment in action.new_insert_assignment:
+            if not user.has_bcd(conn, insert_assignment.bcd_name):
+                raise HTTPException(
+                    status_code=status.HTTP_403_FORBIDDEN,
+                    detail=f'You do not have permission to request patch for BCD {insert_assignment["bcd_name"]}'
+                )
+            bcd_result = execute_wapi_function(conn, [
+                {'idx': 'bcd_list', 'name': 'nd.bcd.list', 'old': {'name': insert_assignment.bcd_name}},
+            ], user=user.login_name)
+            insert_assignment.bcd = Port(**bcd_result['bcd_list'][0])
+
+        internal_action.new_insert_assignment = action.new_insert_assignment
+        internal_action.new_insert_type = action.new_insert_type
+
         r = execute_wapi_function(conn, [
             {'idx': 'bldg_list', 'name': 'nd.bldg.list', 'old': {'gpk': action.building_gpk}},
             {'idx': 'site_list', 'name': 'nd.site.list', 'inner_join_ref': {'bldg_list': 'default'}},

model/patch_request.py

@@ -12,6 +12,12 @@ class PatchActionType(Enum):
     CHANGE_INSERT = 'change_insert'
 
 
+class APIInsertBCDAssignment(BaseModel):
+    bcd_name: str = Field()
+    bcd_tagged: bool = Field(default=False)
+    port_name: str = Field()
+
+
 class APIPatchRequestAction(BaseModel):
     action: PatchActionType = Field()
     bcd_name: Optional[str] = Field(default=None)
@@ -21,6 +27,8 @@ class APIPatchRequestAction(BaseModel):
     module_gpk: str = Field()
     room_gpk: str = Field()
     p_port_gpk: str = Field()
+    new_insert_type: Optional[str] = Field(default=None)
+    new_insert_assignment: list[APIInsertBCDAssignment] = Field(default=[])
 
 
 class PatchRequestAction(BaseModel):
@@ -35,6 +43,8 @@ class PatchRequestAction(BaseModel):
     site: Optional[Site] = Field(default=None)
     path_link: Optional[str] = Field(default=None)
     ports_summary: Optional[str] = Field(default=None)
+    new_insert_type: Optional[str] = Field(default=None)
+    new_insert_assignment: list[APIInsertBCDAssignment] = Field(default=[])
 
 
 class PatchRequestFormRequest(BaseModel):

templates/patch_request_template.j2

@@ -16,6 +16,17 @@
         {% if action['bcd'] is defined %}
         <b>Broadcast domain:</b> {{ action['bcd']['name'] }} ({% if action['bcd_tagged'] %}add tagged{%else%}untagged{%endif%})<br>
         {% endif %}
+        {% if action['new_insert_type'] %}
+        <b>New insert:</b> {{ action['new_insert_type'] }}<br>
+        {% endif %}
+        {% if action['new_insert_assignment'] is defined %}
+        <b>BCD-assignment:</b> the following BCDs should be assigned to the new insert. Port names are only estimated, you might need to adjust them:<br>
+        <ul>
+            {% for assignment in action['new_insert_assignment'] %}
+                <li>{{ assignment['port_name'] }}: {{ assignment['bcd_name'] }} ({{ assignment['bcd_tagged'] }})</li>
+            {% endfor %}
+        </ul>
+        {% endif %}
         <b>Comment:</b> {{ action['comment'] }}<br>
         {% if (action['path_link'] | default(none)) is not none %}
             <b>Link to path:</b> <a href="{{ action['path_link'] }}">{{ action['path_link'] }}</a><br>