diff mbox series

[ovs-dev,v1] OVN: Add external_ids to NAT and Logical_Router_Static_Route tables.

Message ID 20171204131601.4330-1-lmartins@redhat.com
State Accepted
Headers show
Series [ovs-dev,v1] OVN: Add external_ids to NAT and Logical_Router_Static_Route tables. | expand

Commit Message

Lucas Martins Dec. 4, 2017, 1:16 p.m. UTC 
From: Lucas Alvares Gomes <lucasagomes@gmail.com>

The external_ids column is missing from the NAT and
Logical_Router_Static_Route tables.

Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
---
 ovn/ovn-nb.ovsschema | 14 ++++++++++----
 ovn/ovn-nb.xml       | 14 ++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

Comments

Miguel Angel Ajo Dec. 4, 2017, 2:04 p.m. UTC | #1 
Acked-by: Miguel Angel Ajo <majopela@redhat.com>

On Mon, Dec 4, 2017 at 2:16 PM, <lmartins@redhat.com> wrote:

> From: Lucas Alvares Gomes <lucasagomes@gmail.com>
>
> The external_ids column is missing from the NAT and
> Logical_Router_Static_Route tables.
>
> Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
> ---
>  ovn/ovn-nb.ovsschema | 14 ++++++++++----
>  ovn/ovn-nb.xml       | 14 ++++++++++++++
>  2 files changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/ovn/ovn-nb.ovsschema b/ovn/ovn-nb.ovsschema
> index fcd878cf2..081ddb54c 100644
> --- a/ovn/ovn-nb.ovsschema
> +++ b/ovn/ovn-nb.ovsschema
> @@ -1,7 +1,7 @@
>  {
>      "name": "OVN_Northbound",
> -    "version": "5.8.1",
> -    "cksum": "607160660 16929",
> +    "version": "5.9.0",
> +    "cksum": "1120419033 17249",
>      "tables": {
>          "NB_Global": {
>              "columns": {
> @@ -238,7 +238,10 @@
>                                                               "dst-ip"]]},
>                                      "min": 0, "max": 1}},
>                  "nexthop": {"type": "string"},
> -                "output_port": {"type": {"key": "string", "min": 0,
> "max": 1}}},
> +                "output_port": {"type": {"key": "string", "min": 0,
> "max": 1}},
> +                "external_ids": {
> +                    "type": {"key": "string", "value": "string",
> +                             "min": 0, "max": "unlimited"}}},
>              "isRoot": false},
>          "NAT": {
>              "columns": {
> @@ -252,7 +255,10 @@
>                                             "enum": ["set", ["dnat",
>                                                               "snat",
>
> "dnat_and_snat"
> -                                                               ]]}}}},
> +                                                               ]]}}},
> +                "external_ids": {
> +                    "type": {"key": "string", "value": "string",
> +                             "min": 0, "max": "unlimited"}}},
>              "isRoot": false},
>          "DHCP_Options": {
>              "columns": {
> diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml
> index 1091c05ce..4e3899f28 100644
> --- a/ovn/ovn-nb.xml
> +++ b/ovn/ovn-nb.xml
> @@ -1540,6 +1540,13 @@
>          address as the one via which the <ref column="nexthop"/> is
> reachable.
>        </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">
> @@ -1618,6 +1625,13 @@
>          port instance on the <code>redirect-chassis</code>.
>        </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="DHCP_Options" title="DHCP options">
> --
> 2.15.1
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
Daniel Alvarez Sanchez Dec. 4, 2017, 2:06 p.m. UTC | #2 
Acked-by: Daniel Alvarez <dalvarez@redhat.com>

From [0] one can expect this column to be present in all tables.
[0] https://github.com/openvswitch/ovs/blob/v2.8.1/ovn/ovn-nb.xml#L19

On Mon, Dec 4, 2017 at 2:16 PM, <lmartins@redhat.com> wrote:

> From: Lucas Alvares Gomes <lucasagomes@gmail.com>
>
> The external_ids column is missing from the NAT and
> Logical_Router_Static_Route tables.
>
> Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
> ---
>  ovn/ovn-nb.ovsschema | 14 ++++++++++----
>  ovn/ovn-nb.xml       | 14 ++++++++++++++
>  2 files changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/ovn/ovn-nb.ovsschema b/ovn/ovn-nb.ovsschema
> index fcd878cf2..081ddb54c 100644
> --- a/ovn/ovn-nb.ovsschema
> +++ b/ovn/ovn-nb.ovsschema
> @@ -1,7 +1,7 @@
>  {
>      "name": "OVN_Northbound",
> -    "version": "5.8.1",
> -    "cksum": "607160660 16929",
> +    "version": "5.9.0",
> +    "cksum": "1120419033 17249",
>      "tables": {
>          "NB_Global": {
>              "columns": {
> @@ -238,7 +238,10 @@
>                                                               "dst-ip"]]},
>                                      "min": 0, "max": 1}},
>                  "nexthop": {"type": "string"},
> -                "output_port": {"type": {"key": "string", "min": 0,
> "max": 1}}},
> +                "output_port": {"type": {"key": "string", "min": 0,
> "max": 1}},
> +                "external_ids": {
> +                    "type": {"key": "string", "value": "string",
> +                             "min": 0, "max": "unlimited"}}},
>              "isRoot": false},
>          "NAT": {
>              "columns": {
> @@ -252,7 +255,10 @@
>                                             "enum": ["set", ["dnat",
>                                                               "snat",
>
> "dnat_and_snat"
> -                                                               ]]}}}},
> +                                                               ]]}}},
> +                "external_ids": {
> +                    "type": {"key": "string", "value": "string",
> +                             "min": 0, "max": "unlimited"}}},
>              "isRoot": false},
>          "DHCP_Options": {
>              "columns": {
> diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml
> index 1091c05ce..4e3899f28 100644
> --- a/ovn/ovn-nb.xml
> +++ b/ovn/ovn-nb.xml
> @@ -1540,6 +1540,13 @@
>          address as the one via which the <ref column="nexthop"/> is
> reachable.
>        </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">
> @@ -1618,6 +1625,13 @@
>          port instance on the <code>redirect-chassis</code>.
>        </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="DHCP_Options" title="DHCP options">
> --
> 2.15.1
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
Ben Pfaff Dec. 4, 2017, 7:11 p.m. UTC | #3 
Applied, thanks.

On Mon, Dec 04, 2017 at 03:06:39PM +0100, Daniel Alvarez Sanchez wrote:
> Acked-by: Daniel Alvarez <dalvarez@redhat.com>
> 
> From [0] one can expect this column to be present in all tables.
> [0] https://github.com/openvswitch/ovs/blob/v2.8.1/ovn/ovn-nb.xml#L19
> 
> On Mon, Dec 4, 2017 at 2:16 PM, <lmartins@redhat.com> wrote:
> 
> > From: Lucas Alvares Gomes <lucasagomes@gmail.com>
> >
> > The external_ids column is missing from the NAT and
> > Logical_Router_Static_Route tables.
> >
> > Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
> > ---
> >  ovn/ovn-nb.ovsschema | 14 ++++++++++----
> >  ovn/ovn-nb.xml       | 14 ++++++++++++++
> >  2 files changed, 24 insertions(+), 4 deletions(-)
> >
> > diff --git a/ovn/ovn-nb.ovsschema b/ovn/ovn-nb.ovsschema
> > index fcd878cf2..081ddb54c 100644
> > --- a/ovn/ovn-nb.ovsschema
> > +++ b/ovn/ovn-nb.ovsschema
> > @@ -1,7 +1,7 @@
> >  {
> >      "name": "OVN_Northbound",
> > -    "version": "5.8.1",
> > -    "cksum": "607160660 16929",
> > +    "version": "5.9.0",
> > +    "cksum": "1120419033 17249",
> >      "tables": {
> >          "NB_Global": {
> >              "columns": {
> > @@ -238,7 +238,10 @@
> >                                                               "dst-ip"]]},
> >                                      "min": 0, "max": 1}},
> >                  "nexthop": {"type": "string"},
> > -                "output_port": {"type": {"key": "string", "min": 0,
> > "max": 1}}},
> > +                "output_port": {"type": {"key": "string", "min": 0,
> > "max": 1}},
> > +                "external_ids": {
> > +                    "type": {"key": "string", "value": "string",
> > +                             "min": 0, "max": "unlimited"}}},
> >              "isRoot": false},
> >          "NAT": {
> >              "columns": {
> > @@ -252,7 +255,10 @@
> >                                             "enum": ["set", ["dnat",
> >                                                               "snat",
> >
> > "dnat_and_snat"
> > -                                                               ]]}}}},
> > +                                                               ]]}}},
> > +                "external_ids": {
> > +                    "type": {"key": "string", "value": "string",
> > +                             "min": 0, "max": "unlimited"}}},
> >              "isRoot": false},
> >          "DHCP_Options": {
> >              "columns": {
> > diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml
> > index 1091c05ce..4e3899f28 100644
> > --- a/ovn/ovn-nb.xml
> > +++ b/ovn/ovn-nb.xml
> > @@ -1540,6 +1540,13 @@
> >          address as the one via which the <ref column="nexthop"/> is
> > reachable.
> >        </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">
> > @@ -1618,6 +1625,13 @@
> >          port instance on the <code>redirect-chassis</code>.
> >        </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="DHCP_Options" title="DHCP options">
> > --
> > 2.15.1
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> >
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Russell Bryant Dec. 5, 2017, 6:44 p.m. UTC | #4 
Lucas asked me about backporting this one, as OpenStack would start
making use of it with an OVS 2.8 update if available.

The schema change seems pretty harmless.  The catch is that this also
updated the schema version number from "5.8.1" to "5.8.2", while
branch-2.8 has "5.8.0".  master includes a change that introduced a
new feature, along with the "5.8.1" update, that we would not
backport.

The main choices seem to be ...

1) Don't backport.

2) Backport, but leave the schema version number unchanged in branch-2.8.

Does anyone see a problem with option #2?  It's easy enough to
determine if the new columns are present, even without the version
number bump.

On Mon, Dec 4, 2017 at 2:11 PM, Ben Pfaff <blp@ovn.org> wrote:
> Applied, thanks.
>
> On Mon, Dec 04, 2017 at 03:06:39PM +0100, Daniel Alvarez Sanchez wrote:
>> Acked-by: Daniel Alvarez <dalvarez@redhat.com>
>>
>> From [0] one can expect this column to be present in all tables.
>> [0] https://github.com/openvswitch/ovs/blob/v2.8.1/ovn/ovn-nb.xml#L19
>>
>> On Mon, Dec 4, 2017 at 2:16 PM, <lmartins@redhat.com> wrote:
>>
>> > From: Lucas Alvares Gomes <lucasagomes@gmail.com>
>> >
>> > The external_ids column is missing from the NAT and
>> > Logical_Router_Static_Route tables.
>> >
>> > Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
>> > ---
>> >  ovn/ovn-nb.ovsschema | 14 ++++++++++----
>> >  ovn/ovn-nb.xml       | 14 ++++++++++++++
>> >  2 files changed, 24 insertions(+), 4 deletions(-)
>> >
>> > diff --git a/ovn/ovn-nb.ovsschema b/ovn/ovn-nb.ovsschema
>> > index fcd878cf2..081ddb54c 100644
>> > --- a/ovn/ovn-nb.ovsschema
>> > +++ b/ovn/ovn-nb.ovsschema
>> > @@ -1,7 +1,7 @@
>> >  {
>> >      "name": "OVN_Northbound",
>> > -    "version": "5.8.1",
>> > -    "cksum": "607160660 16929",
>> > +    "version": "5.9.0",
>> > +    "cksum": "1120419033 17249",
>> >      "tables": {
>> >          "NB_Global": {
>> >              "columns": {
>> > @@ -238,7 +238,10 @@
>> >                                                               "dst-ip"]]},
>> >                                      "min": 0, "max": 1}},
>> >                  "nexthop": {"type": "string"},
>> > -                "output_port": {"type": {"key": "string", "min": 0,
>> > "max": 1}}},
>> > +                "output_port": {"type": {"key": "string", "min": 0,
>> > "max": 1}},
>> > +                "external_ids": {
>> > +                    "type": {"key": "string", "value": "string",
>> > +                             "min": 0, "max": "unlimited"}}},
>> >              "isRoot": false},
>> >          "NAT": {
>> >              "columns": {
>> > @@ -252,7 +255,10 @@
>> >                                             "enum": ["set", ["dnat",
>> >                                                               "snat",
>> >
>> > "dnat_and_snat"
>> > -                                                               ]]}}}},
>> > +                                                               ]]}}},
>> > +                "external_ids": {
>> > +                    "type": {"key": "string", "value": "string",
>> > +                             "min": 0, "max": "unlimited"}}},
>> >              "isRoot": false},
>> >          "DHCP_Options": {
>> >              "columns": {
>> > diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml
>> > index 1091c05ce..4e3899f28 100644
>> > --- a/ovn/ovn-nb.xml
>> > +++ b/ovn/ovn-nb.xml
>> > @@ -1540,6 +1540,13 @@
>> >          address as the one via which the <ref column="nexthop"/> is
>> > reachable.
>> >        </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">
>> > @@ -1618,6 +1625,13 @@
>> >          port instance on the <code>redirect-chassis</code>.
>> >        </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="DHCP_Options" title="DHCP options">
>> > --
>> > 2.15.1
>> >
>> > _______________________________________________
>> > dev mailing list
>> > dev@openvswitch.org
>> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>> >
>> _______________________________________________
>> dev mailing list
>> dev@openvswitch.org
>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Ben Pfaff Dec. 5, 2017, 7:20 p.m. UTC | #5 
I don't object to #2.

On Tue, Dec 05, 2017 at 01:44:25PM -0500, Russell Bryant wrote:
> Lucas asked me about backporting this one, as OpenStack would start
> making use of it with an OVS 2.8 update if available.
> 
> The schema change seems pretty harmless.  The catch is that this also
> updated the schema version number from "5.8.1" to "5.8.2", while
> branch-2.8 has "5.8.0".  master includes a change that introduced a
> new feature, along with the "5.8.1" update, that we would not
> backport.
> 
> The main choices seem to be ...
> 
> 1) Don't backport.
> 
> 2) Backport, but leave the schema version number unchanged in branch-2.8.
> 
> Does anyone see a problem with option #2?  It's easy enough to
> determine if the new columns are present, even without the version
> number bump.
> 
> On Mon, Dec 4, 2017 at 2:11 PM, Ben Pfaff <blp@ovn.org> wrote:
> > Applied, thanks.
> >
> > On Mon, Dec 04, 2017 at 03:06:39PM +0100, Daniel Alvarez Sanchez wrote:
> >> Acked-by: Daniel Alvarez <dalvarez@redhat.com>
> >>
> >> From [0] one can expect this column to be present in all tables.
> >> [0] https://github.com/openvswitch/ovs/blob/v2.8.1/ovn/ovn-nb.xml#L19
> >>
> >> On Mon, Dec 4, 2017 at 2:16 PM, <lmartins@redhat.com> wrote:
> >>
> >> > From: Lucas Alvares Gomes <lucasagomes@gmail.com>
> >> >
> >> > The external_ids column is missing from the NAT and
> >> > Logical_Router_Static_Route tables.
> >> >
> >> > Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
> >> > ---
> >> >  ovn/ovn-nb.ovsschema | 14 ++++++++++----
> >> >  ovn/ovn-nb.xml       | 14 ++++++++++++++
> >> >  2 files changed, 24 insertions(+), 4 deletions(-)
> >> >
> >> > diff --git a/ovn/ovn-nb.ovsschema b/ovn/ovn-nb.ovsschema
> >> > index fcd878cf2..081ddb54c 100644
> >> > --- a/ovn/ovn-nb.ovsschema
> >> > +++ b/ovn/ovn-nb.ovsschema
> >> > @@ -1,7 +1,7 @@
> >> >  {
> >> >      "name": "OVN_Northbound",
> >> > -    "version": "5.8.1",
> >> > -    "cksum": "607160660 16929",
> >> > +    "version": "5.9.0",
> >> > +    "cksum": "1120419033 17249",
> >> >      "tables": {
> >> >          "NB_Global": {
> >> >              "columns": {
> >> > @@ -238,7 +238,10 @@
> >> >                                                               "dst-ip"]]},
> >> >                                      "min": 0, "max": 1}},
> >> >                  "nexthop": {"type": "string"},
> >> > -                "output_port": {"type": {"key": "string", "min": 0,
> >> > "max": 1}}},
> >> > +                "output_port": {"type": {"key": "string", "min": 0,
> >> > "max": 1}},
> >> > +                "external_ids": {
> >> > +                    "type": {"key": "string", "value": "string",
> >> > +                             "min": 0, "max": "unlimited"}}},
> >> >              "isRoot": false},
> >> >          "NAT": {
> >> >              "columns": {
> >> > @@ -252,7 +255,10 @@
> >> >                                             "enum": ["set", ["dnat",
> >> >                                                               "snat",
> >> >
> >> > "dnat_and_snat"
> >> > -                                                               ]]}}}},
> >> > +                                                               ]]}}},
> >> > +                "external_ids": {
> >> > +                    "type": {"key": "string", "value": "string",
> >> > +                             "min": 0, "max": "unlimited"}}},
> >> >              "isRoot": false},
> >> >          "DHCP_Options": {
> >> >              "columns": {
> >> > diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml
> >> > index 1091c05ce..4e3899f28 100644
> >> > --- a/ovn/ovn-nb.xml
> >> > +++ b/ovn/ovn-nb.xml
> >> > @@ -1540,6 +1540,13 @@
> >> >          address as the one via which the <ref column="nexthop"/> is
> >> > reachable.
> >> >        </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">
> >> > @@ -1618,6 +1625,13 @@
> >> >          port instance on the <code>redirect-chassis</code>.
> >> >        </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="DHCP_Options" title="DHCP options">
> >> > --
> >> > 2.15.1
> >> >
> >> > _______________________________________________
> >> > dev mailing list
> >> > dev@openvswitch.org
> >> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> >> >
> >> _______________________________________________
> >> dev mailing list
> >> dev@openvswitch.org
> >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> 
> 
> 
> -- 
> Russell Bryant
Lucas Martins Dec. 6, 2017, 9:45 a.m. UTC | #6 
Hi,

Thanks a lot Russell and Ben for this email. Having this change in the
2.8 will make certain things *a lot* easier in networking-ovn.

I will go ahead and propose a patch for the 2.8 branch then.

Cheers,
Lucas

On Tue, Dec 5, 2017 at 7:20 PM, Ben Pfaff <blp@ovn.org> wrote:
> I don't object to #2.
>
> On Tue, Dec 05, 2017 at 01:44:25PM -0500, Russell Bryant wrote:
>> Lucas asked me about backporting this one, as OpenStack would start
>> making use of it with an OVS 2.8 update if available.
>>
>> The schema change seems pretty harmless.  The catch is that this also
>> updated the schema version number from "5.8.1" to "5.8.2", while
>> branch-2.8 has "5.8.0".  master includes a change that introduced a
>> new feature, along with the "5.8.1" update, that we would not
>> backport.
>>
>> The main choices seem to be ...
>>
>> 1) Don't backport.
>>
>> 2) Backport, but leave the schema version number unchanged in branch-2.8.
>>
>> Does anyone see a problem with option #2?  It's easy enough to
>> determine if the new columns are present, even without the version
>> number bump.
>>
>> On Mon, Dec 4, 2017 at 2:11 PM, Ben Pfaff <blp@ovn.org> wrote:
>> > Applied, thanks.
>> >
>> > On Mon, Dec 04, 2017 at 03:06:39PM +0100, Daniel Alvarez Sanchez wrote:
>> >> Acked-by: Daniel Alvarez <dalvarez@redhat.com>
>> >>
>> >> From [0] one can expect this column to be present in all tables.
>> >> [0] https://github.com/openvswitch/ovs/blob/v2.8.1/ovn/ovn-nb.xml#L19
>> >>
>> >> On Mon, Dec 4, 2017 at 2:16 PM, <lmartins@redhat.com> wrote:
>> >>
>> >> > From: Lucas Alvares Gomes <lucasagomes@gmail.com>
>> >> >
>> >> > The external_ids column is missing from the NAT and
>> >> > Logical_Router_Static_Route tables.
>> >> >
>> >> > Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
>> >> > ---
>> >> >  ovn/ovn-nb.ovsschema | 14 ++++++++++----
>> >> >  ovn/ovn-nb.xml       | 14 ++++++++++++++
>> >> >  2 files changed, 24 insertions(+), 4 deletions(-)
>> >> >
>> >> > diff --git a/ovn/ovn-nb.ovsschema b/ovn/ovn-nb.ovsschema
>> >> > index fcd878cf2..081ddb54c 100644
>> >> > --- a/ovn/ovn-nb.ovsschema
>> >> > +++ b/ovn/ovn-nb.ovsschema
>> >> > @@ -1,7 +1,7 @@
>> >> >  {
>> >> >      "name": "OVN_Northbound",
>> >> > -    "version": "5.8.1",
>> >> > -    "cksum": "607160660 16929",
>> >> > +    "version": "5.9.0",
>> >> > +    "cksum": "1120419033 17249",
>> >> >      "tables": {
>> >> >          "NB_Global": {
>> >> >              "columns": {
>> >> > @@ -238,7 +238,10 @@
>> >> >                                                               "dst-ip"]]},
>> >> >                                      "min": 0, "max": 1}},
>> >> >                  "nexthop": {"type": "string"},
>> >> > -                "output_port": {"type": {"key": "string", "min": 0,
>> >> > "max": 1}}},
>> >> > +                "output_port": {"type": {"key": "string", "min": 0,
>> >> > "max": 1}},
>> >> > +                "external_ids": {
>> >> > +                    "type": {"key": "string", "value": "string",
>> >> > +                             "min": 0, "max": "unlimited"}}},
>> >> >              "isRoot": false},
>> >> >          "NAT": {
>> >> >              "columns": {
>> >> > @@ -252,7 +255,10 @@
>> >> >                                             "enum": ["set", ["dnat",
>> >> >                                                               "snat",
>> >> >
>> >> > "dnat_and_snat"
>> >> > -                                                               ]]}}}},
>> >> > +                                                               ]]}}},
>> >> > +                "external_ids": {
>> >> > +                    "type": {"key": "string", "value": "string",
>> >> > +                             "min": 0, "max": "unlimited"}}},
>> >> >              "isRoot": false},
>> >> >          "DHCP_Options": {
>> >> >              "columns": {
>> >> > diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml
>> >> > index 1091c05ce..4e3899f28 100644
>> >> > --- a/ovn/ovn-nb.xml
>> >> > +++ b/ovn/ovn-nb.xml
>> >> > @@ -1540,6 +1540,13 @@
>> >> >          address as the one via which the <ref column="nexthop"/> is
>> >> > reachable.
>> >> >        </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">
>> >> > @@ -1618,6 +1625,13 @@
>> >> >          port instance on the <code>redirect-chassis</code>.
>> >> >        </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="DHCP_Options" title="DHCP options">
>> >> > --
>> >> > 2.15.1
>> >> >
>> >> > _______________________________________________
>> >> > dev mailing list
>> >> > dev@openvswitch.org
>> >> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>> >> >
>> >> _______________________________________________
>> >> dev mailing list
>> >> dev@openvswitch.org
>> >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>> > _______________________________________________
>> > dev mailing list
>> > dev@openvswitch.org
>> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>>
>>
>>
>> --
>> Russell Bryant
diff mbox series

Patch

diff --git a/ovn/ovn-nb.ovsschema b/ovn/ovn-nb.ovsschema
index fcd878cf2..081ddb54c 100644
--- a/ovn/ovn-nb.ovsschema
+++ b/ovn/ovn-nb.ovsschema
@@ -1,7 +1,7 @@ 
 {
     "name": "OVN_Northbound",
-    "version": "5.8.1",
-    "cksum": "607160660 16929",
+    "version": "5.9.0",
+    "cksum": "1120419033 17249",
     "tables": {
         "NB_Global": {
             "columns": {
@@ -238,7 +238,10 @@ 
                                                              "dst-ip"]]},
                                     "min": 0, "max": 1}},
                 "nexthop": {"type": "string"},
-                "output_port": {"type": {"key": "string", "min": 0, "max": 1}}},
+                "output_port": {"type": {"key": "string", "min": 0, "max": 1}},
+                "external_ids": {
+                    "type": {"key": "string", "value": "string",
+                             "min": 0, "max": "unlimited"}}},
             "isRoot": false},
         "NAT": {
             "columns": {
@@ -252,7 +255,10 @@ 
                                            "enum": ["set", ["dnat",
                                                              "snat",
                                                              "dnat_and_snat"
-                                                               ]]}}}},
+                                                               ]]}}},
+                "external_ids": {
+                    "type": {"key": "string", "value": "string",
+                             "min": 0, "max": "unlimited"}}},
             "isRoot": false},
         "DHCP_Options": {
             "columns": {
diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml
index 1091c05ce..4e3899f28 100644
--- a/ovn/ovn-nb.xml
+++ b/ovn/ovn-nb.xml
@@ -1540,6 +1540,13 @@ 
         address as the one via which the <ref column="nexthop"/> is reachable.
       </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">
@@ -1618,6 +1625,13 @@ 
         port instance on the <code>redirect-chassis</code>.
       </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="DHCP_Options" title="DHCP options">