aboutsummaryrefslogtreecommitdiffstats
path: root/resources/templates/vm
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2020-08-27 07:47:31 +0000
committerPeter Mikus <pmikus@cisco.com>2020-09-03 06:41:47 +0000
commit5c7cf5a09ec1cd7ebc4077981de84c4f18aa8738 (patch)
tree864d4fec2f4698650e073a19c7b91429ceae9751 /resources/templates/vm
parent3b2dcb0348e890950dfbc3fe4aec7008d4e1f63a (diff)
Framework: Code aligments
+ Unifying code structures - To easily plug another DUT + New PCI PassThrough templates + Improved perf stat on cores allocated in test. Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: I325f17b977314f93cb91818feddfddf3e607eb8a
Diffstat (limited to 'resources/templates/vm')
-rw-r--r--resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h1024_p63_s64512.exec12
-rw-r--r--resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h16384_p63_s1032192.exec12
-rw-r--r--resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h4096_p63_s258048.exec12
-rw-r--r--resources/templates/vm/vpp_2vfpt_ethip4ipsec1tnl_nat44ed_s64512.exec17
-rw-r--r--resources/templates/vm/vpp_2vfpt_ethip4ipsec1tnl_plen30.exec12
-rw-r--r--resources/templates/vm/vpp_2vfpt_ethip4ipsec40tnl_plen30.exec12
-rw-r--r--resources/templates/vm/vpp_2vfpt_ip4base_plen24.exec12
-rw-r--r--resources/templates/vm/vpp_2vfpt_ip4scale200k_plen30.exec12
-rw-r--r--resources/templates/vm/vpp_2vfpt_ip4scale20k_plen30.exec12
-rw-r--r--resources/templates/vm/vpp_2vfpt_ip4scale2k_plen30.exec12
10 files changed, 71 insertions, 54 deletions
diff --git a/resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h1024_p63_s64512.exec b/resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h1024_p63_s64512.exec
index 3d00a60de2..c2da2ec3cc 100644
--- a/resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h1024_p63_s64512.exec
+++ b/resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h1024_p63_s64512.exec
@@ -1,11 +1,11 @@
-create interface avf 0000:00:03.0 num-rx-queues $queues
-create interface avf 0000:00:04.0 num-rx-queues $queues
+create interface avf 0000:00:06.0 num-rx-queues $queues
+create interface avf 0000:00:07.0 num-rx-queues $queues
-set interface ip address avf-0/0/3/0 $ip1
-set interface state avf-0/0/3/0 up
+set interface ip address avf-0/0/6/0 $ip1
+set interface state avf-0/0/6/0 up
-set interface ip address avf-0/0/4/0 $ip2
-set interface state avf-0/0/4/0 up
+set interface ip address avf-0/0/7/0 $ip2
+set interface state avf-0/0/7/0 up
ip route add $route1 via $nexthop1 $routeif1
ip route add $route2 via $nexthop2 $routeif2
diff --git a/resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h16384_p63_s1032192.exec b/resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h16384_p63_s1032192.exec
index 3d00a60de2..c2da2ec3cc 100644
--- a/resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h16384_p63_s1032192.exec
+++ b/resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h16384_p63_s1032192.exec
@@ -1,11 +1,11 @@
-create interface avf 0000:00:03.0 num-rx-queues $queues
-create interface avf 0000:00:04.0 num-rx-queues $queues
+create interface avf 0000:00:06.0 num-rx-queues $queues
+create interface avf 0000:00:07.0 num-rx-queues $queues
-set interface ip address avf-0/0/3/0 $ip1
-set interface state avf-0/0/3/0 up
+set interface ip address avf-0/0/6/0 $ip1
+set interface state avf-0/0/6/0 up
-set interface ip address avf-0/0/4/0 $ip2
-set interface state avf-0/0/4/0 up
+set interface ip address avf-0/0/7/0 $ip2
+set interface state avf-0/0/7/0 up
ip route add $route1 via $nexthop1 $routeif1
ip route add $route2 via $nexthop2 $routeif2
diff --git a/resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h4096_p63_s258048.exec b/resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h4096_p63_s258048.exec
index 3d00a60de2..c2da2ec3cc 100644
--- a/resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h4096_p63_s258048.exec
+++ b/resources/templates/vm/vpp_2vfpt_ethip4_nat44ed_h4096_p63_s258048.exec
@@ -1,11 +1,11 @@
-create interface avf 0000:00:03.0 num-rx-queues $queues
-create interface avf 0000:00:04.0 num-rx-queues $queues
+create interface avf 0000:00:06.0 num-rx-queues $queues
+create interface avf 0000:00:07.0 num-rx-queues $queues
-set interface ip address avf-0/0/3/0 $ip1
-set interface state avf-0/0/3/0 up
+set interface ip address avf-0/0/6/0 $ip1
+set interface state avf-0/0/6/0 up
-set interface ip address avf-0/0/4/0 $ip2
-set interface state avf-0/0/4/0 up
+set interface ip address avf-0/0/7/0 $ip2
+set interface state avf-0/0/7/0 up
ip route add $route1 via $nexthop1 $routeif1
ip route add $route2 via $nexthop2 $routeif2
diff --git a/resources/templates/vm/vpp_2vfpt_ethip4ipsec1tnl_nat44ed_s64512.exec b/resources/templates/vm/vpp_2vfpt_ethip4ipsec1tnl_nat44ed_s64512.exec
new file mode 100644
index 0000000000..1c4e0457ce
--- /dev/null
+++ b/resources/templates/vm/vpp_2vfpt_ethip4ipsec1tnl_nat44ed_s64512.exec
@@ -0,0 +1,17 @@
+create interface avf 0000:00:06.0 num-rx-queues $queues
+create interface avf 0000:00:07.0 num-rx-queues $queues
+
+set interface ip address avf-0/0/6/0 $ip1
+set interface state avf-0/0/6/0 up
+
+set interface ip address avf-0/0/7/0 $ip2
+set interface state avf-0/0/7/0 up
+
+ip route add $route1 via $nexthop1 $routeif1
+set ip neighbor static $arpif1 $arpip1 $arpmac1
+
+$nat_ipsec
+
+show logging
+
+show version \ No newline at end of file
diff --git a/resources/templates/vm/vpp_2vfpt_ethip4ipsec1tnl_plen30.exec b/resources/templates/vm/vpp_2vfpt_ethip4ipsec1tnl_plen30.exec
index 54cf42898f..b0462e1593 100644
--- a/resources/templates/vm/vpp_2vfpt_ethip4ipsec1tnl_plen30.exec
+++ b/resources/templates/vm/vpp_2vfpt_ethip4ipsec1tnl_plen30.exec
@@ -1,11 +1,11 @@
-create interface avf 0000:00:03.0 num-rx-queues $queues
-create interface avf 0000:00:04.0 num-rx-queues $queues
+create interface avf 0000:00:06.0 num-rx-queues $queues
+create interface avf 0000:00:07.0 num-rx-queues $queues
-set interface ip address avf-0/0/3/0 $ip1
-set interface state avf-0/0/3/0 up
+set interface ip address avf-0/0/6/0 $ip1
+set interface state avf-0/0/6/0 up
-set interface ip address avf-0/0/4/0 $ip2
-set interface state avf-0/0/4/0 up
+set interface ip address avf-0/0/7/0 $ip2
+set interface state avf-0/0/7/0 up
ip route add $route1 via $nexthop1 $routeif1
set ip neighbor static $arpif1 $arpip1 $arpmac1
diff --git a/resources/templates/vm/vpp_2vfpt_ethip4ipsec40tnl_plen30.exec b/resources/templates/vm/vpp_2vfpt_ethip4ipsec40tnl_plen30.exec
index 54cf42898f..b0462e1593 100644
--- a/resources/templates/vm/vpp_2vfpt_ethip4ipsec40tnl_plen30.exec
+++ b/resources/templates/vm/vpp_2vfpt_ethip4ipsec40tnl_plen30.exec
@@ -1,11 +1,11 @@
-create interface avf 0000:00:03.0 num-rx-queues $queues
-create interface avf 0000:00:04.0 num-rx-queues $queues
+create interface avf 0000:00:06.0 num-rx-queues $queues
+create interface avf 0000:00:07.0 num-rx-queues $queues
-set interface ip address avf-0/0/3/0 $ip1
-set interface state avf-0/0/3/0 up
+set interface ip address avf-0/0/6/0 $ip1
+set interface state avf-0/0/6/0 up
-set interface ip address avf-0/0/4/0 $ip2
-set interface state avf-0/0/4/0 up
+set interface ip address avf-0/0/7/0 $ip2
+set interface state avf-0/0/7/0 up
ip route add $route1 via $nexthop1 $routeif1
set ip neighbor static $arpif1 $arpip1 $arpmac1
diff --git a/resources/templates/vm/vpp_2vfpt_ip4base_plen24.exec b/resources/templates/vm/vpp_2vfpt_ip4base_plen24.exec
index 7563309a68..96727ac5e4 100644
--- a/resources/templates/vm/vpp_2vfpt_ip4base_plen24.exec
+++ b/resources/templates/vm/vpp_2vfpt_ip4base_plen24.exec
@@ -1,11 +1,11 @@
-create interface avf 0000:00:03.0 num-rx-queues $queues
-create interface avf 0000:00:04.0 num-rx-queues $queues
+create interface avf 0000:00:06.0 num-rx-queues $queues
+create interface avf 0000:00:07.0 num-rx-queues $queues
-set interface ip address avf-0/0/3/0 $ip1
-set interface state avf-0/0/3/0 up
+set interface ip address avf-0/0/6/0 $ip1
+set interface state avf-0/0/6/0 up
-set interface ip address avf-0/0/4/0 $ip2
-set interface state avf-0/0/4/0 up
+set interface ip address avf-0/0/7/0 $ip2
+set interface state avf-0/0/7/0 up
ip route add $route1 via $nexthop1 $routeif1
ip route add $route2 via $nexthop2 $routeif2
diff --git a/resources/templates/vm/vpp_2vfpt_ip4scale200k_plen30.exec b/resources/templates/vm/vpp_2vfpt_ip4scale200k_plen30.exec
index 1afa8c338f..192d2bc600 100644
--- a/resources/templates/vm/vpp_2vfpt_ip4scale200k_plen30.exec
+++ b/resources/templates/vm/vpp_2vfpt_ip4scale200k_plen30.exec
@@ -1,11 +1,11 @@
-create interface avf 0000:00:03.0 num-rx-queues $queues
-create interface avf 0000:00:04.0 num-rx-queues $queues
+create interface avf 0000:00:06.0 num-rx-queues $queues
+create interface avf 0000:00:07.0 num-rx-queues $queues
-set interface ip address avf-0/0/3/0 $ip1
-set interface state avf-0/0/3/0 up
+set interface ip address avf-0/0/6/0 $ip1
+set interface state avf-0/0/6/0 up
-set interface ip address avf-0/0/4/0 $ip2
-set interface state avf-0/0/4/0 up
+set interface ip address avf-0/0/7/0 $ip2
+set interface state avf-0/0/7/0 up
ip route add $route1 count 100000 via $nexthop1 $routeif1
ip route add $route2 count 100000 via $nexthop2 $routeif2
diff --git a/resources/templates/vm/vpp_2vfpt_ip4scale20k_plen30.exec b/resources/templates/vm/vpp_2vfpt_ip4scale20k_plen30.exec
index 8087fdb31e..ca8be4a498 100644
--- a/resources/templates/vm/vpp_2vfpt_ip4scale20k_plen30.exec
+++ b/resources/templates/vm/vpp_2vfpt_ip4scale20k_plen30.exec
@@ -1,11 +1,11 @@
-create interface avf 0000:00:03.0 num-rx-queues $queues
-create interface avf 0000:00:04.0 num-rx-queues $queues
+create interface avf 0000:00:06.0 num-rx-queues $queues
+create interface avf 0000:00:07.0 num-rx-queues $queues
-set interface ip address avf-0/0/3/0 $ip1
-set interface state avf-0/0/3/0 up
+set interface ip address avf-0/0/6/0 $ip1
+set interface state avf-0/0/6/0 up
-set interface ip address avf-0/0/4/0 $ip2
-set interface state avf-0/0/4/0 up
+set interface ip address avf-0/0/7/0 $ip2
+set interface state avf-0/0/7/0 up
ip route add $route1 count 10000 via $nexthop1 $routeif1
ip route add $route2 count 10000 via $nexthop2 $routeif2
diff --git a/resources/templates/vm/vpp_2vfpt_ip4scale2k_plen30.exec b/resources/templates/vm/vpp_2vfpt_ip4scale2k_plen30.exec
index 480abc50fc..652e24ee0a 100644
--- a/resources/templates/vm/vpp_2vfpt_ip4scale2k_plen30.exec
+++ b/resources/templates/vm/vpp_2vfpt_ip4scale2k_plen30.exec
@@ -1,11 +1,11 @@
-create interface avf 0000:00:03.0 num-rx-queues $queues
-create interface avf 0000:00:04.0 num-rx-queues $queues
+create interface avf 0000:00:06.0 num-rx-queues $queues
+create interface avf 0000:00:07.0 num-rx-queues $queues
-set interface ip address avf-0/0/3/0 $ip1
-set interface state avf-0/0/3/0 up
+set interface ip address avf-0/0/6/0 $ip1
+set interface state avf-0/0/6/0 up
-set interface ip address avf-0/0/4/0 $ip2
-set interface state avf-0/0/4/0 up
+set interface ip address avf-0/0/7/0 $ip2
+set interface state avf-0/0/7/0 up
ip route add $route1 count 1000 via $nexthop1 $routeif1
ip route add $route2 count 1000 via $nexthop2 $routeif2