From a9c43b7da06d516102ae2be76a63d733a2e782ef Mon Sep 17 00:00:00 2001
From: Janis Streib <janis.streib@kit.edu>
Date: Mon, 1 Jul 2024 15:44:15 +0200
Subject: [PATCH] FIX: rename obsolete func constraints (closes #714)
---
frontend/src/api-services/dns_bcd.service.js | 2 +-
frontend/src/api-services/macfinder.service.js | 2 +-
frontend/src/api-services/netdoc.service.js | 12 ++++++------
frontend/src/api-services/ou.service.js | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/frontend/src/api-services/dns_bcd.service.js b/frontend/src/api-services/dns_bcd.service.js
index 9f9a03531..383398e65 100644
--- a/frontend/src/api-services/dns_bcd.service.js
+++ b/frontend/src/api-services/dns_bcd.service.js
@@ -29,7 +29,7 @@ export default {
{ name: 'nd.bcd.list', old: { name_list: [name] } },
{ name: 'nd.bcd2ou.list', inner_join_ref: { bcd_list: 'default' } },
{ idx: 'ou_base', name: 'org.unit.list', inner_join_ref: { bcd2ou_list: 'default' } },
- { name: 'org.unit.list', inner_join_ref: { ou_base: 'api_func_org_unit_is_subset_of_root_node_set' } },
+ { name: 'org.unit.list', inner_join_ref: { ou_base: 'api_func_org_unit_hierarchy_gfk_list_is_subset' } },
{
name: 'nd.ip_subnet.list',
inner_join_ref: { bcd_list: 'default' },
diff --git a/frontend/src/api-services/macfinder.service.js b/frontend/src/api-services/macfinder.service.js
index e27bce85a..8cb19b37c 100644
--- a/frontend/src/api-services/macfinder.service.js
+++ b/frontend/src/api-services/macfinder.service.js
@@ -30,7 +30,7 @@ export default {
is_edge_node: true
},
inner_join_ref: {
- p_port_list: 'api_func_nd_p_port_is_intersect_of_conn_node_set'
+ p_port_list: 'api_func_nd_p_port_is_contained_by_conn_id_gfk_list'
},
anti_join_ref: {
tmp: 'self'
diff --git a/frontend/src/api-services/netdoc.service.js b/frontend/src/api-services/netdoc.service.js
index a59183955..735e69677 100644
--- a/frontend/src/api-services/netdoc.service.js
+++ b/frontend/src/api-services/netdoc.service.js
@@ -225,7 +225,7 @@ export default {
name: 'nd.p_port.list',
idx: 'tagged_dd_p_port_list_all',
inner_join_ref: {
- tagged_p_port_list: 'api_func_nd_p_port_is_intersect_of_conn_node_set'
+ tagged_p_port_list: 'api_func_nd_p_port_is_contained_by_conn_id_gfk_list'
},
old: {
is_edge_node: true
@@ -236,7 +236,7 @@ export default {
name: 'nd.p_port.list',
idx: 'dd_p_port_list_all',
inner_join_ref: {
- p_port_list: 'api_func_nd_p_port_is_intersect_of_conn_node_set'
+ p_port_list: 'api_func_nd_p_port_is_contained_by_conn_id_gfk_list'
},
old: {
is_edge_node: true
@@ -305,7 +305,7 @@ export default {
name: 'nd.p_port.list',
idx: 'p_port_list',
inner_join_ref: {
- p_port_list_one: 'api_func_nd_p_port_is_intersect_of_conn_node_set',
+ p_port_list_one: 'api_func_nd_p_port_is_contained_by_conn_id_gfk_list',
}
},
{
@@ -342,7 +342,7 @@ export default {
name: 'nd.p_port.list',
idx: 'resolved_p_ports',
inner_join_ref: {
- p_port_list: 'api_func_nd_p_port_is_intersect_of_conn_node_set'
+ p_port_list: 'api_func_nd_p_port_is_contained_by_conn_id_gfk_list'
},
old: {
is_edge_node: true
@@ -494,7 +494,7 @@ export default {
name: 'nd.module.list',
idx: 'all_root_module_list',
inner_join_ref: {
- module_list: 'api_func_nd_module_is_subset_of_root_node_set'
+ module_list: 'api_func_nd_module_hierarchy_gfk_list_is_subset'
}
},
{
@@ -534,7 +534,7 @@ export default {
name: 'nd.p_port.list',
idx: 'remote_p_port_list',
inner_join_ref: {
- local_p_port_list: 'api_func_nd_p_port_is_intersect_of_conn_node_set'
+ local_p_port_list: 'api_func_nd_p_port_is_contained_by_conn_id_gfk_list'
},
old: {
is_edge_node: true
diff --git a/frontend/src/api-services/ou.service.js b/frontend/src/api-services/ou.service.js
index e522c8f22..538a7462d 100644
--- a/frontend/src/api-services/ou.service.js
+++ b/frontend/src/api-services/ou.service.js
@@ -7,7 +7,7 @@ export default {
{
name: 'org.unit.list',
idx: 'parent_ous',
- inner_join_ref: {parent_ou: 'api_func_org_unit_is_subset_of_root_node_set'}
+ inner_join_ref: {parent_ou: 'api_func_org_unit_hierarchy_gfk_list_is_subset'}
}
]
return TransactionService.execute(config, ta)
@@ -15,12 +15,12 @@ export default {
getOU(config, ou) {
const ta = [
{idx: 'current_ou', name: 'org.unit.list', old: {short_name: ou}},
- {idx: 'child_ous', name: 'org.unit.list', inner_join_ref: {current_ou: 'api_func_org_unit_is_superset_of_root_node_set'}},
+ {idx: 'child_ous', name: 'org.unit.list', inner_join_ref: {current_ou: 'api_func_org_unit_hierarchy_gfk_list_is_superset'}},
{
idx: 'parent_ous',
name: 'org.unit.list',
old: {sorting_params_list: ['tree_level DESC']},
- inner_join_ref: {current_ou: 'api_func_org_unit_is_subset_of_root_node_set'}
+ inner_join_ref: {current_ou: 'api_func_org_unit_hierarchy_gfk_list_is_subset'}
},
{name: 'cntl.mgr2ou.list', inner_join_ref: {current_ou: 'default'}},
{name: 'cntl.mgr.list', inner_join_ref: {mgr2ou_list: 'default'}},
@@ -52,7 +52,7 @@ export default {
{
idx: 'unit_list_superset',
name: 'org.unit.list',
- inner_join_ref: {unit_list: 'api_func_org_unit_is_superset_of_root_node_set'}
+ inner_join_ref: {unit_list: 'api_func_org_unit_hierarchy_gfk_list_is_superset'}
},
{name: 'cntl.mgr2ou.list', inner_join_ref: {unit_list_superset: 'default'}},
{name: 'cntl.mgr.list', inner_join_ref: {mgr2ou_list: 'default'}},
--
GitLab