Move arp route tbl to script and update defailt vnf config files

Change-Id: I8674caa15c9fc32cfacb17f558da5fb31094877e
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

5 files changed, 2 insertions, 128 deletions

diff --git a/samples/vnf_samples/nsut/acl/acl.cfg b/samples/vnf_samples/nsut/acl/acl.cfg
index fd3c51ee8..06da405db 100644
--- a/samples/vnf_samples/nsut/acl/acl.cfg
+++ b/samples/vnf_samples/nsut/acl/acl.cfg
@@ -20,8 +20,6 @@ type =  ARPICMP
 core = 1
 pktq_in  = SWQ4
 pktq_out = TXQ0.0 TXQ1.0 TXQ2.0 TXQ3.0
-arp_route_tbl = (c0102814,fffff000,1,c0102814) (c0106414,fffff000,0,c0106414)
-nd_route_tbl = (0064:ff9b:0:0:0:0:9810:6414,120,0,0064:ff9b:0:0:0:0:9810:6414)
 pktq_in_prv =  RXQ0.0
 prv_to_pub_map = (0,1)
 [PIPELINE2]
diff --git a/samples/vnf_samples/nsut/acl/acl_config/acl_config b/samples/vnf_samples/nsut/acl/acl_config/acl_config
deleted file mode 100644
index 52b6a5002..000000000
--- a/samples/vnf_samples/nsut/acl/acl_config/acl_config
+++ /dev/null
@@ -1,61 +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 = s{socket}c0
-[PIPELINE1]
-type = ARPICMP
-core = s{socket}c1
-pktq_in  = SWQ2
-pktq_out = SWQ7
-# debug output
-# ({port1_dst_ip},{port1_netmask},1,{port1_dst_ip}) ({port0_dst_ip},{port0_netmask},0,{port0_dst_ip})
-arp_route_tbl = ({port0_dst_ip_hex},{port0_netmask_hex},0,{port0_dst_ip_hex}) ({port1_dst_ip_hex},{port1_netmask_hex},1,{port1_dst_ip_hex})
-#ports_mac_list = port0_local_mac port1_local_mac
-ports_mac_list = {port0_local_mac} {port1_local_mac}
-pktq_in_prv =  RXQ0.0 RXQ1.0
-prv_to_pub_map = (0,1)
-prv_que_handler = (0)
-
-[PIPELINE2]
-type = TXRX
-core = s{socket}c2
-pktq_in  = RXQ0.0 RXQ1.0
-pktq_out = SWQ0 SWQ1 SWQ2
-pipeline_txrx_type = RXRX
-dest_if_offset=176
-[PIPELINE3]
-type = LOADB
-core = s{socket}c3
-pktq_in  = SWQ0 SWQ1
-pktq_out = SWQ3 SWQ4
-outport_offset = 136
-phyport_offset = 204
-n_vnf_threads = 1
-prv_que_handler = (0)
-[PIPELINE4]
-type = ACL
-core = s{socket}c4
-pktq_in  = SWQ3 SWQ4
-pktq_out = SWQ5 SWQ6
-n_flows = 1000000
-pkt_type = ipv4
-traffic_type = 4
-[PIPELINE5]
-type = TXRX
-core = s{socket}c5
-pktq_in  = SWQ5 SWQ6 SWQ7
-pktq_out = TXQ0.0 TXQ1.0
-pipeline_txrx_type = TXTX
diff --git a/samples/vnf_samples/nsut/acl/acl_config/acl_script b/samples/vnf_samples/nsut/acl/acl_config/acl_script
deleted file mode 100644
index 4d7553609..000000000
--- a/samples/vnf_samples/nsut/acl/acl_config/acl_script
+++ /dev/null
@@ -1,53 +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.
-
-link 0 down
-link 0 config {port0_local_ip} {port0_prefixlen}
-link 0 up
-link 1 down
-link 1 config {port1_local_ip} {port1_prefixlen}
-link 1 up
-
-p action add 0 accept
-p action add 0 fwd 0
-p action add 0 count
-
-p action add 1 accept
-p action add 1 fwd 1
-p action add 1 count
-
-#p acl add 1 0.0.0.0 0 0.0.0.0 0 0 65535 0 65535 0 0 0
-#p acl add 1 0.0.0.0 0 0.0.0.0 0 0 65535 0 65535 0 0 1
-
-# action rule matches dest port
-p acl add 1 {port1_local_network} {port1_prefix} 0.0.0.0 0 0 65535 0 65535 0 0 0
-p acl add 1 0.0.0.0 0 {port1_local_network} {port1_prefix} 0 65535 0 65535 0 0 1
-
-p acl add 1 {port0_local_network} {port0_prefix} 0.0.0.0 0 0 65535 0 65535 0 0 1
-p acl add 1 0.0.0.0 0 {port0_local_network} {port0_prefix} 0 65535 0 65535 0 0 0
-
-p acl add 1 {port0_local_network} {port0_prefix} {port1_local_network} {port1_prefix} 0 65535 0 65535 0 0 1
-p acl add 1 {port1_local_network} {port1_prefix} {port0_local_network} {port0_prefix} 0 65535 0 65535 0 0 0
-
-# gateway is the remote port
-p 1 arpadd 0 {port0_gateway} {port0_local_mac}
-p 1 arpadd 0 {port0_local_ip} {port0_local_mac}
-p 1 arpadd 0 {port0_dst_ip} {port0_dst_mac}
-p 1 arpadd 1 {port1_gateway} {port1_local_mac}
-p 1 arpadd 1 {port1_local_ip} {port1_local_mac}
-p 1 arpadd 1 {port1_dst_ip} {port1_dst_mac}
-
-p acl applyruleset
-
-#p acl dbg 1
diff --git a/samples/vnf_samples/nsut/cgnapt/cgnat.cfg b/samples/vnf_samples/nsut/cgnapt/cgnat.cfg
index 37c5e2731..27169f8dc 100644
--- a/samples/vnf_samples/nsut/cgnapt/cgnat.cfg
+++ b/samples/vnf_samples/nsut/cgnapt/cgnat.cfg
@@ -21,15 +21,7 @@ core = 1
 
 pktq_in  = SWQ4
 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 = (c0102814,fffff000,1,c0102814) (c0106414,fffff000,0,c0106414)
-;arp_route_tbl = (c0122814,fffff000,3,c0122814) (c0126414,fffff000,1,c0126414)
-; Link MAC addresses in order aa:bb:cc:dd:ee:ff separated by space
-nd_route_tbl = (0064:ff9b:0:0:0:0:9810:6414,120,0,0064:ff9b:0:0:0:0:9810:6414)
-;
-; Hex values with no leading 0x, MACs in ascending port order starting @P0
-;ports_mac_list = 00:05:CA:30:21:F0 00:05:CA:30:21:F1 ;00:05:CA:30:21:F2 00:05:CA:30:21:F3
-;
+
 ; egress (private interface) info
 pktq_in_prv =  RXQ0.0
 ;
@@ -72,7 +64,7 @@ key_size = 8
 hash_offset = 200;72
 ;cgnapt_debug = 2
 ;
-timer_period = 10000
+timer_period = 100
 max_clients_per_ip = 65535
 max_port_per_client = 100
 public_ip_port_range = 04040000:(1, 65535)
diff --git a/samples/vnf_samples/nsut/vfw/vfw.cfg b/samples/vnf_samples/nsut/vfw/vfw.cfg
index 8bab8d047..c0b11419c 100644
--- a/samples/vnf_samples/nsut/vfw/vfw.cfg
+++ b/samples/vnf_samples/nsut/vfw/vfw.cfg
@@ -20,8 +20,6 @@ type =  ARPICMP
 core = 1
 pktq_in  = SWQ4
 pktq_out = TXQ0.0 TXQ1.0 TXQ2.0 TXQ3.0
-arp_route_tbl = (c0102814,fffff000,1,c0102814) (c0106414,fffff000,0,c0106414)
-nd_route_tbl = (0064:ff9b:0:0:0:0:9810:6414,120,0,0064:ff9b:0:0:0:0:9810:6414)
 pktq_in_prv =  RXQ0.0
 prv_to_pub_map = (0,1)
 [PIPELINE2]