No longer print header into code files

hknutzen · Aug 9, 2023 · def3a97 · def3a97
1 parent 8360b0e
commit def3a97
Show file tree

Hide file tree

Showing 19 changed files with 200 additions and 2,125 deletions.
diff --git a/go/pkg/pass1/print-code.go b/go/pkg/pass1/print-code.go
@@ -2391,51 +2391,16 @@ func (c *spoc) getCodeInfo(vrfMembers []*router) *codeInfo {
 	}
 }
 
-func (c *spoc) printPanOS(fd *os.File, vrfMembers []*router, info *codeInfo) {
-	pdP := ""
-	if pdp := info.PolicyDistributionPoint; pdp != "" {
-		pdP = "\n[ Policy_distribution_point = " + pdp + " ]"
-	}
-	fmt.Fprintf(fd,
-		`<?xml version = "1.0" ?>
-<!--
-Generated by %s, version %s
-
-[ BEGIN %s ]
-[ Model = %s ]
-[ IP = %s ]%s
--->
-`,
-		program, version,
-		strings.Join(info.NameList, ", "),
-		info.Model,
-		strings.Join(info.IPList, ", "),
-		pdP)
-
+func (c *spoc) printPanOS(fd *os.File, vrfMembers []*router) {
+	fmt.Fprintln(fd, `<?xml version = "1.0" ?>`)
 	fmt.Fprintln(fd, "<config><devices><entry><vsys>")
 	for _, r := range vrfMembers {
 		fmt.Fprintln(fd, "#insert", r.vrf)
 	}
 	fmt.Fprintln(fd, "</vsys></entry></devices></config>")
 }
 
-func (c *spoc) printNSX(fd *os.File, vrfMembers []*router, info *codeInfo) {
-	pdP := ""
-	if pdp := info.PolicyDistributionPoint; pdp != "" {
-		pdP = "\n#[ Policy_distribution_point = " + pdp + " ]"
-	}
-	fmt.Fprintf(fd,
-		`#Generated by %s, version %s
-#
-#[ BEGIN %s ]
-#[ Model = %s ]
-#[ IP = %s ]%s
-`,
-		program, version,
-		strings.Join(info.NameList, ", "),
-		info.Model,
-		strings.Join(info.IPList, ", "),
-		pdP)
+func (c *spoc) printNSX(fd *os.File, vrfMembers []*router) {
 	fmt.Fprintln(fd, "#insert JSON")
 }
 
@@ -2473,35 +2438,16 @@ func (c *spoc) printRouter(r *router, dir string) string {
 	defer fd.Close()
 
 	if model.filter == "PAN-OS" {
-		c.printPanOS(fd, vrfMembers, infoData)
+		c.printPanOS(fd, vrfMembers)
 		for _, vrouter := range vrfMembers {
 			collectAclsFromIORules(vrouter)
 		}
 	} else if model.filter == "NSX" {
-		c.printNSX(fd, vrfMembers, infoData)
+		c.printNSX(fd, vrfMembers)
 		for _, vrouter := range vrfMembers {
 			c.printCiscoAcls(fd, vrouter)
 		}
 	} else {
-
-		// Print version header.
-		commentChar := model.commentChar
-		fmt.Fprintf(fd, "%s Generated by %s, %s", commentChar, program, version)
-		fmt.Fprintln(fd)
-
-		header := func(key, val string) {
-			fmt.Fprintf(fd, "%s [ %s %s ]\n", commentChar, key, val)
-		}
-		header("BEGIN", deviceName)
-		header("Model =", infoData.Model)
-		ips := infoData.IPList
-		if len(ips) != 0 {
-			header("IP =", strings.Join(ips, ","))
-		}
-		if pdp := infoData.PolicyDistributionPoint; pdp != "" {
-			header("Policy_distribution_point =", pdp)
-		}
-
 		for _, vrouter := range vrfMembers {
 			c.printRoutes(fd, vrouter)
 			if vrouter.managed == "" {
@@ -2513,9 +2459,6 @@ func (c *spoc) printRouter(r *router, dir string) string {
 			printAclSuffix(fd, vrouter)
 			printRouterIntf(fd, vrouter)
 		}
-
-		header("END", deviceName)
-		fmt.Fprintln(fd)
 	}
 
 	// Print ACLs in machine independent format into separate file.

diff --git a/go/testdata/area.t b/go/testdata/area.t
@@ -117,10 +117,10 @@ service:pdp3 = {
  permit src = host:h3; dst = user; prt = ip;
 }
 =OUTPUT=
---asa1
-! [ IP = 10.1.1.1 ]
---asa2
-! [ IP = 10.1.3.2 ]
+--asa1.info
+{"generated_by":"devel","model":"ASA","ip_list":["10.1.1.1"],"policy_distribution_point":"10.1.1.10"}
+--asa2.info
+{"generated_by":"devel","model":"ASA","ip_list":["10.1.3.2"],"policy_distribution_point":"10.1.3.10"}
 =OPTIONS=--check_policy_distribution_point=warn
 
 ############################################################

diff --git a/go/testdata/auto_intf.t b/go/testdata/auto_intf.t
@@ -1211,8 +1211,8 @@ service:test = {
  permit src = network:a; dst = user; prt = tcp 22;
 }
 =OUTPUT=
---r1
-! [ IP = 10.0.0.1,10.1.1.1 ]
+--r1.info
+{"generated_by":"devel","model":"IOS","ip_list":["10.0.0.1","10.1.1.1"],"policy_distribution_point":"10.0.0.10"}
 =END=
 
 ############################################################
@@ -1258,8 +1258,8 @@ service:s1 = {
  permit src = user; dst = interface:r2.n5;                  prt = tcp 80;
 }
 =OUTPUT=
---r2
-! [ IP = 10.1.3.2,10.1.4.1 ]
+--r2.info
+{"generated_by":"devel","model":"IOS","ip_list":["10.1.3.2","10.1.4.1"],"policy_distribution_point":"10.1.1.111"}
 =END=
 
 ############################################################
@@ -1285,8 +1285,8 @@ service:s1 = {
         prt = tcp 22;
 }
 =OUTPUT=
---r1
-! [ IP = 10.1.2.1,10.1.3.1 ]
+--r1.info
+{"generated_by":"devel","model":"ASA","ip_list":["10.1.2.1","10.1.3.1"],"policy_distribution_point":"10.1.1.111"}
 =OPTIONS=--check_policy_distribution_point=1
 
 ############################################################
@@ -1320,10 +1320,10 @@ service:s = {
  permit src = network:n3; dst = user; prt = tcp 22;
 }
 =OUTPUT=
---r1
-! [ IP = 10.1.2.3 ]
---r2
-! [ IP = 10.1.2.2 ]
+--r1.info
+{"generated_by":"devel","model":"ASA","ip_list":["10.1.2.3"],"policy_distribution_point":"10.1.3.9"}
+--r2.info
+{"generated_by":"devel","model":"ASA","ip_list":["10.1.2.2"],"policy_distribution_point":"10.1.3.9"}
 =END=
 
 ############################################################

diff --git a/go/testdata/bridged.t b/go/testdata/bridged.t
@@ -404,8 +404,8 @@ service:admin = {
  permit src = network:n1; dst = user; prt = tcp 22;
 }
 =OUTPUT=
---bridge
-! [ IP = 10.1.2.9 ]
+--bridge.info
+{"generated_by":"devel","model":"ASA","ip_list":["10.1.2.9"],"policy_distribution_point":"10.1.1.111"}
 =END=
 
 ############################################################
@@ -417,8 +417,8 @@ service:admin = {
  permit src = network:n1; dst = user; prt = tcp 22;
 }
 =OUTPUT=
---bridge
-! [ IP = 10.1.2.9 ]
+--bridge.info
+{"generated_by":"devel","model":"ASA","ip_list":["10.1.2.9"],"policy_distribution_point":"10.1.1.111"}
 =END=
 
 ############################################################
@@ -430,8 +430,8 @@ service:admin = {
  permit src = network:n1; dst = user; prt = tcp 22;
 }
 =OUTPUT=
---bridge
-! [ IP = 10.1.2.9 ]
+--bridge.info
+{"generated_by":"devel","model":"ASA","ip_list":["10.1.2.9"],"policy_distribution_point":"10.1.1.111"}
 =END=
 
 ############################################################

diff --git a/go/testdata/iptables.t b/go/testdata/iptables.t
@@ -21,10 +21,6 @@ service:s1 = {
 --r1.info
 {"generated_by":"devel","model":"Linux"}
 --r1
-# [ BEGIN r1 ]
---
-# [ Model = Linux ]
---
 # [ PREFIX ]
 --
 #!/sbin/iptables-restore <<EOF

diff --git a/go/testdata/ipv6/area_ipv6.t b/go/testdata/ipv6/area_ipv6.t
@@ -124,10 +124,10 @@ service:pdp3 = {
  permit src = host:h3; dst = user; prt = ip;
 }
 =OUTPUT=
---ipv6/asa1
-! [ IP = ::a01:101 ]
---ipv6/asa2
-! [ IP = ::a01:302 ]
+--ipv6/asa1.info
+{"generated_by":"devel","model":"ASA","ip_list":["::a01:101"],"policy_distribution_point":"::a01:10a"}
+--ipv6/asa2.info
+{"generated_by":"devel","model":"ASA","ip_list":["::a01:302"],"policy_distribution_point":"::a01:30a"}
 =OPTIONS=--check_policy_distribution_point=warn
 
 ############################################################

diff --git a/go/testdata/ipv6/auto_intf_ipv6.t b/go/testdata/ipv6/auto_intf_ipv6.t
@@ -1245,8 +1245,8 @@ service:test = {
  permit src = network:a; dst = user; prt = tcp 22;
 }
 =OUTPUT=
---ipv6/r1
-! [ IP = ::a00:1,::a01:101 ]
+--ipv6/r1.info
+{"generated_by":"devel","model":"IOS","ip_list":["::a00:1","::a01:101"],"policy_distribution_point":"::a00:a"}
 =END=
 
 ############################################################
@@ -1293,8 +1293,8 @@ service:s1 = {
  permit src = user; dst = interface:r2.n5;                  prt = tcp 80;
 }
 =OUTPUT=
---ipv6/r2
-! [ IP = ::a01:302,::a01:401 ]
+--ipv6/r2.info
+{"generated_by":"devel","model":"IOS","ip_list":["::a01:302","::a01:401"],"policy_distribution_point":"::a01:16f"}
 =END=
 
 ############################################################
@@ -1321,8 +1321,8 @@ service:s1 = {
         prt = tcp 22;
 }
 =OUTPUT=
---ipv6/r1
-! [ IP = ::a01:201,::a01:301 ]
+--ipv6/r1.info
+{"generated_by":"devel","model":"ASA","ip_list":["::a01:201","::a01:301"],"policy_distribution_point":"::a01:16f"}
 =OPTIONS=--check_policy_distribution_point=1
 
 ############################################################
@@ -1357,10 +1357,10 @@ service:s = {
  permit src = network:n3; dst = user; prt = tcp 22;
 }
 =OUTPUT=
---ipv6/r1
-! [ IP = ::a01:203 ]
---ipv6/r2
-! [ IP = ::a01:202 ]
+--ipv6/r1.info
+{"generated_by":"devel","model":"ASA","ip_list":["::a01:203"],"policy_distribution_point":"::a01:309"}
+--ipv6/r2.info
+{"generated_by":"devel","model":"ASA","ip_list":["::a01:202"],"policy_distribution_point":"::a01:309"}
 =END=
 
 ############################################################

diff --git a/go/testdata/ipv6/bridged_ipv6.t b/go/testdata/ipv6/bridged_ipv6.t
@@ -425,8 +425,8 @@ service:admin = {
  permit src = network:n1; dst = user; prt = tcp 22;
 }
 =OUTPUT=
---ipv6/bridge
-! [ IP = ::a01:209 ]
+--ipv6/bridge.info
+{"generated_by":"devel","model":"ASA","ip_list":["::a01:209"],"policy_distribution_point":"::a01:16f"}
 =END=
 
 ############################################################
@@ -439,8 +439,8 @@ service:admin = {
  permit src = network:n1; dst = user; prt = tcp 22;
 }
 =OUTPUT=
---ipv6/bridge
-! [ IP = ::a01:209 ]
+--ipv6/bridge.info
+{"generated_by":"devel","model":"ASA","ip_list":["::a01:209"],"policy_distribution_point":"::a01:16f"}
 =END=
 
 ############################################################
@@ -453,8 +453,8 @@ service:admin = {
  permit src = network:n1; dst = user; prt = tcp 22;
 }
 =OUTPUT=
---ipv6/bridge
-! [ IP = ::a01:209 ]
+--ipv6/bridge.info
+{"generated_by":"devel","model":"ASA","ip_list":["::a01:209"],"policy_distribution_point":"::a01:16f"}
 =END=
 
 ############################################################

diff --git a/go/testdata/ipv6/iptables_ipv6.t b/go/testdata/ipv6/iptables_ipv6.t
@@ -22,10 +22,6 @@ service:s1 = {
 --ipv6/r1.info
 {"generated_by":"devel","model":"Linux"}
 --ipv6/r1
-# [ BEGIN r1 ]
---
-# [ Model = Linux ]
---
 # [ PREFIX ]
 --
 #!/sbin/iptables-restore <<EOF