From patchwork Thu Oct 22 21:24:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 1386431 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CHL3l0KqCz9sSs for ; Fri, 23 Oct 2020 08:24:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 791E320554; Thu, 22 Oct 2020 21:24:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T4xb6E2T8+lO; Thu, 22 Oct 2020 21:24:43 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id D9405204D0; Thu, 22 Oct 2020 21:24:39 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9EFA8C088B; Thu, 22 Oct 2020 21:24:39 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0A684C0051 for ; Thu, 22 Oct 2020 21:24:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D7B66203AB for ; Thu, 22 Oct 2020 21:24:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nkhTt3puXoov for ; Thu, 22 Oct 2020 21:24:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by silver.osuosl.org (Postfix) with ESMTPS id 019502038A for ; Thu, 22 Oct 2020 21:24:34 +0000 (UTC) Received: from sigfpe.attlocal.net (75-54-222-30.lightspeed.rdcyca.sbcglobal.net [75.54.222.30]) (Authenticated sender: blp@ovn.org) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 6023110000B; Thu, 22 Oct 2020 21:24:32 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Thu, 22 Oct 2020 14:24:21 -0700 Message-Id: <20201022212422.1913373-4-blp@ovn.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201022212422.1913373-1-blp@ovn.org> References: <20201022212422.1913373-1-blp@ovn.org> MIME-Version: 1.0 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH ovn 4/5] ovn-nbctl, ovn-sbctl: Add convenient names for more tables. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Ben Pfaff --- 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 abc674f4a289..4f28edc808ec 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 d3eec913323e..f93384940862 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}, };