Test partition with more than network in zone

hknutzen · Nov 29, 2022 · 571c187 · 571c187
1 parent bf5c7d3
commit 571c187
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 5 deletions.
diff --git a/go/pkg/pass1/set-zone.go b/go/pkg/pass1/set-zone.go
@@ -81,12 +81,14 @@ func (c *spoc) setZone1(n *network, z *zone, in *routerIntf) {
 	if n.hasIdHosts {
 		z.hasIdHosts = true
 	}
-	if n.partition != "" && z.partition != "" {
-		c.err("Only one partition name allowed in zone %s, but found:\n"+
-			" - %s\n - %s",
-			z, n.partition, z.partition)
+	if n.partition != "" {
+		if z.partition != "" {
+			c.err("Only one partition name allowed in zone %s, but found:\n"+
+				" - %s\n - %s",
+				z, n.partition, z.partition)
+		}
+		z.partition = n.partition
 	}
-	z.partition = n.partition
 
 	// Proceed with adjacent elements...
 	for _, intf := range n.interfaces {

diff --git a/go/testdata/unconnected.t b/go/testdata/unconnected.t
@@ -311,6 +311,33 @@ Error: IPv4 topology has unconnected parts:
  Use partition attribute, if intended.
 =END=
 
+############################################################
+=TITLE=Intentionally unconnected with more than network in zone.
+=INPUT=
+network:n1 = { ip = 10.1.1.0/24; partition = part1; }
+network:n2 = { ip = 10.1.2.0/24; }
+network:n3 = { ip = 10.1.3.0/24; partition = part2; }
+network:n4 = { ip = 10.1.4.0/24; }
+router:r1 = {
+ interface:n1;
+ interface:n2;
+}
+router:r2 = {
+ interface:n3;
+ interface:n4;
+}
+service:s = {
+ user = network:n1;
+ permit src = user; dst = network:n3; prt = tcp 80;
+}
+=ERROR=
+Error: No valid path
+ from any:[network:n1]
+ to any:[network:n3]
+ for rule permit src=network:n1; dst=network:n3; prt=tcp 80; of service:s
+ Source and destination objects are located in different topology partitions: part1, part2.
+=END=
+
 ############################################################
 =TITLE=Rule from/to interface between unconnected partitions
 # zone1 is at network0,