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

Type: improvement
Change-Id: I82e7c0acc547794bcc7c42f4b8881a8251bf7a9b
Signed-off-by: Damjan Marion <damarion@cisco.com>
diff --git a/src/scripts/vnet/arp4 b/src/scripts/vnet/arp4
index 372d82a..24a6885 100644
--- a/src/scripts/vnet/arp4
+++ b/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
diff --git a/src/scripts/vnet/arp4-mpls b/src/scripts/vnet/arp4-mpls
index 3e15611..fbb68eb 100644
--- a/src/scripts/vnet/arp4-mpls
+++ b/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
diff --git a/src/scripts/vnet/arp6 b/src/scripts/vnet/arp6
index df58fb6..2ade296 100644
--- a/src/scripts/vnet/arp6
+++ b/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
diff --git a/src/scripts/vnet/bvi b/src/scripts/vnet/bvi
index e1caf66..cf55d63 100644
--- a/src/scripts/vnet/bvi
+++ b/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/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 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 		\
+  }							\
 }
 
diff --git a/src/scripts/vnet/gre b/src/scripts/vnet/gre
index 820fc09..bab2635 100644
--- a/src/scripts/vnet/gre
+++ b/src/scripts/vnet/gre
@@ -26,60 +26,60 @@
 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
diff --git a/src/scripts/vnet/gre-teb b/src/scripts/vnet/gre-teb
index 992005c..015ce73 100644
--- a/src/scripts/vnet/gre-teb
+++ b/src/scripts/vnet/gre-teb
@@ -10,30 +10,30 @@
 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
diff --git a/src/scripts/vnet/icmp b/src/scripts/vnet/icmp
index 889eca8..603d9d7 100644
--- a/src/scripts/vnet/icmp
+++ b/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
diff --git a/src/scripts/vnet/icmp6 b/src/scripts/vnet/icmp6
index 4fcb600..eb41470 100644
--- a/src/scripts/vnet/icmp6
+++ b/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
diff --git a/src/scripts/vnet/ige b/src/scripts/vnet/ige
index 80d045a..f721e59 100644
--- a/src/scripts/vnet/ige
+++ b/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 }
diff --git a/src/scripts/vnet/ip6 b/src/scripts/vnet/ip6
index e03c6fd..c7e4566 100644
--- a/src/scripts/vnet/ip6
+++ b/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						\
+  }								\
 }
 
 
diff --git a/src/scripts/vnet/ip6-hbh b/src/scripts/vnet/ip6-hbh
index 87be118..7bb0be1 100644
--- a/src/scripts/vnet/ip6-hbh
+++ b/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
diff --git a/src/scripts/vnet/ipsec b/src/scripts/vnet/ipsec
index 6dc4dd7..5d186c8 100644
--- a/src/scripts/vnet/ipsec
+++ b/src/scripts/vnet/ipsec
@@ -41,31 +41,31 @@
 
 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						\
+  }								\
 }
diff --git a/src/scripts/vnet/ipsec_spd b/src/scripts/vnet/ipsec_spd
index 5acced6..04b925c 100644
--- a/src/scripts/vnet/ipsec_spd
+++ b/src/scripts/vnet/ipsec_spd
@@ -39,17 +39,17 @@
 
 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						\
+  }								\
 }
diff --git a/src/scripts/vnet/ipsec_spd_vrf b/src/scripts/vnet/ipsec_spd_vrf
index faa891d..f4420ec 100644
--- a/src/scripts/vnet/ipsec_spd_vrf
+++ b/src/scripts/vnet/ipsec_spd_vrf
@@ -39,34 +39,34 @@
 
 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						\
+  }								\
 }
diff --git a/src/scripts/vnet/ixge b/src/scripts/vnet/ixge
deleted file mode 100644
index 6722b53..0000000
--- a/src/scripts/vnet/ixge
+++ /dev/null
@@ -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
-
diff --git a/src/scripts/vnet/l2efpfilter b/src/scripts/vnet/l2efpfilter
index d1074ce..4a17c15 100644
--- a/src/scripts/vnet/l2efpfilter
+++ b/src/scripts/vnet/l2efpfilter
@@ -45,36 +45,36 @@
 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 			\
+  }								\
 }
 
diff --git a/src/scripts/vnet/l2efpfilter_perf b/src/scripts/vnet/l2efpfilter_perf
index 08c1b46..3856d44 100644
--- a/src/scripts/vnet/l2efpfilter_perf
+++ b/src/scripts/vnet/l2efpfilter_perf
@@ -45,13 +45,13 @@
 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 			\
+  }								\
 }
diff --git a/src/scripts/vnet/l2fib b/src/scripts/vnet/l2fib
index dd5c5a8..4a16715 100644
--- a/src/scripts/vnet/l2fib
+++ b/src/scripts/vnet/l2fib
@@ -25,20 +25,20 @@
 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 }	\
 }
diff --git a/src/scripts/vnet/l2fib_perf b/src/scripts/vnet/l2fib_perf
index 5556506..0f456c1 100644
--- a/src/scripts/vnet/l2fib_perf
+++ b/src/scripts/vnet/l2fib_perf
@@ -17,12 +17,12 @@
 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 }	\
 }
 
diff --git a/src/scripts/vnet/l2fib_xc b/src/scripts/vnet/l2fib_xc
index bb25bd3..8083da0 100644
--- a/src/scripts/vnet/l2fib_xc
+++ b/src/scripts/vnet/l2fib_xc
@@ -19,12 +19,12 @@
 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 }	\
 }
 
diff --git a/src/scripts/vnet/l2flood b/src/scripts/vnet/l2flood
index ec82306..41c8697 100644
--- a/src/scripts/vnet/l2flood
+++ b/src/scripts/vnet/l2flood
@@ -27,15 +27,14 @@
 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 			\
+  }								\
 }
 
diff --git a/src/scripts/vnet/l2tp b/src/scripts/vnet/l2tp
index e9a73d5..c4a1fe4 100644
--- a/src/scripts/vnet/l2tp
+++ b/src/scripts/vnet/l2tp
@@ -38,91 +38,91 @@
 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							\
+  }									\
 }
 
diff --git a/src/scripts/vnet/l3fwd b/src/scripts/vnet/l3fwd
index 8d0aaa9..1b8bff1 100644
--- a/src/scripts/vnet/l3fwd
+++ b/src/scripts/vnet/l3fwd
@@ -12,56 +12,56 @@
 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
diff --git a/src/scripts/vnet/lfib/ip4-to-mpls b/src/scripts/vnet/lfib/ip4-to-mpls
index 5ec412a..1170684 100644
--- a/src/scripts/vnet/lfib/ip4-to-mpls
+++ b/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
diff --git a/src/scripts/vnet/lfib/mpls-pop-to-mpls b/src/scripts/vnet/lfib/mpls-pop-to-mpls
index 34a5790..83b66fd 100644
--- a/src/scripts/vnet/lfib/mpls-pop-to-mpls
+++ b/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
diff --git a/src/scripts/vnet/lfib/mpls-to-ip4 b/src/scripts/vnet/lfib/mpls-to-ip4
index 5acf5fd..2fa9b9f 100644
--- a/src/scripts/vnet/lfib/mpls-to-ip4
+++ b/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
diff --git a/src/scripts/vnet/lfib/mpls-to-mpls b/src/scripts/vnet/lfib/mpls-to-mpls
index 5de3d31..5e24698 100644
--- a/src/scripts/vnet/lfib/mpls-to-mpls
+++ b/src/scripts/vnet/lfib/mpls-to-mpls
@@ -1,11 +1,11 @@
-packet-generator new {
-  name x
-  limit 1
-  node mpls-input
-  size 68-68
-  data {
-   hex 0x0001e1ff4500004000000000400177ba010000020200000208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
-  }
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node mpls-input						\
+  size 68-68							\
+  data {							\
+   hex 0x0001e1ff4500004000000000400177ba010000020200000208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627 \
+  }								\
 }
 
 loop create
diff --git a/src/scripts/vnet/mcast/ip4 b/src/scripts/vnet/mcast/ip4
index 101f09b..e3db0ce 100644
--- a/src/scripts/vnet/mcast/ip4
+++ b/src/scripts/vnet/mcast/ip4
@@ -1,13 +1,13 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 512-512
-  data {
-    ICMP: 1.0.0.2 -> 232.1.1.1
-    ICMP echo_request
-    incrementing 100
-  }
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node ip4-input						\
+  size 512-512							\
+  data {							\
+    ICMP: 1.0.0.2 -> 232.1.1.1					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
 
 create packet-generator interface pg1
diff --git a/src/scripts/vnet/mpls-o-ethernet/pg b/src/scripts/vnet/mpls-o-ethernet/pg
index 4070cde..f83f55a 100644
--- a/src/scripts/vnet/mpls-o-ethernet/pg
+++ b/src/scripts/vnet/mpls-o-ethernet/pg
@@ -1,9 +1,9 @@
-packet-generator new {
-  name x
-  limit 1
-  node mpls-ethernet-input
-  size 68-68
-  data {
-   hex 0x0001e1ff4500004000000000400177ba010000020200000208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
-  }
-}
\ No newline at end of file
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node mpls-ethernet-input					\
+  size 68-68							\
+  data {							\
+   hex 0x0001e1ff4500004000000000400177ba010000020200000208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627 \
+  }								\
+}
diff --git a/src/scripts/vnet/mpls-to-dot1ad b/src/scripts/vnet/mpls-to-dot1ad
index ea8418e..cfe0a76 100644
--- a/src/scripts/vnet/mpls-to-dot1ad
+++ b/src/scripts/vnet/mpls-to-dot1ad
@@ -29,24 +29,24 @@
 
 trace add pg-input 100
 
-packet-generator new {
-  name g2v
-  limit 1
-  node ip4-input
-  interface pg0
-  data {
-    hex 0x4500002000000000fe2f3b5bc0a80002c0a800010000884700021140000000000011005056b77c83010203040506
-  }
+packet-generator new {							\
+  name g2v								\
+  limit 1								\
+  node ip4-input							\
+  interface pg0								\
+  data {								\
+    hex 0x4500002000000000fe2f3b5bc0a80002c0a800010000884700021140000000000011005056b77c83010203040506 \
+  }									\
 }
 
-packet-generator new {
-  name v2g
-  limit 1
-  node ethernet-input
-  interface pg1
-  data {
-      hex 0x000000000011005056b77c8388a80020810000210102030405060708
-  }
+packet-generator new {							\
+  name v2g								\
+  limit 1								\
+  node ethernet-input							\
+  interface pg1								\
+  data {								\
+      hex 0x000000000011005056b77c8388a80020810000210102030405060708	\
+  }									\
 }
 
 pack en g2v
diff --git a/src/scripts/vnet/mpls-tunnel b/src/scripts/vnet/mpls-tunnel
index 1c395f4..863379f 100644
--- a/src/scripts/vnet/mpls-tunnel
+++ b/src/scripts/vnet/mpls-tunnel
@@ -1,46 +1,46 @@
-packet-generator new {
-  name x0
-  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 x0							\
+  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 x1
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    ICMP: 1.0.0.2 -> 2.0.1.2
-    ICMP echo_request
-    incrementing 100
-  }
+packet-generator new {						\
+  name x1							\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    ICMP: 1.0.0.2 -> 2.0.1.2					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
-packet-generator new {
-  name x2
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    ICMP: 1.0.0.2 -> 2.0.2.2
-    ICMP echo_request
-    incrementing 100
-  }
+packet-generator new {						\
+  name x2							\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    ICMP: 1.0.0.2 -> 2.0.2.2					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
-packet-generator new {
-  name x3
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    ICMP: 1.0.0.2 -> 2.0.3.2
-    ICMP echo_request
-    incrementing 100
-  }
+packet-generator new {						\
+  name x3							\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    ICMP: 1.0.0.2 -> 2.0.3.2					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
 
 
diff --git a/src/scripts/vnet/nat44 b/src/scripts/vnet/nat44
index 5c59323..3a4bfe9 100644
--- a/src/scripts/vnet/nat44
+++ b/src/scripts/vnet/nat44
@@ -1,31 +1,31 @@
 create packet-generator interface pg0
 create packet-generator interface pg1
 
-packet-generator new {
-  name f1
-  limit 1000000
-  node ip4-input
-  size 64-64
-  interface pg0
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f1							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  interface pg0							\
+  data {							\
+    UDP: 10.0.0.3 -> 172.16.1.2					\
+    UDP: 3000 -> 3001						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 
-packet-generator new {
-  name f2
-  limit 1000000
-  node ip4-input
-  size 64-64
-  interface pg0
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3005 -> 3006
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f2							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  interface pg0							\
+  data {							\
+    UDP: 10.0.0.3 -> 172.16.1.2					\
+    UDP: 3005 -> 3006						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 nat44 add address 172.16.1.3
diff --git a/src/scripts/vnet/nat44_det b/src/scripts/vnet/nat44_det
index 9b28738..9579ce1 100644
--- a/src/scripts/vnet/nat44_det
+++ b/src/scripts/vnet/nat44_det
@@ -1,93 +1,93 @@
 create packet-generator interface pg0
 create packet-generator interface pg1
 
-packet-generator new {
-  name f1
-  limit 1000000
-  node ip4-input
-  size 64-64
-  worker 0
-  interface pg0
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f1							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  worker 0							\
+  interface pg0							\
+  data {							\
+    UDP: 10.0.0.3 -> 172.16.1.2					\
+    UDP: 3000 -> 3001						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 
-packet-generator new {
-  name f2
-  limit 1000000
-  node ip4-input
-  size 64-64
-  worker 1
-  interface pg0
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3005 -> 3006
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f2							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  worker 1							\
+  interface pg0							\
+  data {							\
+    UDP: 10.0.0.3 -> 172.16.1.2					\
+    UDP: 3005 -> 3006						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 
-packet-generator new {
-  name f3
-  limit 1000000
-  node ip4-input
-  size 64-64
-  worker 0
-  interface pg1
-  data {
-    UDP: 172.16.1.2 -> 1.1.1.2
-    UDP: 3001 -> 1141
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f3							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  worker 0							\
+  interface pg1							\
+  data {							\
+    UDP: 172.16.1.2 -> 1.1.1.2					\
+    UDP: 3001 -> 1141						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 
-packet-generator new {
-  name f4
-  limit 1000000
-  node ip4-input
-  size 64-64
-  worker 1
-  interface pg1
-  data {
-    UDP: 172.16.1.2 -> 1.1.1.2
-    UDP: 3006 -> 1146
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f4							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  worker 1							\
+  interface pg1							\
+  data {							\
+    UDP: 172.16.1.2 -> 1.1.1.2					\
+    UDP: 3006 -> 1146						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 
-packet-generator new {
-  name f5
-  limit 1000000
-  node ip4-input
-  size 64-64
-  worker 2
-  interface pg0
-  data {
-    UDP: 10.0.0.4 -> 172.16.1.2
-    UDP: 3005 -> 3006
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f5							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  worker 2							\
+  interface pg0							\
+  data {							\
+    UDP: 10.0.0.4 -> 172.16.1.2					\
+    UDP: 3005 -> 3006						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 
-packet-generator new {
-  name f6
-  limit 1000000
-  node ip4-input
-  size 64-64
-  worker 1
-  interface pg1
-  data {
-    UDP: 172.16.1.2 -> 1.1.1.2
-    UDP: 3006 -> 1177
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f6							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  worker 1							\
+  interface pg1							\
+  data {							\
+    UDP: 172.16.1.2 -> 1.1.1.2					\
+    UDP: 3006 -> 1177						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 nat44 deterministic add in 10.0.0.0/21 out 1.1.1.2/32
diff --git a/src/scripts/vnet/nat44_lb b/src/scripts/vnet/nat44_lb
index 6b6d4e1..7ccd093 100644
--- a/src/scripts/vnet/nat44_lb
+++ b/src/scripts/vnet/nat44_lb
@@ -1,33 +1,33 @@
 create packet-generator interface pg0
 create packet-generator interface pg1
 
-packet-generator new {
-  name f1
-  limit 1000000
-  node ip4-input
-  size 64-64
-  worker 0
-  interface pg1
-  data {
-    UDP: 172.16.1.11 -> 172.16.1.3
-    UDP: 3001 -> 3000
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f1							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  worker 0							\
+  interface pg1							\
+  data {							\
+    UDP: 172.16.1.11 -> 172.16.1.3				\
+    UDP: 3001 -> 3000						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 
-packet-generator new {
-  name f2
-  limit 1000000
-  node ip4-input
-  size 64-64
-  worker 1
-  interface pg1
-  data {
-    UDP: 172.16.1.10 -> 172.16.1.3
-    UDP: 3001 -> 3000
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f2							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  worker 1							\
+  interface pg1							\
+  data {							\
+    UDP: 172.16.1.10 -> 172.16.1.3				\
+    UDP: 3001 -> 3000						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 nat44 add address 172.16.1.3
diff --git a/src/scripts/vnet/nat44_static b/src/scripts/vnet/nat44_static
index 3c76187..34ec854 100644
--- a/src/scripts/vnet/nat44_static
+++ b/src/scripts/vnet/nat44_static
@@ -1,33 +1,33 @@
 create packet-generator interface pg0
 create packet-generator interface pg1
 
-packet-generator new {
-  name f1
-  limit 1000000
-  node ip4-input
-  size 64-64
-  worker 0
-  interface pg0
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f1							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  worker 0							\
+  interface pg0							\
+  data {							\
+    UDP: 10.0.0.3 -> 172.16.1.2					\
+    UDP: 3000 -> 3001						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 
-packet-generator new {
-  name f2
-  limit 1000000
-  node ip4-input
-  size 64-64
-  worker 1
-  interface pg1
-  data {
-    UDP: 172.16.1.2 -> 172.16.1.3
-    UDP: 3001 -> 3000
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f2							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  worker 1							\
+  interface pg1							\
+  data {							\
+    UDP: 172.16.1.2 -> 172.16.1.3				\
+    UDP: 3001 -> 3000						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 nat44 add address 172.16.1.3
diff --git a/src/scripts/vnet/nat44_static_with_port b/src/scripts/vnet/nat44_static_with_port
index 9087fbb..ef53e6d 100644
--- a/src/scripts/vnet/nat44_static_with_port
+++ b/src/scripts/vnet/nat44_static_with_port
@@ -1,33 +1,33 @@
 create packet-generator interface pg0
 create packet-generator interface pg1
 
-packet-generator new {
-  name f1
-  limit 1000000
-  node ip4-input
-  size 64-64
-  worker 0
-  interface pg0
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f1							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  worker 0							\
+  interface pg0							\
+  data {							\
+    UDP: 10.0.0.3 -> 172.16.1.2					\
+    UDP: 3000 -> 3001						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 
-packet-generator new {
-  name f2
-  limit 1000000
-  node ip4-input
-  size 64-64
-  worker 1
-  interface pg1
-  data {
-    UDP: 172.16.1.2 -> 172.16.1.3
-    UDP: 3001 -> 3000
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f2							\
+  limit 1000000							\
+  node ip4-input						\
+  size 64-64							\
+  worker 1							\
+  interface pg1							\
+  data {							\
+    UDP: 172.16.1.2 -> 172.16.1.3				\
+    UDP: 3001 -> 3000						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 nat44 add address 172.16.1.3
diff --git a/src/scripts/vnet/nat64 b/src/scripts/vnet/nat64
index 7e37dd8..87c9de3 100644
--- a/src/scripts/vnet/nat64
+++ b/src/scripts/vnet/nat64
@@ -1,33 +1,33 @@
 create packet-generator interface pg0
 create packet-generator interface pg1
 
-packet-generator new {
-  name f1
-  limit 10
-  node ip6-input
-  size 64-64
-  worker 0
-  interface pg0
-  data {
-    UDP: 2000::3 -> 64:ff9b::ac10:102
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f1							\
+  limit 10							\
+  node ip6-input						\
+  size 64-64							\
+  worker 0							\
+  interface pg0							\
+  data {							\
+    UDP: 2000::3 -> 64:ff9b::ac10:102				\
+    UDP: 3000 -> 3001						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 
-packet-generator new {
-  name f2
-  limit 10
-  node ip6-input
-  size 64-64
-  interface pg0
-  worker 1
-  data {
-    UDP: 2000::3 -> 64:ff9b::ac10:102
-    UDP: 3005 -> 3006
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f2							\
+  limit 10							\
+  node ip6-input						\
+  size 64-64							\
+  interface pg0							\
+  worker 1							\
+  data {							\
+    UDP: 2000::3 -> 64:ff9b::ac10:102				\
+    UDP: 3005 -> 3006						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 nat64 add pool address 172.16.1.3
diff --git a/src/scripts/vnet/nat64_static b/src/scripts/vnet/nat64_static
index 3c4dc48..d582084 100644
--- a/src/scripts/vnet/nat64_static
+++ b/src/scripts/vnet/nat64_static
@@ -1,33 +1,33 @@
 create packet-generator interface pg0
 create packet-generator interface pg1
 
-packet-generator new {
-  name f1
-  limit 10
-  node ip4-input
-  size 64-64
-  worker 0
-  interface pg1
-  data {
-    UDP: 172.16.1.2 -> 172.16.1.3
-    UDP: 3000 -> 37678
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f1							\
+  limit 10							\
+  node ip4-input						\
+  size 64-64							\
+  worker 0							\
+  interface pg1							\
+  data {							\
+    UDP: 172.16.1.2 -> 172.16.1.3				\
+    UDP: 3000 -> 37678						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 
-packet-generator new {
-  name f2
-  limit 10
-  node ip4-input
-  size 64-64
-  interface pg1
-  worker 1
-  data {
-    UDP: 172.16.1.2 -> 172.16.1.3
-    UDP: 3005 -> 38678
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name f2							\
+  limit 10							\
+  node ip4-input						\
+  size 64-64							\
+  interface pg1							\
+  worker 1							\
+  data {							\
+    UDP: 172.16.1.2 -> 172.16.1.3				\
+    UDP: 3005 -> 38678						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 nat64 add pool address 172.16.1.3
diff --git a/src/scripts/vnet/pcap b/src/scripts/vnet/pcap
index d8f47c6..c52ddb7 100644
--- a/src/scripts/vnet/pcap
+++ b/src/scripts/vnet/pcap
@@ -1,15 +1,15 @@
-packet-generator new {
-  name x
-  limit 1
-  node ethernet-input
-  pcap /home/eliot/pcap-data/ISIS_level1_adjacency.cap
+packet-generator new {							\
+  name x								\
+  limit 1								\
+  node ethernet-input							\
+  pcap /home/eliot/pcap-data/ISIS_level1_adjacency.cap			\
 }
 
-packet-generator new {
-  name y
-  limit 1
-  node hdlc-input
-  pcap /home/eliot/pcap-data/ISIS_p2p_adjacency.cap
+packet-generator new {							\
+  name y								\
+  limit 1								\
+  node hdlc-input							\
+  pcap /home/eliot/pcap-data/ISIS_p2p_adjacency.cap			\
 }
 
 tr add pg-input 10
diff --git a/src/scripts/vnet/rewrite b/src/scripts/vnet/rewrite
index d05ce89..1cb6994 100644
--- a/src/scripts/vnet/rewrite
+++ b/src/scripts/vnet/rewrite
@@ -23,37 +23,37 @@
 cle int
 cle run
 
-packet-generator new {
-  name toport
-  limit 2
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
-      GRE: 8.0.0.1 -> 1.2.5.6 mpls_unicast 
-  }
+packet-generator new {						\
+  name toport							\
+  limit 2							\
+  node ethernet-input						\
+  interface GigabitEthernet2/1/0				\
+  data {							\
+      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 			\
+      GRE: 8.0.0.1 -> 1.2.5.6 mpls_unicast 			\
+  }								\
 }
 
-packet-generator new {
-  name tovlan
-  limit 2
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
-      GRE: 8.0.0.1 -> 1.2.6.6 mpls_unicast 
-  }
+packet-generator new {						\
+  name tovlan							\
+  limit 2							\
+  node ethernet-input						\
+  interface GigabitEthernet2/1/0				\
+  data {							\
+      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 			\
+      GRE: 8.0.0.1 -> 1.2.6.6 mpls_unicast 			\
+  }								\
 }
 
-packet-generator new {
-  name toqinq
-  limit 2
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
-      GRE: 8.0.0.1 -> 1.2.7.6 mpls_unicast 
-  }
+packet-generator new {						\
+  name toqinq							\
+  limit 2							\
+  node ethernet-input						\
+  interface GigabitEthernet2/1/0				\
+  data {							\
+      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 			\
+      GRE: 8.0.0.1 -> 1.2.7.6 mpls_unicast 			\
+  }								\
 }
 
 
diff --git a/src/scripts/vnet/rpf b/src/scripts/vnet/rpf
index 7a6608e..80aa9bc 100644
--- a/src/scripts/vnet/rpf
+++ b/src/scripts/vnet/rpf
@@ -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
diff --git a/src/scripts/vnet/rtt-test b/src/scripts/vnet/rtt-test
index 5501b99..7301633 100644
--- a/src/scripts/vnet/rtt-test
+++ b/src/scripts/vnet/rtt-test
@@ -16,16 +16,16 @@
 comment { trace add ixge-input 100 }
 comment { te rtt { 1.0.0.2 -> 2.0.0.2 count 1e4 rate 1e9 size 100 histogram-time 1e-5 } }
 
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 170-170
-  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 170-170							\
+  data {							\
+    ICMP: 1.0.0.2 -> 2.0.0.2					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
 
 
diff --git a/src/scripts/vnet/source_and_port_range_check b/src/scripts/vnet/source_and_port_range_check
index 7eabde3..abe7034 100644
--- a/src/scripts/vnet/source_and_port_range_check
+++ b/src/scripts/vnet/source_and_port_range_check
@@ -4,40 +4,40 @@
 set int state loop0 up
 set int ip addr loop0 10.10.10.10/32
 
-packet-generator new {
-  name deny-from-default-route
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    UDP: 1.2.3.4 -> 5.6.7.8
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name deny-from-default-route					\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    UDP: 1.2.3.4 -> 5.6.7.8					\
+    UDP: 3000 -> 3001						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
-packet-generator new {
-  name allow
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    UDP: 1.1.1.1 -> 5.6.7.8
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name allow							\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    UDP: 1.1.1.1 -> 5.6.7.8					\
+    UDP: 3000 -> 3001						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
-packet-generator new {
-  name deny-from-port-range
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    UDP: 1.1.1.1 -> 5.6.7.8
-    UDP: 6000 -> 6001
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name deny-from-port-range					\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    UDP: 1.1.1.1 -> 5.6.7.8					\
+    UDP: 6000 -> 6001						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 set ip source-and-port-range-check 1.1.1.0/24 range 2000 - 3000 vrf 99
diff --git a/src/scripts/vnet/speed b/src/scripts/vnet/speed
index d60d671..eecc1d3 100644
--- a/src/scripts/vnet/speed
+++ b/src/scripts/vnet/speed
@@ -1,13 +1,13 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 50-50
-  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 50-50							\
+  data {							\
+    ICMP: 1.2.3.4 -> 5.6.7.8					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
 
 tr add pg-input 100
diff --git a/src/scripts/vnet/srp b/src/scripts/vnet/srp
index c20b38a..d77b0bd 100644
--- a/src/scripts/vnet/srp
+++ b/src/scripts/vnet/srp
@@ -3,16 +3,16 @@
 set int hw-class fake-srp0 srp
 set int hw-class fake-srp1 srp
 
-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						\
+  }								\
 }
 
 tr add pg-input 100
diff --git a/src/scripts/vnet/tcp b/src/scripts/vnet/tcp
index 8c6c107..eaba090 100644
--- a/src/scripts/vnet/tcp
+++ b/src/scripts/vnet/tcp
@@ -2,16 +2,16 @@
 set int ip address loop0 192.168.1.1/8
 set int state loop0 up
 
-packet-generator new {
-  name x
-  limit 2048
-  node ip4-input
-  size 100-100
-  interface loop0
-  data {
-    TCP: 192.168.1.2 -> 192.168.1.1
-    TCP: 32415 -> 80
-    SYN
-    incrementing 100
-  }
+packet-generator new {						\
+  name x							\
+  limit 2048							\
+  node ip4-input						\
+  size 100-100							\
+  interface loop0						\
+  data {							\
+    TCP: 192.168.1.2 -> 192.168.1.1				\
+    TCP: 32415 -> 80						\
+    SYN								\
+    incrementing 100						\
+  }								\
 }
diff --git a/src/scripts/vnet/udp b/src/scripts/vnet/udp
index 8e3b75b..3a8ead8 100644
--- a/src/scripts/vnet/udp
+++ b/src/scripts/vnet/udp
@@ -2,17 +2,17 @@
 set int ip address loop0 192.168.1.1/8
 set int state loop0 up
 
-packet-generator new {
-  name udp
-  limit 512
-  rate 1e4
-  node ip4-input
-  size 100-100
-  interface loop0
-  data {
-   UDP: 192.168.1.2 - 192.168.2.255 -> 192.168.1.1
-   UDP: 4321 -> 1234
-    length 72
-    incrementing 100
-  }
+packet-generator new {						\
+  name udp							\
+  limit 512							\
+  rate 1e4							\
+  node ip4-input						\
+  size 100-100							\
+  interface loop0						\
+  data {							\
+   UDP: 192.168.1.2 - 192.168.2.255 -> 192.168.1.1		\
+   UDP: 4321 -> 1234						\
+    length 72							\
+    incrementing 100						\
+  }								\
 }
diff --git a/src/scripts/vnet/uri/udp b/src/scripts/vnet/uri/udp
index bbbe2c1..4430b0f 100644
--- a/src/scripts/vnet/uri/udp
+++ b/src/scripts/vnet/uri/udp
@@ -8,18 +8,18 @@
 set int state host-vpp1 up
 set int ip address host-vpp1 6.0.1.1/24
 
-packet-generator new {
-  name udp
-  limit 512
-  rate 1e4
-  node ip4-input
-  size 100-100
-  interface loop0
-  data {
-   UDP: 192.168.1.2 - 192.168.2.255 -> 192.168.1.1
-   UDP: 4321 -> 1234
-    length 72
-    incrementing 100
-  }
+packet-generator new {						\
+  name udp							\
+  limit 512							\
+  rate 1e4							\
+  node ip4-input						\
+  size 100-100							\
+  interface loop0						\
+  data {							\
+   UDP: 192.168.1.2 - 192.168.2.255 -> 192.168.1.1		\
+   UDP: 4321 -> 1234						\
+    length 72							\
+    incrementing 100						\
+  }								\
 }
 session enable
diff --git a/src/scripts/vnet/urpf b/src/scripts/vnet/urpf
index 1268ff5..48855e4 100644
--- a/src/scripts/vnet/urpf
+++ b/src/scripts/vnet/urpf
@@ -4,64 +4,64 @@
 set int state loop0 up
 set int ip addr loop0 10.10.10.10/24
 
-packet-generator new {
-  name transit-deny
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    UDP: 1.2.3.4 -> 2.2.2.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name transit-deny						\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    UDP: 1.2.3.4 -> 2.2.2.2					\
+    UDP: 3000 -> 3001						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
-packet-generator new {
-  name transit-allow
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    UDP: 1.1.1.1 -> 2.2.2.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name transit-allow						\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    UDP: 1.1.1.1 -> 2.2.2.2					\
+    UDP: 3000 -> 3001						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
-packet-generator new {
-  name transit-allow-from-excemption
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    UDP: 11.11.12.13 -> 2.2.2.2
-    UDP: 6000 -> 6001
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name transit-allow-from-excemption				\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    UDP: 11.11.12.13 -> 2.2.2.2					\
+    UDP: 6000 -> 6001						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
-packet-generator new {
-  name for-us-allow-from-excemption
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    UDP: 11.11.12.13 -> 10.10.10.10
-    UDP: 6000 -> 6001
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name for-us-allow-from-excemption				\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    UDP: 11.11.12.13 -> 10.10.10.10				\
+    UDP: 6000 -> 6001						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
-packet-generator new {
-  name for-us-allow
-  limit 1
-  node ip4-input
-  size 64-64
-  data {
-    UDP: 1.1.1.1 -> 10.10.10.10
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
+packet-generator new {						\
+  name for-us-allow						\
+  limit 1							\
+  node ip4-input						\
+  size 64-64							\
+  data {							\
+    UDP: 1.1.1.1 -> 10.10.10.10					\
+    UDP: 3000 -> 3001						\
+    length 128 checksum 0 incrementing 1			\
+  }								\
 }
 
 tr add pg-input 100
diff --git a/src/scripts/vnet/vlan b/src/scripts/vnet/vlan
index eb3359e..130027b 100644
--- a/src/scripts/vnet/vlan
+++ b/src/scripts/vnet/vlan
@@ -3,18 +3,18 @@
 set int state fake-eth0 up
 set int state fake-eth0.1 up
 
-packet-generator new {
-  name x
-  limit 1
-  node ethernet-input
-  interface fake-eth0
-  size 64-64
-  data {
-    IP4: 1.2.3 -> 4.5.6 vlan 1
-    ICMP: 1.2.3.4 -> 5.6.7.8
-    ICMP echo_request
-    incrementing 100
-  }
+packet-generator new {						\
+  name x							\
+  limit 1							\
+  node ethernet-input						\
+  interface fake-eth0						\
+  size 64-64							\
+  data {							\
+    IP4: 1.2.3 -> 4.5.6 vlan 1					\
+    ICMP: 1.2.3.4 -> 5.6.7.8					\
+    ICMP echo_request						\
+    incrementing 100						\
+  }								\
 }
 
 tr add pg-input 100