diff mbox series

[ovs-dev,OVN] Add external_ids column for tables in nb schema

Message ID 20200311033753.16113-1-taoyunxiang@cmss.chinamobile.com
State Accepted
Headers show
Series [ovs-dev,OVN] Add external_ids column for tables in nb schema | expand

Commit Message

Tao YunXiang March 11, 2020, 3:37 a.m. UTC
"Logical_Router_Policy"  and "Forwarding_Group" tables doesn't have
"external_ids" column. I think it is better to add it, so CMS could
fill it with useful information.



Author: Tao YunXiang <taoyunxiang@cmss.chinamobile.com>
Co-authored-by: Liu Chang <liuchang@cmss.chinamobile.com>  
Co-authored-by: Rong Yin <rongyin@cmss.chinamobile.com>
Signed-off-by: Tao YunXiang <taoyunxiang@cmss.chinamobile.com> 
Signed-off-by: Liu Chang <liuchang@cmss.chinamobile.com>  
Signed-off-by: Rong Yin <rongyin@cmss.chinamobile.com>
---
 ovn-nb.ovsschema | 10 ++++++++--
 ovn-nb.xml       | 12 ++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

Comments

Numan Siddique March 11, 2020, 9:04 a.m. UTC | #1
On Wed, Mar 11, 2020 at 9:08 AM Tao YunXiang
<taoyunxiang@cmss.chinamobile.com> wrote:
>
> "Logical_Router_Policy"  and "Forwarding_Group" tables doesn't have
> "external_ids" column. I think it is better to add it, so CMS could
> fill it with useful information.
>
>
>
> Author: Tao YunXiang <taoyunxiang@cmss.chinamobile.com>
> Co-authored-by: Liu Chang <liuchang@cmss.chinamobile.com>
> Co-authored-by: Rong Yin <rongyin@cmss.chinamobile.com>
> Signed-off-by: Tao YunXiang <taoyunxiang@cmss.chinamobile.com>
> Signed-off-by: Liu Chang <liuchang@cmss.chinamobile.com>
> Signed-off-by: Rong Yin <rongyin@cmss.chinamobile.com>

Acked-by: Numan Siddique <numans@ovn.org>

Numan

> ---
>  ovn-nb.ovsschema | 10 ++++++++--
>  ovn-nb.xml       | 12 ++++++++++++
>  2 files changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/ovn-nb.ovsschema b/ovn-nb.ovsschema
> index bbd6c2580..843e979db 100644
> --- a/ovn-nb.ovsschema
> +++ b/ovn-nb.ovsschema
> @@ -1,7 +1,7 @@
>  {
>      "name": "OVN_Northbound",
>      "version": "5.20.0",
> -    "cksum": "987891875 24923",
> +    "cksum": "2846067333 25243",
>      "tables": {
>          "NB_Global": {
>              "columns": {
> @@ -125,6 +125,9 @@
>                  "vip": {"type": "string"},
>                  "vmac": {"type": "string"},
>                  "liveness": {"type": "boolean"},
> +                "external_ids": {
> +                    "type": {"key": "string", "value": "string",
> +                             "min": 0, "max": "unlimited"}},
>                  "child_port": {"type": {"key": "string",
>                                          "min": 1, "max": "unlimited"}}},
>              "isRoot": false},
> @@ -366,7 +369,10 @@
>                  "action": {"type": {
>                      "key": {"type": "string",
>                              "enum": ["set", ["allow", "drop", "reroute"]]}}},
> -                "nexthop": {"type": {"key": "string", "min": 0, "max": 1}}},
> +                "nexthop": {"type": {"key": "string", "min": 0, "max": 1}},
> +                "external_ids": {
> +                    "type": {"key": "string", "value": "string",
> +                             "min": 0, "max": "unlimited"}}},
>              "isRoot": false},
>          "NAT": {
>              "columns": {
> diff --git a/ovn-nb.xml b/ovn-nb.xml
> index ccd9bae99..d06ff00f0 100644
> --- a/ovn-nb.xml
> +++ b/ovn-nb.xml
> @@ -1329,6 +1329,12 @@
>      <column name="child_port">
>        List of child ports in the forwarding group.
>      </column>
> +
> +    <group title="Common Columns">
> +      <column name="external_ids">
> +        See <em>External IDs</em> at the beginning of this document.
> +      </column>
> +    </group>
>    </table>
>
>    <table name="Address_Set" title="Address Sets">
> @@ -2489,6 +2495,12 @@
>          address of a connected router port or the IP address of a logical port.
>        </p>
>      </column>
> +
> +    <group title="Common Columns">
> +      <column name="external_ids">
> +        See <em>External IDs</em> at the beginning of this document.
> +      </column>
> +    </group>
>    </table>
>
>    <table name="NAT" title="NAT rules">
> --
> 2.17.1
>
>
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
Numan Siddique March 13, 2020, 11:34 a.m. UTC | #2
On Wed, Mar 11, 2020 at 2:34 PM Numan Siddique <numans@ovn.org> wrote:
>
> On Wed, Mar 11, 2020 at 9:08 AM Tao YunXiang
> <taoyunxiang@cmss.chinamobile.com> wrote:
> >
> > "Logical_Router_Policy"  and "Forwarding_Group" tables doesn't have
> > "external_ids" column. I think it is better to add it, so CMS could
> > fill it with useful information.
> >
> >
> >
> > Author: Tao YunXiang <taoyunxiang@cmss.chinamobile.com>
> > Co-authored-by: Liu Chang <liuchang@cmss.chinamobile.com>
> > Co-authored-by: Rong Yin <rongyin@cmss.chinamobile.com>
> > Signed-off-by: Tao YunXiang <taoyunxiang@cmss.chinamobile.com>
> > Signed-off-by: Liu Chang <liuchang@cmss.chinamobile.com>
> > Signed-off-by: Rong Yin <rongyin@cmss.chinamobile.com>
>
> Acked-by: Numan Siddique <numans@ovn.org>

I applied this patch to master.

Numan

>
> Numan
>
> > ---
> >  ovn-nb.ovsschema | 10 ++++++++--
> >  ovn-nb.xml       | 12 ++++++++++++
> >  2 files changed, 20 insertions(+), 2 deletions(-)
> >
> > diff --git a/ovn-nb.ovsschema b/ovn-nb.ovsschema
> > index bbd6c2580..843e979db 100644
> > --- a/ovn-nb.ovsschema
> > +++ b/ovn-nb.ovsschema
> > @@ -1,7 +1,7 @@
> >  {
> >      "name": "OVN_Northbound",
> >      "version": "5.20.0",
> > -    "cksum": "987891875 24923",
> > +    "cksum": "2846067333 25243",
> >      "tables": {
> >          "NB_Global": {
> >              "columns": {
> > @@ -125,6 +125,9 @@
> >                  "vip": {"type": "string"},
> >                  "vmac": {"type": "string"},
> >                  "liveness": {"type": "boolean"},
> > +                "external_ids": {
> > +                    "type": {"key": "string", "value": "string",
> > +                             "min": 0, "max": "unlimited"}},
> >                  "child_port": {"type": {"key": "string",
> >                                          "min": 1, "max": "unlimited"}}},
> >              "isRoot": false},
> > @@ -366,7 +369,10 @@
> >                  "action": {"type": {
> >                      "key": {"type": "string",
> >                              "enum": ["set", ["allow", "drop", "reroute"]]}}},
> > -                "nexthop": {"type": {"key": "string", "min": 0, "max": 1}}},
> > +                "nexthop": {"type": {"key": "string", "min": 0, "max": 1}},
> > +                "external_ids": {
> > +                    "type": {"key": "string", "value": "string",
> > +                             "min": 0, "max": "unlimited"}}},
> >              "isRoot": false},
> >          "NAT": {
> >              "columns": {
> > diff --git a/ovn-nb.xml b/ovn-nb.xml
> > index ccd9bae99..d06ff00f0 100644
> > --- a/ovn-nb.xml
> > +++ b/ovn-nb.xml
> > @@ -1329,6 +1329,12 @@
> >      <column name="child_port">
> >        List of child ports in the forwarding group.
> >      </column>
> > +
> > +    <group title="Common Columns">
> > +      <column name="external_ids">
> > +        See <em>External IDs</em> at the beginning of this document.
> > +      </column>
> > +    </group>
> >    </table>
> >
> >    <table name="Address_Set" title="Address Sets">
> > @@ -2489,6 +2495,12 @@
> >          address of a connected router port or the IP address of a logical port.
> >        </p>
> >      </column>
> > +
> > +    <group title="Common Columns">
> > +      <column name="external_ids">
> > +        See <em>External IDs</em> at the beginning of this document.
> > +      </column>
> > +    </group>
> >    </table>
> >
> >    <table name="NAT" title="NAT rules">
> > --
> > 2.17.1
> >
> >
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> >
diff mbox series

Patch

diff --git a/ovn-nb.ovsschema b/ovn-nb.ovsschema
index bbd6c2580..843e979db 100644
--- a/ovn-nb.ovsschema
+++ b/ovn-nb.ovsschema
@@ -1,7 +1,7 @@ 
 {
     "name": "OVN_Northbound",
     "version": "5.20.0",
-    "cksum": "987891875 24923",
+    "cksum": "2846067333 25243",
     "tables": {
         "NB_Global": {
             "columns": {
@@ -125,6 +125,9 @@ 
                 "vip": {"type": "string"},
                 "vmac": {"type": "string"},
                 "liveness": {"type": "boolean"},
+                "external_ids": {
+                    "type": {"key": "string", "value": "string",
+                             "min": 0, "max": "unlimited"}},
                 "child_port": {"type": {"key": "string",
                                         "min": 1, "max": "unlimited"}}},
             "isRoot": false},
@@ -366,7 +369,10 @@ 
                 "action": {"type": {
                     "key": {"type": "string",
                             "enum": ["set", ["allow", "drop", "reroute"]]}}},
-                "nexthop": {"type": {"key": "string", "min": 0, "max": 1}}},
+                "nexthop": {"type": {"key": "string", "min": 0, "max": 1}},
+                "external_ids": {
+                    "type": {"key": "string", "value": "string",
+                             "min": 0, "max": "unlimited"}}},
             "isRoot": false},
         "NAT": {
             "columns": {
diff --git a/ovn-nb.xml b/ovn-nb.xml
index ccd9bae99..d06ff00f0 100644
--- a/ovn-nb.xml
+++ b/ovn-nb.xml
@@ -1329,6 +1329,12 @@ 
     <column name="child_port">
       List of child ports in the forwarding group.
     </column>
+
+    <group title="Common Columns">
+      <column name="external_ids">
+        See <em>External IDs</em> at the beginning of this document.
+      </column>
+    </group>
   </table>
 
   <table name="Address_Set" title="Address Sets">
@@ -2489,6 +2495,12 @@ 
         address of a connected router port or the IP address of a logical port.
       </p>
     </column>
+
+    <group title="Common Columns">
+      <column name="external_ids">
+        See <em>External IDs</em> at the beginning of this document.
+      </column>
+    </group>
   </table>
 
   <table name="NAT" title="NAT rules">