Skip to content

Commit dcacf3f

Browse files
tpurschketpurschke
authored
Merge pull request #3834 from Imat00/feature/3782-crosstablesRulesZone
feat-ISSUE-3782-PR 1/2 adding crosstables rule - zone for destination and source
2 parents ba22881 + 40b4ccd commit dcacf3f

38 files changed

+1127
-312
lines changed

‎roles/api/files/replace_metadata.json‎

Lines changed: 604 additions & 135 deletions
Large diffs are not rendered by default.

‎roles/common/files/fwo-api-calls/import/rollbackImport.graphql‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
mutation rollbackImport($importId: bigint!) {
2-
delete_rule(where: {rule_create: {_eq: $importId}}) { affected_rows }
32
delete_rulebase(where: {created: {_eq: $importId}}) { affected_rows }
43
delete_rulebase_link(where: {created: {_eq: $importId}}) { affected_rows }
54
delete_object(where: {obj_create: {_eq: $importId}}) { affected_rows }
@@ -18,7 +17,10 @@ mutation rollbackImport($importId: bigint!) {
1817
delete_rule_nwobj_resolved(where: {created: {_eq: $importId}}) { affected_rows }
1918
delete_rule_svc_resolved(where: {created: {_eq: $importId}}) { affected_rows }
2019
delete_rule_user_resolved(where: {created: {_eq: $importId}}) { affected_rows }
20+
delete_rule_from_zone(where: {created: {_eq: $importId}}) { affected_rows }
21+
delete_rule_to_zone(where: {created: {_eq: $importId}}) { affected_rows }
2122
delete_rule_enforced_on_gateway(where: {created: {_eq: $importId}}) { affected_rows }
23+
delete_rule(where: {rule_create: {_eq: $importId}}) { affected_rows }
2224
update_rule(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
2325
update_rulebase(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
2426
update_rulebase_link(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
@@ -38,6 +40,8 @@ mutation rollbackImport($importId: bigint!) {
3840
update_rule_nwobj_resolved(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
3941
update_rule_svc_resolved(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
4042
update_rule_user_resolved(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
43+
update_rule_from_zone(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
44+
update_rule_to_zone(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
4145
update_rule_enforced_on_gateway(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
4246
delete_import_control(where: {control_id: {_eq: $importId}}) { affected_rows }
4347
}

‎roles/common/files/fwo-api-calls/report/getManagementForLatestNormalizedConfig.graphql‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,15 @@ fragment ruleFragment on rule {
120120
rule_last_hit
121121
}
122122
rule_comment
123-
src_zone: zone {
124-
zone_name
123+
rule_from_zones {
124+
zone {
125+
zone_name
126+
}
125127
}
126-
dst_zone: zoneByRuleToZone {
127-
zone_name
128+
rule_to_zones {
129+
zone {
130+
zone_name
131+
}
128132
}
129133
section_header: rule_head_text
130134
}

‎roles/common/files/fwo-api-calls/report/getManagementForNormalizedConfig.graphql‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,15 @@ fragment ruleFragment on rule {
167167
rule_last_hit
168168
}
169169
rule_comment
170-
src_zone: zone {
171-
zone_name
170+
rule_from_zones {
171+
zone {
172+
zone_name
173+
}
172174
}
173-
dst_zone: zoneByRuleToZone {
174-
zone_name
175+
rule_to_zones {
176+
zone {
177+
zone_name
178+
}
175179
}
176180
section_header: rule_head_text
177181
}
@@ -193,6 +197,7 @@ fragment deviceFragment on device {
193197
}
194198

195199
fragment ruleBaseLinkFragment on rulebase_link {
200+
gw_id
196201
rule {
197202
rule_uid
198203
}

‎roles/common/files/fwo-api-calls/rule/fragments/ruleDetails.graphql‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ fragment ruleDetails on rule {
99
rule_comment
1010
rule_track
1111
rule_disabled
12-
src_zone: zone {
13-
zone_name
14-
zone_id
15-
}
12+
rule_from_zones {
13+
zone {
14+
zone_name
15+
zone_id
16+
}
17+
}
1618
active
1719
rule_create
1820
rule_last_seen
@@ -41,9 +43,11 @@ fragment ruleDetails on rule {
4143
...networkObjectDetails
4244
}
4345
}
44-
dst_zone: zoneByRuleToZone {
45-
zone_name
46-
zone_id
46+
rule_to_zones {
47+
zone {
48+
zone_name
49+
zone_id
50+
}
4751
}
4852
rule_tos(where: {
4953
active: { _eq: $active }

‎roles/common/files/fwo-api-calls/rule/fragments/ruleDetailsChangesNew.graphql‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
rule_comment
88
rule_track
99
rule_disabled
10-
src_zone: zone {
11-
zone_name
12-
zone_id
13-
}
10+
rule_from_zones {
11+
zone {
12+
zone_name
13+
zone_id
14+
}
15+
}
1416
rule_metadatum {
1517
rule_metadata_id
1618
rule_created
@@ -49,9 +51,11 @@
4951
...networkObjectDetailsChangesNew
5052
}
5153
}
52-
dst_zone: zoneByRuleToZone {
53-
zone_name
54-
zone_id
54+
rule_to_zones {
55+
zone {
56+
zone_name
57+
zone_id
58+
}
5559
}
5660
rule_tos(where: {
5761
active: { _eq: $active }

‎roles/common/files/fwo-api-calls/rule/fragments/ruleDetailsChangesOld.graphql‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
rule_comment
88
rule_track
99
rule_disabled
10-
src_zone: zone {
11-
zone_name
12-
zone_id
13-
}
10+
rule_from_zones {
11+
zone {
12+
zone_name
13+
zone_id
14+
}
15+
}
1416
rule_metadatum {
1517
rule_metadata_id
1618
rule_created
@@ -49,9 +51,11 @@
4951
...networkObjectDetailsChangesOld
5052
}
5153
}
52-
dst_zone: zoneByRuleToZone {
53-
zone_name
54-
zone_id
54+
rule_to_zones {
55+
zone {
56+
zone_name
57+
zone_id
58+
}
5559
}
5660
rule_tos(where: {
5761
active: { _eq: $active }

‎roles/common/files/fwo-api-calls/rule/fragments/ruleDetailsForReport.graphql‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
section_header: rule_head_text
88
rule_comment
99
rule_track
10-
rule_disabled
11-
src_zone: zone {
12-
zone_name
13-
zone_id
14-
}
10+
rule_disabled
11+
rule_from_zones {
12+
zone {
13+
zone_name
14+
zone_id
15+
}
16+
}
1517
rule_metadatum {
1618
rule_metadata_id
1719
rule_created
@@ -51,9 +53,11 @@
5153
...networkObjectDetails
5254
}
5355
}
54-
dst_zone: zoneByRuleToZone {
55-
zone_name
56-
zone_id
56+
rule_to_zones {
57+
zone {
58+
zone_name
59+
zone_id
60+
}
5761
}
5862
rule_tos(where: {
5963
rt_create: { _lte: $import_id_end }

‎roles/common/files/fwo-api-calls/rule/fragments/ruleOverview.graphql‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ fragment ruleOverview on rule {
88
rule_comment
99
rule_track
1010
rule_disabled
11-
src_zone: zone {
12-
zone_name
13-
zone_id
14-
}
11+
rule_from_zones {
12+
zone {
13+
zone_name
14+
zone_id
15+
}
16+
}
1517
rule_metadatum {
1618
rule_metadata_id
1719
rule_created
@@ -52,9 +54,11 @@ fragment ruleOverview on rule {
5254
...networkObjectOverview
5355
}
5456
}
55-
dst_zone: zoneByRuleToZone {
56-
zone_name
57-
zone_id
57+
rule_to_zones {
58+
zone {
59+
zone_name
60+
zone_id
61+
}
5862
}
5963
rule_tos(where: {
6064
rt_create: { _lte: $import_id_end }

‎roles/common/files/fwo-api-calls/rule/fragments/ruleOverviewChangesNew.graphql‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ fragment ruleOverviewChangesNew on rule {
77
rule_comment
88
rule_track
99
rule_disabled
10-
src_zone: zone {
11-
zone_name
12-
zone_id
13-
}
10+
rule_from_zones {
11+
zone {
12+
zone_name
13+
zone_id
14+
}
15+
}
1416
rule_metadatum {
1517
rule_metadata_id
1618
rule_created
@@ -46,9 +48,11 @@ fragment ruleOverviewChangesNew on rule {
4648
...networkObjectOverview
4749
}
4850
}
49-
dst_zone: zoneByRuleToZone {
50-
zone_name
51-
zone_id
51+
rule_to_zones {
52+
zone {
53+
zone_name
54+
zone_id
55+
}
5256
}
5357
rule_tos(where: {
5458
active: { _eq: $active }

0 commit comments

Comments
 (0)