Skip to content
Snippets Groups Projects
Commit dd35a2c1 authored by !! Julian Keck (old Account; do not use) !!'s avatar !! Julian Keck (old Account; do not use) !! :ghost:
Browse files

UPD show vlan-ids in patch-request email

parent fca03829
No related branches found
No related tags found
No related merge requests found
......@@ -233,8 +233,16 @@ def validate_patch_request_actions(conn, user, actions: list[APIPatchRequestActi
)
bcd_result = execute_wapi_function(conn, [
{'idx': 'bcd_list', 'name': 'nd.bcd.list', 'old': {'name': action.bcd_name}},
{'idx': 'vlan_list', 'name': 'nd.vlan.list', 'inner_join_ref': {'bcd_list': 'default'}},
], user=user.login_name)
internal_action.bcd = Port(**bcd_result['bcd_list'][0])
if len(bcd_result['vlan_list']) > 0:
internal_action.vlan_ids = list(
map(lambda v: '{compound}: {id}'.format(compound=v.get('net_instnc', 'UNKNOWN?'), id=v['id']),
bcd_result['vlan_list']))
else:
internal_action.vlan_ids = ['VLAN does not exist in any compound.']
elif action.action == PatchActionType.PATCH:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
......
......@@ -45,6 +45,7 @@ class PatchRequestAction(BaseModel):
ports_summary: Optional[str] = Field(default=None)
new_insert_type: Optional[str] = Field(default=None)
new_insert_assignment: list[APIInsertBCDAssignment] = Field(default=[])
vlan_ids: list[str] = Field(default=[])
class PatchRequestFormRequest(BaseModel):
......
......@@ -18,6 +18,11 @@
{% endif %}
{% if action['bcd'] is defined and action['bcd']['name'] is defined %}
<b>Broadcast domain:</b> {{ action['bcd']['name'] }} ({% if action['bcd_tagged'] %}add tagged{%else%}untagged{%endif%})<br>
<ul>
{% for v in action['vlan_ids'] %}
<li>{{ v }}</li>
{% endfor %}
</ul>
{% endif %}
{% if action['new_insert_type'] %}
<b>New insert:</b> {{ action['new_insert_type'] }}<br>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment