From 71f3317e3bab69a75ef814b187dc704198455bca Mon Sep 17 00:00:00 2001 From: Anand B Jyoti Date: Mon, 24 Jul 2017 10:26:39 +0530 Subject: vFW: Updating config and script files of vFW JIRA: SAMPLEVNF-68 Updating the vFW Config and scripts with following: 1. Remove arp/nd route tbl from cfg files 2. Adding routeadd command to script file as route_tbl is removed from cfg files 3. Remove ports_mac_list as the l2l3 stack will initialize 4. Merge IPv4 and IPv6 cfg/tc files to reduce the number files 5. Remove 1 WT cfg files to reduce too many cfg files. Change-Id: If16ee740cd464f2cf55b8d11f590471aba9c7f30 Signed-off-by: Anand B Jyoti --- .../config/VFW_SWLB_IPV4_MultiPortPair_1Thread.cfg | 119 --------------------- 1 file changed, 119 deletions(-) delete mode 100644 VNFs/vFW/config/VFW_SWLB_IPV4_MultiPortPair_1Thread.cfg (limited to 'VNFs/vFW/config/VFW_SWLB_IPV4_MultiPortPair_1Thread.cfg') diff --git a/VNFs/vFW/config/VFW_SWLB_IPV4_MultiPortPair_1Thread.cfg b/VNFs/vFW/config/VFW_SWLB_IPV4_MultiPortPair_1Thread.cfg deleted file mode 100644 index 69527492..00000000 --- a/VNFs/vFW/config/VFW_SWLB_IPV4_MultiPortPair_1Thread.cfg +++ /dev/null @@ -1,119 +0,0 @@ -; Copyright (c) 2017 Intel Corporation -; -; Licensed under the Apache License, Version 2.0 (the "License"); -; you may not use this file except in compliance with the License. -; You may obtain a copy of the License at -; -; http:#www.apache.org/licenses/LICENSE-2.0 -; -; Unless required by applicable law or agreed to in writing, software -; distributed under the License is distributed on an "AS IS" BASIS, -; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -; See the License for the specific language governing permissions and -; limitations under the License. - -[PIPELINE0] -type = MASTER -core = 0 -[PIPELINE1] -type = ARPICMP -core = 1 - -pktq_in = SWQ2 SWQ9 -pktq_out = TXQ0.0 TXQ1.0 TXQ2.0 TXQ3.0 -; ARP route table entries (ip, mask, if_port, nh) hex values with no 0x -arp_route_tbl = (ad102814,ff000000,1,ad102814) (cb106414,ff000000,0,cb106414) -arp_route_tbl = (ac102814,ff000000,3,ac102814) (ca106414,ff000000,2,ca106414) -; Link MAC addresses in order aa:bb:cc:dd:ee:ff separated by space -; -; Hex values with no leading 0x, MACs in ascending port order starting @P0 -#ports_mac_list = 00:cb:10:64:14:00 00:ca:10:64:14:00 00:ad:10:28:14:00 00:ac:10:28:14:00 -ports_mac_list = 00:cb:10:64:14:00 00:ca:10:64:14:00 00:ad:10:28:14:00 00:ac:10:28:14:00 -; -; egress (private interface) info -pktq_in_prv = RXQ0.0 RXQ2.0 -; -;for pub port <-> prv port mapping (prv, pub) -prv_to_pub_map = (0,1)(2,3) -prv_que_handler = (0,2) -;lib_arp_debug = 1 -[PIPELINE2] -type = TXRX -core = s0c2 -pktq_in = RXQ0.0 RXQ1.0 ;SWQ4 SWQ5 ;SWQ8 SWQ9 SWQ12 SWQ13 -pktq_out = SWQ0 SWQ1 SWQ2;TXQ0.0 TXQ1.0 ;TXQ0.1 TXQ1.1 TXQ0.2 TXQ1.2 -pipeline_txrx_type = RXRX -; -[PIPELINE3] -type = LOADB -core = 3 -pktq_in = SWQ0 SWQ1 -pktq_out = SWQ3 SWQ4 ;SWQ10 SWQ11 -outport_offset = 136; 8 -n_vnf_threads = 1 -prv_que_handler = (0) -n_lb_tuples = 5 -;loadb_debug = 0 -[PIPELINE4] -type = VFW -core = s0c4 -pktq_in = SWQ3 SWQ4 -pktq_out = SWQ5 SWQ6;TXQ0.0 TXQ1.0 - -n_rules = 10000 - -;n_flows gets round up to power of 2 -n_flows = 1000000 -traffic_type = 4 -; tcp_time_wait controls timeout for closed connection, normally 120 -tcp_time_wait = 10 -tcp_be_liberal = 0 -;udp_unreplied and udp_replied controls udp "connection" timeouts, normally 30/180 -;udp_unreplied = 20 -;udp_replied = 20 - -[PIPELINE5] -type = TXRX -core = s0c2h -pktq_in = SWQ5 SWQ6 ;SWQ8 SWQ9 SWQ12 SWQ13 -pktq_out = TXQ0.1 TXQ1.1 ;TXQ0.0 TXQ1.0 ;TXQ0.1 TXQ1.1 TXQ0.2 TXQ1.2 -pipeline_txrx_type = TXTX -[PIPELINE6] -type = TXRX -core = s0c5 -pktq_in = RXQ2.0 RXQ3.0 ;SWQ4 SWQ5 ;SWQ8 SWQ9 SWQ12 SWQ13 -pktq_out = SWQ7 SWQ8 SWQ9;TXQ0.0 TXQ1.0 ;TXQ0.1 TXQ1.1 TXQ0.2 TXQ1.2 -pipeline_txrx_type = RXRX -; -[PIPELINE7] -type = LOADB -core = 6 -pktq_in = SWQ7 SWQ8 -pktq_out = SWQ9 SWQ10 ;SWQ10 SWQ11 -outport_offset = 136; 8 -n_vnf_threads = 1 -n_lb_tuples = 5 -;loadb_debug = 0 -[PIPELINE8] -type = VFW -core = s0c7 -pktq_in = SWQ9 SWQ10 -pktq_out = SWQ11 SWQ12;TXQ0.0 TXQ1.0 - -n_rules = 10000 - -;n_flows gets round up to power of 2 -n_flows = 1000000 -traffic_type = 4 -; tcp_time_wait controls timeout for closed connection, normally 120 -tcp_time_wait = 10 -tcp_be_liberal = 0 -;udp_unreplied and udp_replied controls udp "connection" timeouts, normally 30/180 -;udp_unreplied = 20 -;udp_replied = 20 -[PIPELINE9] -type = TXRX -core = s0c5h -pktq_in = SWQ11 SWQ12 ;SWQ20 SWQ21 ;RXQ0.0 RXQ1.0 ;SWQ4 SWQ5 ;SWQ8 SWQ9 SWQ12 SWQ13 -pktq_out = TXQ2.1 TXQ3.1 ;TXQ0.0 TXQ1.0 ;TXQ0.1 TXQ1.1 TXQ0.2 TXQ1.2 -pipeline_txrx_type = TXTX -- cgit 1.2.3-korg