|
 |
773311 |
From aff9c19d5fb9bb2cfba220d32ec68111d1adb1c5 Mon Sep 17 00:00:00 2001
|
|
|
773311 |
From: Tao YunXiang <taoyunxiang@cmss.chinamobile.com>
|
|
|
773311 |
Date: Wed, 11 Mar 2020 11:37:53 +0800
|
|
|
773311 |
Subject: [PATCH] Add external_ids column for tables in nb schema
|
|
|
773311 |
|
|
|
773311 |
"Logical_Router_Policy" and "Forwarding_Group" tables doesn't have
|
|
|
773311 |
"external_ids" column. I think it is better to add it, so CMS could
|
|
|
773311 |
fill it with useful information.
|
|
|
773311 |
|
|
|
773311 |
Author: Tao YunXiang <taoyunxiang@cmss.chinamobile.com>
|
|
|
773311 |
Co-authored-by: Liu Chang <liuchang@cmss.chinamobile.com>
|
|
|
773311 |
Co-authored-by: Rong Yin <rongyin@cmss.chinamobile.com>
|
|
|
773311 |
Signed-off-by: Tao YunXiang <taoyunxiang@cmss.chinamobile.com>
|
|
|
773311 |
Signed-off-by: Liu Chang <liuchang@cmss.chinamobile.com>
|
|
|
773311 |
Signed-off-by: Rong Yin <rongyin@cmss.chinamobile.com>
|
|
|
773311 |
Acked-by: Numan Siddique <numans@ovn.org>
|
|
|
773311 |
Signed-off-by: Numan Siddique <numans@ovn.org>
|
|
|
773311 |
(cherry picked from upstream commit 45de84bff0224e61847ff52d480c6500153ce699)
|
|
|
773311 |
|
|
|
773311 |
Change-Id: I85671ce34238dd8989756b395d85785c25c8842c
|
|
|
773311 |
---
|
|
|
773311 |
ovn-nb.ovsschema | 10 ++++++++--
|
|
|
773311 |
ovn-nb.xml | 12 ++++++++++++
|
|
|
773311 |
2 files changed, 20 insertions(+), 2 deletions(-)
|
|
|
773311 |
|
|
|
773311 |
diff --git a/ovn-nb.ovsschema b/ovn-nb.ovsschema
|
|
|
773311 |
index bbd6c25..843e979 100644
|
|
|
773311 |
--- a/ovn-nb.ovsschema
|
|
|
773311 |
+++ b/ovn-nb.ovsschema
|
|
|
773311 |
@@ -1,7 +1,7 @@
|
|
|
773311 |
{
|
|
|
773311 |
"name": "OVN_Northbound",
|
|
|
773311 |
"version": "5.20.0",
|
|
|
773311 |
- "cksum": "987891875 24923",
|
|
|
773311 |
+ "cksum": "2846067333 25243",
|
|
|
773311 |
"tables": {
|
|
|
773311 |
"NB_Global": {
|
|
|
773311 |
"columns": {
|
|
|
773311 |
@@ -125,6 +125,9 @@
|
|
|
773311 |
"vip": {"type": "string"},
|
|
|
773311 |
"vmac": {"type": "string"},
|
|
|
773311 |
"liveness": {"type": "boolean"},
|
|
|
773311 |
+ "external_ids": {
|
|
|
773311 |
+ "type": {"key": "string", "value": "string",
|
|
|
773311 |
+ "min": 0, "max": "unlimited"}},
|
|
|
773311 |
"child_port": {"type": {"key": "string",
|
|
|
773311 |
"min": 1, "max": "unlimited"}}},
|
|
|
773311 |
"isRoot": false},
|
|
|
773311 |
@@ -366,7 +369,10 @@
|
|
|
773311 |
"action": {"type": {
|
|
|
773311 |
"key": {"type": "string",
|
|
|
773311 |
"enum": ["set", ["allow", "drop", "reroute"]]}}},
|
|
|
773311 |
- "nexthop": {"type": {"key": "string", "min": 0, "max": 1}}},
|
|
|
773311 |
+ "nexthop": {"type": {"key": "string", "min": 0, "max": 1}},
|
|
|
773311 |
+ "external_ids": {
|
|
|
773311 |
+ "type": {"key": "string", "value": "string",
|
|
|
773311 |
+ "min": 0, "max": "unlimited"}}},
|
|
|
773311 |
"isRoot": false},
|
|
|
773311 |
"NAT": {
|
|
|
773311 |
"columns": {
|
|
|
773311 |
diff --git a/ovn-nb.xml b/ovn-nb.xml
|
|
|
773311 |
index f30cc9e..4a422bb 100644
|
|
|
773311 |
--- a/ovn-nb.xml
|
|
|
773311 |
+++ b/ovn-nb.xml
|
|
|
773311 |
@@ -1313,6 +1313,12 @@
|
|
|
773311 |
<column name="child_port">
|
|
|
773311 |
List of child ports in the forwarding group.
|
|
|
773311 |
</column>
|
|
|
773311 |
+
|
|
|
773311 |
+ <group title="Common Columns">
|
|
|
773311 |
+ <column name="external_ids">
|
|
|
773311 |
+ See External IDs at the beginning of this document.
|
|
|
773311 |
+ </column>
|
|
|
773311 |
+ </group>
|
|
|
773311 |
|
|
|
773311 |
|
|
|
773311 |
|
|
|
773311 |
@@ -2498,6 +2504,12 @@
|
|
|
773311 |
address of a connected router port or the IP address of a logical port.
|
|
|
773311 |
|
|
|
773311 |
</column>
|
|
|
773311 |
+
|
|
|
773311 |
+ <group title="Common Columns">
|
|
|
773311 |
+ <column name="external_ids">
|
|
|
773311 |
+ See External IDs at the beginning of this document.
|
|
|
773311 |
+ </column>
|
|
|
773311 |
+ </group>
|
|
|
773311 |
|
|
|
773311 |
|
|
|
773311 |
|
|
|
773311 |
--
|
|
|
773311 |
1.8.3.1
|
|
|
773311 |
|