Skip to content

Commit 28dde8b

Browse files
committed
Remove attribute multi_owner
1 parent 6b6442a commit 28dde8b

File tree

2 files changed

+47
-0
lines changed

2 files changed

+47
-0
lines changed

go/pkg/pass1/cut-netspoc.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,6 +1127,10 @@ func (c *spoc) cutNetspoc(
11271127
if !keepOwner {
11281128
removeSubAttr(&x.Attributes, "router_attributes", "owner")
11291129
}
1130+
case *ast.Service:
1131+
if !keepOwner {
1132+
removeAttr(&x.Attributes, "multi_owner")
1133+
}
11301134
case *ast.TopStruct:
11311135
if typ == "any" {
11321136
removeOwner(&x.Attributes)

go/testdata/cut-netspoc/cut-netspoc.t

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,49 @@ service:s1 = {
259259
}
260260
=END=
261261

262+
############################################################
263+
=TITLE=Remove owner and attribute multi_owner
264+
=INPUT=
265+
owner:o1 = { admins = a1@example.com; }
266+
owner:o2 = { admins = a2@example.com; }
267+
network:n1 = { ip = 10.1.1.0/24; owner = o1; }
268+
network:n2 = { ip = 10.1.2.0/24; owner = o2; }
269+
network:n3 = { ip = 10.1.3.0/24; }
270+
router:asa1 = {
271+
managed;
272+
model = ASA;
273+
interface:n1 = { ip = 10.1.1.1; hardware = n1; }
274+
interface:n2 = { ip = 10.1.2.1; hardware = n2; }
275+
interface:n3 = { ip = 10.1.3.1; hardware = n3; }
276+
}
277+
service:s1 = {
278+
multi_owner;
279+
user = network:n3;
280+
permit src = user;
281+
dst = network:n1, network:n2;
282+
prt = tcp 80;
283+
}
284+
=OUTPUT=
285+
network:n1 = { ip = 10.1.1.0/24; }
286+
network:n2 = { ip = 10.1.2.0/24; }
287+
network:n3 = { ip = 10.1.3.0/24; }
288+
router:asa1 = {
289+
managed;
290+
model = ASA;
291+
interface:n1 = { ip = 10.1.1.1; hardware = n1; }
292+
interface:n2 = { ip = 10.1.2.1; hardware = n2; }
293+
interface:n3 = { ip = 10.1.3.1; hardware = n3; }
294+
}
295+
service:s1 = {
296+
user = network:n3;
297+
permit src = user;
298+
dst = network:n1,
299+
network:n2,
300+
;
301+
prt = tcp 80;
302+
}
303+
=END=
304+
262305
############################################################
263306
=TITLE=Remove unused protocolgroup
264307
=INPUT=

0 commit comments

Comments
 (0)