diff options
| author | lijie <[email protected]> | 2018-12-18 13:55:40 +0800 |
|---|---|---|
| committer | lijie <[email protected]> | 2018-12-18 13:55:40 +0800 |
| commit | fc99454ea9bce35065e34b28815f8cf417b37804 (patch) | |
| tree | 99dd5fe555008a7772cd9e004c8d8f9a2a36071e /bin | |
| parent | 2b336ed27f01342b2908574495f17d461b0877bb (diff) | |
1.重构MRL，通过自学习的方式学习当前链路信息，同时通过虚拟链路ID来标识，MRL通过向平台发送虚拟链路ID，由marsio填充VXLAN头部；2.新增DNAT功能”
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/conf/mrl.conf | 49 | ||||
| -rw-r--r-- | bin/conf/table_info.conf | 6 |
2 files changed, 33 insertions, 22 deletions
diff --git a/bin/conf/mrl.conf b/bin/conf/mrl.conf index 5c16f3f..757bccc 100644 --- a/bin/conf/mrl.conf +++ b/bin/conf/mrl.conf @@ -12,29 +12,36 @@ mgw_ip=192.168.11.137 mrl_netcard=enp131s0f2
[MAAT_INFO]
Maat_table_path=./mrl_conf/table_info.conf
-Maat_max_threads=1
-Maat_redis_ip=192.168.11.243
-Maat_redis_port=6800
+Maat_max_threads=5
Maat_stat_path=./log/Maat_stat.log
-Maat_redis_index=5
+nominee_redis_ip=192.168.11.243
+nominee_redis_port=6800
+nominee_redis_index=5
+
+snat_candidate_redis_ip=192.168.11.243
+snat_candidate_redis_port=6800
+snat_candidate_redis_index=5
+
+dnat_candidate_redis_ip=192.168.11.243
+dnat_candidate_redis_port=6800
+dnat_candidate_redis_index=5
+
+vxlan_info_redis_ip=192.168.11.243
+vxlan_info_redis_port=6800
+vxlan_info_redis_index=5
+
+mrl_ip_redis_ip=192.168.11.243
+mrl_ip_redis_port=6800
+mrl_ip_redis_index=5
+
+dnat_policy_redis_ip=192.168.11.243
+dnat_policy_redis_port=6379
+dnat_policy_redis_index=6
[HTABLE_INFO]
ht_slot_size=1048576
ht_max_element_num=0
ht_mutex_num=5
-[VXLAN_INFO]
-vxlan_local_mac=e4:95:6e:20:0d:0a
-vxlan_local_ip=192.168.1.10
-vxlan_local_port=50710
-
-vxlan_link_dir=1
-vxlan_vpn_id=112
-
-vxlan_gdev_num=1
-vxlan_gdev_mac=00:1e:73:6c:fa:43
-vxlan_gdev_ip=10.1.1.1
-vxlan_gdev_port=4789;4788
-
-vxlan_link_id_num=1
-vxlan_link_id=1
-vxlan_inner_smac=7c:2a:31:a3:44:9a
-vxlan_inner_dmac=e8:61:1f:13:70:7a
\ No newline at end of file +[CANDIDATE_INFO]
+ip_location=Kazakhstan
+[LINK_INFO]
+link_identity_path=/run/mrzcpd/mrmonit.tunnat
diff --git a/bin/conf/table_info.conf b/bin/conf/table_info.conf index d860d44..a077928 100644 --- a/bin/conf/table_info.conf +++ b/bin/conf/table_info.conf @@ -16,4 +16,8 @@ #For expr/expr_plus Table
#id name type src_charset dst_charset do_merge cross_cache quick_mode
0 IR_NOMINEE_IP plugin 5 --
-1 IR_CANDIDATE_IP plugin 19 --
\ No newline at end of file +1 IR_CANDIDATE_IP plugin 6 --
+2 IR_DNAT_POLICY plugin 11 --
+3 IR_VXLAN_INFO plugin 5 --
+4 IR_MRL_IP_INFO plugin 5 --
+5 IR_DNAT_CANDIDATE_IP plugin 5 --
\ No newline at end of file |