From a6e21d42de7c195fa50d46a068462301959bda26 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 2 Apr 2020 10:26:15 -0700 Subject: [PATCH 01/10] ovn-nbctl, ovn-sbctl: Add convenient names for more tables. Signed-off-by: Ben Pfaff Acked-by: Numan Siddique --- utilities/ovn-nbctl.c | 21 +++++++++++++++++++++ utilities/ovn-sbctl.c | 27 +++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/utilities/ovn-nbctl.c b/utilities/ovn-nbctl.c index caf99dfeb..dfcf67cfd 100644 --- a/utilities/ovn-nbctl.c +++ b/utilities/ovn-nbctl.c @@ -6107,8 +6107,29 @@ static const struct ctl_table_class tables[NBREC_N_TABLES] = { [NBREC_TABLE_ACL].row_ids[0] = {&nbrec_acl_col_name, NULL, NULL}, + [NBREC_TABLE_HA_CHASSIS].row_ids[0] + = {&nbrec_ha_chassis_col_chassis_name, NULL, NULL}, + [NBREC_TABLE_HA_CHASSIS_GROUP].row_ids[0] = {&nbrec_ha_chassis_group_col_name, NULL, NULL}, + + [NBREC_TABLE_LOAD_BALANCER].row_ids[0] + = {&nbrec_load_balancer_col_name, NULL, NULL}, + + [NBREC_TABLE_LOAD_BALANCER_HEALTH_CHECK].row_ids[0] + = {&nbrec_load_balancer_health_check_col_vip, NULL, NULL}, + + [NBREC_TABLE_FORWARDING_GROUP].row_ids[0] + = {&nbrec_forwarding_group_col_name, NULL, NULL}, + + [NBREC_TABLE_METER].row_ids[0] + = {&nbrec_meter_col_name, NULL, NULL}, + + [NBREC_TABLE_NAT].row_ids[0] + = {&nbrec_nat_col_external_ip, NULL, NULL}, + + [NBREC_TABLE_CONNECTION].row_ids[0] + = {&nbrec_connection_col_target, NULL, NULL}, }; static char * diff --git a/utilities/ovn-sbctl.c b/utilities/ovn-sbctl.c index d3eec9133..f93384940 100644 --- a/utilities/ovn-sbctl.c +++ b/utilities/ovn-sbctl.c @@ -1410,11 +1410,38 @@ static const struct ctl_table_class tables[SBREC_N_TABLES] = { [SBREC_TABLE_ADDRESS_SET].row_ids[0] = {&sbrec_address_set_col_name, NULL, NULL}, + [SBREC_TABLE_PORT_GROUP].row_ids[0] + = {&sbrec_port_group_col_name, NULL, NULL}, + [SBREC_TABLE_HA_CHASSIS_GROUP].row_ids[0] = {&sbrec_ha_chassis_group_col_name, NULL, NULL}, [SBREC_TABLE_HA_CHASSIS].row_ids[0] = {&sbrec_ha_chassis_col_chassis, NULL, NULL}, + + [SBREC_TABLE_METER].row_ids[0] + = {&sbrec_meter_col_name, NULL, NULL}, + + [SBREC_TABLE_SERVICE_MONITOR].row_ids[0] + = {&sbrec_service_monitor_col_logical_port, NULL, NULL}, + + [SBREC_TABLE_DHCP_OPTIONS].row_ids[0] + = {&sbrec_dhcp_options_col_name, NULL, NULL}, + + [SBREC_TABLE_DHCPV6_OPTIONS].row_ids[0] + = {&sbrec_dhcpv6_options_col_name, NULL, NULL}, + + [SBREC_TABLE_CONNECTION].row_ids[0] + = {&sbrec_connection_col_target, NULL, NULL}, + + [SBREC_TABLE_RBAC_ROLE].row_ids[0] + = {&sbrec_rbac_role_col_name, NULL, NULL}, + + [SBREC_TABLE_RBAC_PERMISSION].row_ids[0] + = {&sbrec_rbac_permission_col_table, NULL, NULL}, + + [SBREC_TABLE_GATEWAY_CHASSIS].row_ids[0] + = {&sbrec_gateway_chassis_col_name, NULL, NULL}, }; -- 2.28.0