From c0fd5c6afe0df36c3f65250bb2b903ed7b953d63 Mon Sep 17 00:00:00 2001
From: linxin <linxin@geedgenetworks.com>
Date: Fri, 15 Dec 2023 15:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:TSG-17858?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mrzcpd/files/helm/templates/_config.tpl   | 39 +++++++++++++------
 ansible/roles/mrzcpd/files/helm/values.yaml   |  1 +
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/ansible/roles/mrzcpd/files/helm/templates/_config.tpl b/ansible/roles/mrzcpd/files/helm/templates/_config.tpl
index a7dbe6bb..c9e1ce0d 100644
--- a/ansible/roles/mrzcpd/files/helm/templates/_config.tpl
+++ b/ansible/roles/mrzcpd/files/helm/templates/_config.tpl
@@ -125,14 +125,29 @@ rx_cores={{ $interface.rxcore }}
 [device:virtio_dign_c]
 driver=1
 role=1
-
+{{$enter}}
 [device:virtio_dign_s]
 driver=1
 role=1
-
+{{$enter}}
 [device:nf_inject]
 driver=3
 role=4
+{{$enter}}
+{{- range $linkdb := .Values.mrzcpd.linkdb }}
+[link_db:{{ $linkdb.id }}]
+type={{ $linkdb.type }}
+traffic_link_id={{ $linkdb.traffic_link_id}}
+{{- if $linkdb.vwire_id }}
+vwire_id={{ $linkdb.vwire_id }}
+{{- end }}
+{{- if and $linkdb.ef_ip_addr $linkdb.ef_link_id  }}
+ef_ip_addr={{ $linkdb.ef_ip_addr }}
+ef_link_id={{ $linkdb.ef_link_id }}
+{{- end }}
+{{$enter}}
+{{- end }}
+
 
 {{- range $index, $_ := until $cycle }}
 [device:nf_{{ $index }}_fw]
@@ -208,22 +223,22 @@ addr=127.0.0.1
 port=56789
 
 # sid
-[etherfabric_adapters]
-sid_range_start=100
-sid_range_end=200
-max_rules=256
+[ef_adapters]
+sid_start=100
+sid_end=200
+max_rules=32
 
 [vwires]
-sid_range_start=300
-sid_range_end=400
-max_rules=256
+sid_start=300
+sid_end=400
+max_rules=32
 
 [service_lb]
-sid_range_start={{ .Values.mrzcpd.service_lb.sid_range_start }}
-sid_range_end={{ .Values.mrzcpd.service_lb.sid_range_end }}
+sid_start={{ .Values.mrzcpd.service_lb.sid_range_start }}
+sid_end={{ .Values.mrzcpd.service_lb.sid_range_end }}
 
 {{- range $service := .Values.mrzcpd.services }}
-[etherfabric_adapter:{{ $service.id }}]
+[ef_adapter:{{ $service.id }}]
 mode={{ $service.mode }}
 listen_device={{ $service.listen_on_device }}
 {{$enter}}
diff --git a/ansible/roles/mrzcpd/files/helm/values.yaml b/ansible/roles/mrzcpd/files/helm/values.yaml
index ff53f15c..67e8e802 100644
--- a/ansible/roles/mrzcpd/files/helm/values.yaml
+++ b/ansible/roles/mrzcpd/files/helm/values.yaml
@@ -105,6 +105,7 @@ mrzcpd:
   traffic_mirror: {}
   distmode: 0
   hugepages: 32Gi
+  linkdb: []
   obp_devices: [{'name': 'obp1', 'type': '2', 'connect': '3', 'address': '2.2.2.2', 'port': '6800', 'segment': [{'id': '1', 'workline':'0', 'heartbeat_mode': '1', 'hb_send_interval_in_ms': '100', 'hb_timeout_interval_in_ms': '100', 'hb_lost_threshold': '5', 'nonrevertive_mode': '1'}, {'id': '1', 'workline':'0', 'heartbeat_mode': '1', 'hb_send_interval_in_ms': '100', 'hb_timeout_interval_in_ms': '100', 'hb_lost_threshold': '5', 'nonrevertive_mode': '1'}]}]
   debug:
     enable_liveness_probe: yes