vlib: exec cli line-by-line processing and script updates

Type: improvement
Change-Id: I82e7c0acc547794bcc7c42f4b8881a8251bf7a9b
Signed-off-by: Damjan Marion <damarion@cisco.com>

src/plugins/adl/setup.pg

@@ -6,46 +6,46 @@ set int ip6 table loop0 0
 set int ip address loop0 2001:db01::1/64
 set int state loop0 up
 
-packet-generator new {
-    name ip4
-    limit 100
-    rate 0
-    size 128-128
-    interface loop0
-    node adl-input
-    data { IP4: 1.2.40 -> 3cfd.fed0.b6c8
-           UDP: 192.168.1.2-192.168.1.10 -> 192.168.2.1
-           UDP: 1234 -> 2345
-           incrementing 114
-    }
+packet-generator new {						\
+    name ip4							\
+    limit 100							\
+    rate 0							\
+    size 128-128						\
+    interface loop0						\
+    node adl-input						\
+    data { IP4: 1.2.40 -> 3cfd.fed0.b6c8			\
+           UDP: 192.168.1.2-192.168.1.10 -> 192.168.2.1		\
+           UDP: 1234 -> 2345					\
+           incrementing 114					\
+    }								\
 }
 
-packet-generator new {
-    name ip6-allow
-    limit 50
-    rate 0
-    size 128-128
-    interface loop0
-    node adl-input
-    data { IP6: 1.2.40 -> 3cfd.fed0.b6c8
-           UDP: 2001:db01::2 -> 2001:db01::1
-           UDP: 1234 -> 2345
-           incrementing 80
-    }
+packet-generator new {						\
+    name ip6-allow						\
+    limit 50							\
+    rate 0							\
+    size 128-128						\
+    interface loop0						\
+    node adl-input						\
+    data { IP6: 1.2.40 -> 3cfd.fed0.b6c8			\
+           UDP: 2001:db01::2 -> 2001:db01::1			\
+           UDP: 1234 -> 2345					\
+           incrementing 80					\
+    }								\
 }
 
-packet-generator new {
-    name ip6-drop
-    limit 50
-    rate 0
-    size 128-128
-    interface loop0
-    node adl-input
-    data { IP6: 1.2.40 -> 3cfd.fed0.b6c8
-           UDP: 2001:db01::3 -> 2001:db01::1
-           UDP: 1234 -> 2345
-           incrementing 80
-    }
+packet-generator new {						\
+    name ip6-drop						\
+    limit 50							\
+    rate 0							\
+    size 128-128						\
+    interface loop0						\
+    node adl-input						\
+    data { IP6: 1.2.40 -> 3cfd.fed0.b6c8			\
+           UDP: 2001:db01::3 -> 2001:db01::1			\
+           UDP: 1234 -> 2345					\
+           incrementing 80					\
+    }								\
 }
 
 ip table 1

src/plugins/cdp/cdp.pg

@@ -1,7 +1,7 @@
-packet-generator new {
-  name cdp
-  limit 1
-  node cdp-input
-  size 374-374
-  data { hex 0x02b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2043333735304520536f66747761726520284333373530452d554e4956455253414c2d4d292c2056657273696f6e2031322e32283335295345352c2052454c4541534520534f4654574152452028666331290a436f707972696768742028632920313938362d3230303720627920436973636f2053797374656d732c20496e632e0a436f6d70696c6564205468752031392d4a756c2d30372031363a3137206279206e616368656e00060018636973636f2057532d4333373530452d3234544400020011000000010101cc0004000000000003001b54656e4769676162697445746865726e6574312f302f3100040008000000280008002400000c011200000000ffffffff010221ff000000000000001e7a50f000ff000000090004000a00060001000b0005010012000500001300050000160011000000010101cc000400000000001a00100000000100000000ffffffff }
+packet-generator new {							\
+  name cdp								\
+  limit 1								\
+  node cdp-input							\
+  size 374-374								\
+  data { hex 0x02b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2043333735304520536f66747761726520284333373530452d554e4956455253414c2d4d292c2056657273696f6e2031322e32283335295345352c2052454c4541534520534f4654574152452028666331290a436f707972696768742028632920313938362d3230303720627920436973636f2053797374656d732c20496e632e0a436f6d70696c6564205468752031392d4a756c2d30372031363a3137206279206e616368656e00060018636973636f2057532d4333373530452d3234544400020011000000010101cc0004000000000003001b54656e4769676162697445746865726e6574312f302f3100040008000000280008002400000c011200000000ffffffff010221ff000000000000001e7a50f000ff000000090004000a00060001000b0005010012000500001300050000160011000000010101cc000400000000001a00100000000100000000ffffffff } \
 }

src/plugins/tracedump/setup.pg

@@ -1,33 +1,33 @@
 set term pag off
 
-packet-generator new {
-    name worker0
-    worker 0
-    limit 12
-    rate 1.2e7
-    size 128-128
-    interface local0
-    node ethernet-input
-    data { IP4: 1.2.40 -> 3cfd.fed0.b6c8
-           UDP: 192.168.40.1 - 192.168.40.100 -> 192.168.50.10
-           UDP: 1234 -> 2345
-           incrementing 114
-    }
+packet-generator new {						\
+    name worker0						\
+    worker 0							\
+    limit 12							\
+    rate 1.2e7							\
+    size 128-128						\
+    interface local0						\
+    node ethernet-input						\
+    data { IP4: 1.2.40 -> 3cfd.fed0.b6c8			\
+           UDP: 192.168.40.1 - 192.168.40.100 -> 192.168.50.10	\
+           UDP: 1234 -> 2345					\
+           incrementing 114					\
+    }								\
 }
 
-packet-generator new {
-    name worker1
-    worker 1
-    limit 12
-    rate 1.2e7
-    size 128-128
-    interface local0
-    node ethernet-input
-    data { IP4: 1.2.4 -> 3cfd.fed0.b6c9
-           UDP: 192.168.41.1 - 192.168.41.100 -> 192.168.51.10
-           UDP: 1234 -> 2345
-           incrementing 114
-    }
+packet-generator new {						\
+    name worker1						\
+    worker 1							\
+    limit 12							\
+    rate 1.2e7							\
+    size 128-128						\
+    interface local0						\
+    node ethernet-input						\
+    data { IP4: 1.2.4 -> 3cfd.fed0.b6c9				\
+           UDP: 192.168.41.1 - 192.168.41.100 -> 192.168.51.10	\
+           UDP: 1234 -> 2345					\
+           incrementing 114					\
+    }								\
 }
 
 trace add pg-input 20

src/plugins/vrrp/setup.pg

@@ -7,14 +7,14 @@ set int state loop0 up
 
 comment { Packet generator script. Src MAC 00:de:ad:be:ef:01 }
 comment { Dst mac 01:ba:db:ab:be:01 ethtype 0800 }
-packet-generator new {
-    name simple
-    limit 1
-    size 128-128
-    interface loop0
-    node vrrp
-    data {
-        hex 0x00deadbeef0001badbabbe010800 
-        incrementing 30
-    }
+packet-generator new {						\
+    name simple							\
+    limit 1							\
+    size 128-128						\
+    interface loop0						\
+    node vrrp							\
+    data {							\
+        hex 0x00deadbeef0001badbabbe010800 			\
+        incrementing 30						\
+    }								\
 }

src/scripts/vnet/arp4

@@ -1,13 +1,13 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    ICMP: 1.0.0.2 -> 2.0.0.2
-    ICMP echo_request
-    incrementing 100
-  }
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    ICMP: 1.0.0.2 -> 2.0.0.2					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
 
 trace add pg-input 100

src/scripts/vnet/arp4-mpls

@@ -1,13 +1,13 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    ICMP: 1.0.0.2 -> 2.2.2.2
-    ICMP echo_request
-    incrementing 100
-  }
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    ICMP: 1.0.0.2 -> 2.2.2.2					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
 
 loop create

src/scripts/vnet/arp6

@@ -1,13 +1,13 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip6-input
-  size 64-64
-  data {
-    ICMP6: 2000::2 -> 2001::2
-    ICMP echo_request
-    incrementing 100
-  }
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node ip6-input						\
+  size 64-64							\
+  data {							\
+    ICMP6: 2000::2 -> 2001::2					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
 
 tr add pg-input 100

src/scripts/vnet/bvi

@@ -3,12 +3,12 @@
 set int state tuntap-0 down
 set int ip address GigabitEthernet2/1/0 1.2.3.4/24
 
-set int state GigabitEthernet2/1/0 up 
-cre sub GigabitEthernet2/1/0 1 dot1q 7 
+set int state GigabitEthernet2/1/0 up
+cre sub GigabitEthernet2/1/0 1 dot1q 7
 set int state GigabitEthernet2/1/0.1 up
 
 set int state GigabitEthernet2/2/0 up
-cre sub GigabitEthernet2/2/0 1 dot1q 9 
+cre sub GigabitEthernet2/2/0 1 dot1q 9
 set int state GigabitEthernet2/2/0.1 up
 
 
@@ -22,7 +22,7 @@ set int l2 bridge GigabitEthernet2/1/0.1 0
 set int l2 bridge GigabitEthernet2/2/0.1 0
 
 set int l2 tag-rewrite GigabitEthernet2/1/0.1 pop 1
-set int l2 tag-rewrite GigabitEthernet2/2/0.1 pop 1 
+set int l2 tag-rewrite GigabitEthernet2/2/0.1 pop 1
 
 l2fib add 00:22:44:06:08:0a    0  GigabitEthernet2/1/0.1 static
 l2fib add 00:02:04:06:08:0a    0  GigabitEthernet2/2/0.1 static
@@ -38,36 +38,36 @@ cle er
 cle int
 cle run
 
-packet-generator new {
-  name bvi_to_l2 
-  limit 100
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
-      GRE: 1.2.3.3 -> 8.0.0.1 mpls_unicast 
+packet-generator new {					\
+  name bvi_to_l2 					\
+  limit 100						\
+  node ethernet-input					\
+  interface GigabitEthernet2/1/0			\
+  data {						\
+      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 		\
+      GRE: 1.2.3.3 -> 8.0.0.1 mpls_unicast 		\
   }
 }
 
-packet-generator new {
-  name l2_to_bvi
-  limit 50
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP4: 0050.56b7.7c83 -> dead.0000.0000  vlan 9
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
+packet-generator new {					\
+  name l2_to_bvi					\
+  limit 50						\
+  node ethernet-input					\
+  interface GigabitEthernet2/2/0			\
+  data {						\
+      IP4: 0050.56b7.7c83 -> dead.0000.0000  vlan 9	\
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 		\
+  }							\
 }
 
-packet-generator new {
-  name l2_to_bvi_via_flood
-  limit 25
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP4: 0050.56b7.7c83 -> ffff.ffff.ffff  vlan 9
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
+packet-generator new {					\
+  name l2_to_bvi_via_flood				\
+  limit 25						\
+  node ethernet-input					\
+  interface GigabitEthernet2/2/0			\
+  data {						\
+      IP4: 0050.56b7.7c83 -> ffff.ffff.ffff  vlan 9	\
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 		\
+  }							\
 }
 

src/scripts/vnet/gre

@@ -26,60 +26,60 @@ set int ip address gre1 ::2/128
 ip route add 192:168:3::0/64 via gre1
 set int state gre1 up
 
-packet-generator new {
-  name gre4-tx
-  limit -1
-  node ip4-input
-  size 64-64
-  interface pg0
-  data {
-    UDP: 192.168.1.2 -> 192.168.3.1
-    UDP: 4321 -> 1234
-      length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name gre4-tx							\
+  limit -1							\
+  node ip4-input						\
+  size 64-64							\
+  interface pg0							\
+  data {							\
+    UDP: 192.168.1.2 -> 192.168.3.1				\
+    UDP: 4321 -> 1234						\
+      length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
-packet-generator new {
-  name gre4-rx
-  limit -1
-  node ip6-input
-  size 72-72
-  interface pg1
-  data {
-    GRE: 192:168:2::2 -> 192:168:2::1
-      ip4
-        UDP: 192.168.3.1 -> 192.168.1.2
-        UDP: 1234 -> 4321
-          length 128 checksum 0 incrementing 1
- }
+packet-generator new {						\
+  name gre4-rx							\
+  limit -1							\
+  node ip6-input						\
+  size 72-72							\
+  interface pg1							\
+  data {							\
+    GRE: 192:168:2::2 -> 192:168:2::1				\
+      ip4							\
+        UDP: 192.168.3.1 -> 192.168.1.2				\
+        UDP: 1234 -> 4321					\
+          length 128 checksum 0 incrementing 1			\
+ }								\
 }
 
-packet-generator new {
-  name gre6-tx
-  limit -1
-  node ip6-input
-  size 64-64
-  interface pg0
-  data {
-    UDP: 192:168:1::2 -> 192:168:3::1
-    UDP: 4321 -> 1234
-      length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name gre6-tx							\
+  limit -1							\
+  node ip6-input						\
+  size 64-64							\
+  interface pg0							\
+  data {							\
+    UDP: 192:168:1::2 -> 192:168:3::1				\
+    UDP: 4321 -> 1234						\
+      length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
-packet-generator new {
-  name gre6-rx
-  limit -1
-  node ip4-input
-  size 72-72
-  interface pg1
-  data {
-    GRE: 192.168.2.2 -> 192.168.2.1
-      ip6
-        UDP: 192:168:3::1 -> 192:168:1::2
-        UDP: 1234 -> 4321
-          length 128 checksum 0 incrementing 1
- }
+packet-generator new {						\
+  name gre6-rx							\
+  limit -1							\
+  node ip4-input						\
+  size 72-72							\
+  interface pg1							\
+  data {							\
+    GRE: 192.168.2.2 -> 192.168.2.1				\
+      ip6							\
+        UDP: 192:168:3::1 -> 192:168:1::2			\
+        UDP: 1234 -> 4321					\
+          length 128 checksum 0 incrementing 1			\
+ }								\
 }
 
 packet-generator enable

src/scripts/vnet/gre-teb

@@ -10,30 +10,30 @@ set int state gre0 up
 set int l2 xconnect pg0 gre0
 set int l2 xconnect gre0 pg0
 
-packet-generator new {
-  name tx
-  limit -1
-  node ethernet-input
-  size 64-64
-  interface pg0
-  data {
-    0x8881: 4:4:4:4:4:4 -> 5:5:5:5:5:5
-    incrementing 100
-  }
+packet-generator new {						\
+  name tx							\
+  limit -1							\
+  node ethernet-input						\
+  size 64-64							\
+  interface pg0							\
+  data {							\
+    0x8881: 4:4:4:4:4:4 -> 5:5:5:5:5:5				\
+    incrementing 100						\
+  }								\
 }
 
-packet-generator new {
-  name rx
-  limit -1
-  node ip4-input
-  size 72-72
-  interface pg1
-  data {
-    GRE: 192.168.2.2 -> 192.168.2.1
-      teb
-        0x8881: 4:4:4:4:4:4 -> 5:5:5:5:5:5
-        incrementing 100
-  }
+packet-generator new {						\
+  name rx							\
+  limit -1							\
+  node ip4-input						\
+  size 72-72							\
+  interface pg1							\
+  data {							\
+    GRE: 192.168.2.2 -> 192.168.2.1				\
+      teb							\
+        0x8881: 4:4:4:4:4:4 -> 5:5:5:5:5:5			\
+        incrementing 100					\
+  }								\
 }
 
 packet-generator enable

src/scripts/vnet/icmp

@@ -1,13 +1,13 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    ICMP: 1.2.3.4 -> 5.6.7.8
-    ICMP echo_request
-    incrementing 100
-  }
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    ICMP: 1.2.3.4 -> 5.6.7.8					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
 
 tr add pg-input 100

src/scripts/vnet/icmp6

@@ -1,13 +1,13 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip6-input
-  size 64-64
-  data {
-    ICMP6: ::1 -> ::2
-    ICMP echo_request
-    incrementing 100
-  }
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node ip6-input						\
+  size 64-64							\
+  data {							\
+    ICMP6: ::1 -> ::2						\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
 
 tr add pg-input 100

src/scripts/vnet/ige

@@ -1,12 +1,12 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-lookup
-  size 50-50
-  data {
-    ICMP: 1.0.0.1 -> 1.0.0.3 ttl 1
-    incrementing 30
-  }
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node ip4-lookup						\
+  size 50-50							\
+  data {							\
+    ICMP: 1.0.0.1 -> 1.0.0.3 ttl 1				\
+    incrementing 30						\
+  }								\
 }
 
 comment { tr add pg-input 100 }

src/scripts/vnet/ip6

@@ -1,14 +1,14 @@
-packet-generator new {
-  name x
-  limit 1
-  node ethernet-input
-  size 64-64
-  data {
-    IP6: 1.2.3 -> 4.5.6
-    ICMP: 3002::2 -> 3001::2
-    ICMP echo_request
-    incrementing 100
-  }
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node ethernet-input						\
+  size 64-64							\
+  data {							\
+    IP6: 1.2.3 -> 4.5.6						\
+    ICMP: 3002::2 -> 3001::2					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
 
 

src/scripts/vnet/ip6-hbh

@@ -1,78 +1,78 @@
 tap connect tap0
 set int state tap-0 up
 set int ip address tap-0 1::1/64
-packet-generator new {
-  name hbh1
-  limit 1
-  node ip6-input
-  size 48-48
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    hex 0x3B00010403040506
-    incrementing 100
-  }
+packet-generator new {						\
+  name hbh1							\
+  limit 1							\
+  node ip6-input						\
+  size 48-48							\
+  data {							\
+    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2			\
+    hex 0x3B00010403040506					\
+    incrementing 100						\
+  }								\
 }
-packet-generator new {
-  name hbh2
-  limit 1
-  node ip6-input
-  size 48-48
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    hex 0x3B00C10403040506
-    incrementing 100
-  }
+packet-generator new {						\
+  name hbh2							\
+  limit 1							\
+  node ip6-input						\
+  size 48-48							\
+  data {							\
+    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2			\
+    hex 0x3B00C10403040506					\
+    incrementing 100						\
+  }								\
 }
 
-packet-generator new {
-  name hbh3
-  limit 1
-  node ip6-input
-  size 48-48
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    hex 0x3BffC10403040506
-    incrementing 100
-  }
+packet-generator new {						\
+  name hbh3							\
+  limit 1							\
+  node ip6-input						\
+  size 48-48							\
+  data {							\
+    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2			\
+    hex 0x3BffC10403040506					\
+    incrementing 100						\
+  }								\
 }
 
-packet-generator new {
-  name hbh4
-  limit 1
-  node ip6-input
-  size 64-64
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    hex 0x3BffC10403040506
-    incrementing 100
-  }
+packet-generator new {						\
+  name hbh4							\
+  limit 1							\
+  node ip6-input						\
+  size 64-64							\
+  data {							\
+    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2			\
+    hex 0x3BffC10403040506					\
+    incrementing 100						\
+  }								\
 }
 
-packet-generator new {
-  name hbh5
-  limit 1
-  node ip6-input
-  size 56-56
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    length 16
-    hex 0x3B010104030405060106030405060708
-    incrementing 100
-  }
+packet-generator new {						\
+  name hbh5							\
+  limit 1							\
+  node ip6-input						\
+  size 56-56							\
+  data {							\
+    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2			\
+    length 16							\
+    hex 0x3B010104030405060106030405060708			\
+    incrementing 100						\
+  }								\
 }
 
-packet-generator new {
-  name hbh6
-  limit 1
-  node ip6-input
-  size 56-56
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    length 16
-    hex 0x3a00050200000100
-    ICMP echo_request
-    incrementing 100
-  }
+packet-generator new {						\
+  name hbh6							\
+  limit 1							\
+  node ip6-input						\
+  size 56-56							\
+  data {							\
+    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2			\
+    length 16							\
+    hex 0x3a00050200000100					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
 
 tr add pg-input 100

src/scripts/vnet/ipsec

@@ -41,31 +41,31 @@ set ip neighbor pg0 192.168.0.2 00:11:22:33:44:66
 
 trace add pg-input 100
 
-packet-generator new {
-  name ipsec1
-  limit 1
-  rate 1e4
-  node ip4-input
-  interface pg0
-  size 100-100
-  data {
-   UDP: 192.168.0.2 -> 192.168.1.2
-   UDP: 4321 -> 1234
-    length 72
-    incrementing 100
-  }
+packet-generator new {						\
+  name ipsec1							\
+  limit 1							\
+  rate 1e4							\
+  node ip4-input						\
+  interface pg0							\
+  size 100-100							\
+  data {							\
+   UDP: 192.168.0.2 -> 192.168.1.2				\
+   UDP: 4321 -> 1234						\
+    length 72							\
+    incrementing 100						\
+  }								\
 }
-packet-generator new {
-  name ipsec2
-  limit 1
-  rate 1e4
-  node ip4-input
-  interface pg1
-  size 100-100
-  data {
-   UDP: 192.168.1.2 -> 192.168.0.2
-   UDP: 4321 -> 1234
-    length 72
-    incrementing 100
-  }
+packet-generator new {						\
+  name ipsec2							\
+  limit 1							\
+  rate 1e4							\
+  node ip4-input						\
+  interface pg1							\
+  size 100-100							\
+  data {							\
+   UDP: 192.168.1.2 -> 192.168.0.2				\
+   UDP: 4321 -> 1234						\
+    length 72							\
+    incrementing 100						\
+  }								\
 }

src/scripts/vnet/ipsec_spd

@@ -39,17 +39,17 @@ set ip neighbor pg1 192.168.1.2 00:11:22:33:44:55
 
 trace add pg-input 100
 
-packet-generator new {
-  name ipsec1
-  limit 1
-  rate 1e4
-  node ip4-input
-  interface pg0
-  size 100-100
-  data {
-   UDP: 192.168.0.2 -> 10.6.0.1
-   UDP: 4321 -> 1234
-    length 72
-    incrementing 100
-  }
+packet-generator new {						\
+  name ipsec1							\
+  limit 1							\
+  rate 1e4							\
+  node ip4-input						\
+  interface pg0							\
+  size 100-100							\
+  data {							\
+   UDP: 192.168.0.2 -> 10.6.0.1					\
+   UDP: 4321 -> 1234						\
+    length 72							\
+    incrementing 100						\
+  }								\
 }

src/scripts/vnet/ipsec_spd_vrf

@@ -39,34 +39,34 @@ set ip neighbor pg0.3 192.168.0.2 00:11:22:33:44:55
 
 trace add pg-input 100
 
-packet-generator new {
-  name ipsec2
-  limit 1
-  rate 1e4
-  node ethernet-input
-  interface pg0
-  size 100-100
-  data {
-   IP4: 1.2.3 -> 4.5.6 vlan 1
-   UDP: 10.5.0.1 -> 10.6.0.1
-   UDP: 4321 -> 1234
-    length 72
-    incrementing 100
-  }
+packet-generator new {						\
+  name ipsec2							\
+  limit 1							\
+  rate 1e4							\
+  node ethernet-input						\
+  interface pg0							\
+  size 100-100							\
+  data {							\
+   IP4: 1.2.3 -> 4.5.6 vlan 1					\
+   UDP: 10.5.0.1 -> 10.6.0.1					\
+   UDP: 4321 -> 1234						\
+    length 72							\
+    incrementing 100						\
+  }								\
 }
 
-packet-generator new {
-  name ipsec3
-  limit 1
-  rate 1e4
-  node ethernet-input
-  interface pg0
-  size 100-100
-  data {
-   IP4: 1.2.3 -> 4.5.6 vlan 1
-   UDP: 10.5.0.1 -> 10.6.0.22
-   UDP: 4321 -> 1234
-    length 72
-    incrementing 100
-  }
+packet-generator new {						\
+  name ipsec3							\
+  limit 1							\
+  rate 1e4							\
+  node ethernet-input						\
+  interface pg0							\
+  size 100-100							\
+  data {							\
+   IP4: 1.2.3 -> 4.5.6 vlan 1					\
+   UDP: 10.5.0.1 -> 10.6.0.22					\
+   UDP: 4321 -> 1234						\
+    length 72							\
+    incrementing 100						\
+  }								\
 }

src/scripts/vnet/ixge

@@ -1,15 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-lookup
-  size 50-50
-  data {
-    ICMP: 1.0.0.1 -> 1.0.0.3 ttl 1
-    incrementing 30
-  }
-}
-
-comment { tr add pg-input 100 }
-set int ip address TenGigabitEthernet5/0/0 33.0.1.1/8
-set int state TenGigabitEthernet5/0/0 up
-

src/scripts/vnet/l2efpfilter

@@ -45,36 +45,36 @@ clear error
 clear run
 clear int
 
-packet-generator new {
-  name pre_vtr_fail
-  limit 10
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:11 vlan 1
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
+packet-generator new {						\
+  name pre_vtr_fail						\
+  limit 10							\
+  node ethernet-input						\
+  interface GigabitEthernet2/1/0				\
+  data {							\
+      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:11 vlan 1		\
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 			\
+  }								\
 }
 
-packet-generator new {
-  name post_vtr_pass
-  limit 20
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 2
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
+packet-generator new {						\
+  name post_vtr_pass						\
+  limit 20							\
+  node ethernet-input						\
+  interface GigabitEthernet2/1/0				\
+  data {							\
+      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 2		\
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 			\
+  }								\
 }
 
-packet-generator new {
-  name post_vtr_fail
-  limit 50
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 3
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
+packet-generator new {						\
+  name post_vtr_fail						\
+  limit 50							\
+  node ethernet-input						\
+  interface GigabitEthernet2/1/0				\
+  data {							\
+      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 3		\
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 			\
+  }								\
 }
 

src/scripts/vnet/l2efpfilter_perf

@@ -45,13 +45,13 @@ clear error
 clear run
 clear int
 
-packet-generator new {
-  name post_vtr_pass
-  limit 9111003
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 2
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
+packet-generator new {						\
+  name post_vtr_pass						\
+  limit 9111003							\
+  node ethernet-input						\
+  interface GigabitEthernet2/1/0				\
+  data {							\
+      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 2		\
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 			\
+  }								\
 }

src/scripts/vnet/l2fib

@@ -25,20 +25,20 @@ clear error
 clear run
 clear int
 
-packet-generator new {
-  name new_input_if_index_mac_move
-  limit 4
-  node ethernet-input 
-  interface GigabitEthernet2/1/0
-  size 98-98
-  data { hex 0x00010203040500020406080a080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
+packet-generator new {							\
+  name new_input_if_index_mac_move					\
+  limit 4								\
+  node ethernet-input 							\
+  interface GigabitEthernet2/1/0					\
+  size 98-98								\
+  data { hex 0x00010203040500020406080a080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff } \
 }
 
-packet-generator new {
-  name dmac_hit
-  limit 7
-  node ethernet-input 
-  interface GigabitEthernet2/2/0
-  size 98-98
-  data { hex 0x00020406080a00224406080a8100000981000011080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
+packet-generator new {							\
+  name dmac_hit								\
+  limit 7								\
+  node ethernet-input 							\
+  interface GigabitEthernet2/2/0					\
+  size 98-98								\
+  data { hex 0x00020406080a00224406080a8100000981000011080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }	\
 }

src/scripts/vnet/l2fib_perf

@@ -17,12 +17,12 @@ cle er
 cle int
 cle run
 
-packet-generator new {
-  name perf
-  limit 9111003
-  node ethernet-input 
-  interface GigabitEthernet2/2/0.1 
-  size 98-98
-  data { hex 0x00224406080a00020406080a81000009080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
+packet-generator new {							\
+  name perf								\
+  limit 9111003								\
+  node ethernet-input 							\
+  interface GigabitEthernet2/2/0.1 					\
+  size 98-98								\
+  data { hex 0x00224406080a00020406080a81000009080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }	\
 }
 

src/scripts/vnet/l2fib_xc

@@ -19,12 +19,12 @@ clear error
 clear run
 clear int
 
-packet-generator new {
-  name xc
-  limit 11
-  node ethernet-input 
-  interface GigabitEthernet2/1/0
-  size 98-98
-  data { hex 0x00010203040500020406080a080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
+packet-generator new {						\
+  name xc							\
+  limit 11							\
+  node ethernet-input 						\
+  interface GigabitEthernet2/1/0				\
+  size 98-98							\
+  data { hex 0x00010203040500020406080a080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }	\
 }
 

src/scripts/vnet/l2flood

@@ -27,15 +27,14 @@ clear error
 clear run
 clear int
 
-packet-generator new {
-  name flood
-  limit 1
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> ffff.ffff.ffff  vlan 1
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-
+packet-generator new {						\
+  name flood							\
+  limit 1							\
+  node ethernet-input						\
+  interface GigabitEthernet2/1/0				\
+  data {							\
+      IP4: 0050.56b7.7c83 -> ffff.ffff.ffff  vlan 1		\
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 			\
+  }								\
 }
 

src/scripts/vnet/l2tp

@@ -38,91 +38,91 @@ clear error
 clear run
 clear int
 
-packet-generator new {
-  name decap
-  limit 10
-  size 200-200
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
-      L2TP: 11::1 -> 22::2 
-      L2TP: session_id 1 cookie 0xffffffffffffffff 
-      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
+packet-generator new {							\
+  name decap								\
+  limit 10								\
+  size 200-200								\
+  node ethernet-input							\
+  interface GigabitEthernet2/2/0					\
+  data {								\
+      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 			\
+      L2TP: 11::1 -> 22::2 						\
+      L2TP: session_id 1 cookie 0xffffffffffffffff 			\
+      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01			\
+      UDP: 1.2.3.4 -> 5.6.7.8						\
+      incrementing 8							\
+  }									\
 }
 
-packet-generator new {
-  name decap_bad_sid
-  limit 30
-  size 200-200
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
-      L2TP: 11::1 -> 22::2 
-      L2TP: session_id 0x999 cookie 0xffffffffffffffff
-      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
+packet-generator new {							\
+  name decap_bad_sid							\
+  limit 30								\
+  size 200-200								\
+  node ethernet-input							\
+  interface GigabitEthernet2/2/0					\
+  data {								\
+      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 			\
+      L2TP: 11::1 -> 22::2 						\
+      L2TP: session_id 0x999 cookie 0xffffffffffffffff			\
+      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01			\
+      UDP: 1.2.3.4 -> 5.6.7.8						\
+      incrementing 8							\
+  }									\
 }
 
-packet-generator new {
-  name decap_bad_cookie
-  limit 50
-  size 200-200
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
-      L2TP: 11::1 -> 22::2 
-      L2TP: session_id 1 cookie 0x3333ffffffffffff
-      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
+packet-generator new {							\
+  name decap_bad_cookie							\
+  limit 50								\
+  size 200-200								\
+  node ethernet-input							\
+  interface GigabitEthernet2/2/0					\
+  data {								\
+      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 			\
+      L2TP: 11::1 -> 22::2 						\
+      L2TP: session_id 1 cookie 0x3333ffffffffffff			\
+      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01			\
+      UDP: 1.2.3.4 -> 5.6.7.8						\
+      incrementing 8							\
+  }									\
 }
 
-packet-generator new {
-  name encap
-  limit 100
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0000.5555.0002 -> 00:00:dd:dd:00:02 vlan 1
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
+packet-generator new {							\
+  name encap								\
+  limit 100								\
+  node ethernet-input							\
+  interface GigabitEthernet2/1/0					\
+  data {								\
+      IP4: 0000.5555.0002 -> 00:00:dd:dd:00:02 vlan 1			\
+      UDP: 1.2.3.4 -> 5.6.7.8						\
+      incrementing 8							\
+  }									\
 }
 
-packet-generator new {
-  name decap_sublayer
-  limit 300
-  size 200-200
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
-      L2TP: 11::1 -> 22::3
-      L2TP: session_id 2 cookie 0xffffffffffffffff l2_sublayer 0
-      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
+packet-generator new {							\
+  name decap_sublayer							\
+  limit 300								\
+  size 200-200								\
+  node ethernet-input							\
+  interface GigabitEthernet2/2/0					\
+  data {								\
+      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 			\
+      L2TP: 11::1 -> 22::3						\
+      L2TP: session_id 2 cookie 0xffffffffffffffff l2_sublayer 0	\
+      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01			\
+      UDP: 1.2.3.4 -> 5.6.7.8						\
+      incrementing 8							\
+  }									\
 }
 
-packet-generator new {
-  name encap_sublayer
-  limit 700
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0000.5555.0002 -> 00:00:dd:dd:00:02 vlan 2
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
+packet-generator new {							\
+  name encap_sublayer							\
+  limit 700								\
+  node ethernet-input							\
+  interface GigabitEthernet2/1/0					\
+  data {								\
+      IP4: 0000.5555.0002 -> 00:00:dd:dd:00:02 vlan 2			\
+      UDP: 1.2.3.4 -> 5.6.7.8						\
+      incrementing 8							\
+  }									\
 }
 

src/scripts/vnet/l3fwd

@@ -12,56 +12,56 @@ set ip neighbor pg1 192.168.2.2 6:5:4:3:2:1 static
 set ip neighbor pg1 192:168:2::2 6:5:4:3:2:1 static
 set int state pg1 up
 
-packet-generator new {
-  name v4-1-to-2
-  limit -1
-  node ip4-input
-  size 64-64
-  interface pg0
-  data {
-    UDP: 192.168.1.2 -> 192.168.2.2
-    UDP: 4321 -> 1234
-      length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name v4-1-to-2						\
+  limit -1							\
+  node ip4-input						\
+  size 64-64							\
+  interface pg0							\
+  data {							\
+    UDP: 192.168.1.2 -> 192.168.2.2				\
+    UDP: 4321 -> 1234						\
+      length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
-packet-generator new {
-  name v4-2-to-1
-  limit -1
-  node ip4-input
-  size 64-64
-  interface pg0
-  data {
-    UDP: 192.168.2.2 -> 192.168.1.2
-    UDP: 1234 -> 4321
-      length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name v4-2-to-1						\
+  limit -1							\
+  node ip4-input						\
+  size 64-64							\
+  interface pg0							\
+  data {							\
+    UDP: 192.168.2.2 -> 192.168.1.2				\
+    UDP: 1234 -> 4321						\
+      length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
-packet-generator new {
-  name v6-1-to-2
-  limit -1
-  node ip6-input
-  size 64-64
-  interface pg0
-  data {
-    UDP: 192:168:1::2 -> 192:168:2::2
-    UDP: 4321 -> 1234
-      length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name v6-1-to-2						\
+  limit -1							\
+  node ip6-input						\
+  size 64-64							\
+  interface pg0							\
+  data {							\
+    UDP: 192:168:1::2 -> 192:168:2::2				\
+    UDP: 4321 -> 1234						\
+      length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
-packet-generator new {
-  name v6-2-to-1
-  limit -1
-  node ip6-input
-  size 64-64
-  interface pg0
-  data {
-    UDP: 192:168:2::2 -> 192:168:1::2
-    UDP: 1234 -> 4321
-      length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name v6-2-to-1						\
+  limit -1							\
+  node ip6-input						\
+  size 64-64							\
+  interface pg0							\
+  data {							\
+    UDP: 192:168:2::2 -> 192:168:1::2				\
+    UDP: 1234 -> 4321						\
+      length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 packet-generator enable

src/scripts/vnet/lfib/ip4-to-mpls

@@ -1,13 +1,13 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    ICMP: 1.0.0.2 -> 2.2.2.2
-    ICMP echo_request
-    incrementing 100
-  }
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    ICMP: 1.0.0.2 -> 2.2.2.2					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
 
 loop create

src/scripts/vnet/lfib/mpls-pop-to-mpls

@@ -1,11 +1,11 @@
-packet-generator new {
-  name x
-  limit 1
-  node mpls-input
-  size 72-72
-  data {
-   hex 0x0001e0ff0001f1ff4500004000000000400177ba010000020202020208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
-  }
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node mpls-input						\
+  size 72-72							\
+  data {							\
+   hex 0x0001e0ff0001f1ff4500004000000000400177ba010000020202020208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627 \
+  }								\
 }
 
 loop create

src/scripts/vnet/lfib/mpls-to-ip4

@@ -1,11 +1,11 @@
-packet-generator new {
-  name x
-  limit 1
-  node mpls-input
-  size 68-68
-  data {
-   hex 0x0001e1ff4500004000000000400177ba010000020202020208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
-  }
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node mpls-input						\
+  size 68-68							\
+  data {							\
+   hex 0x0001e1ff4500004000000000400177ba010000020202020208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627 \
+  }								\
 }
 
 loop create