diff mbox series

[ovs-dev] ovs-sandbox: Convert initial databases if needed.

Message ID 20220126141702.10779-1-dceara@redhat.com
State Accepted
Headers show
Series [ovs-dev] ovs-sandbox: Convert initial databases if needed. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/github-robot-_ovn-kubernetes success github build: passed

Commit Message

Dumitru Ceara Jan. 26, 2022, 2:17 p.m. UTC
The --nbdb-source and --sbdb-source options allow users to point the
sandbox daemons to already existing database files.  It's useful if
these are first converted to use the currently supported schema.

Signed-off-by: Dumitru Ceara <dceara@redhat.com>
---
 tutorial/ovs-sandbox | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Comments

Mark Michelson Feb. 4, 2022, 7:33 p.m. UTC | #1
Acked-by: Mark Michelson <mmichels@redhat.com>

On 1/26/22 09:17, Dumitru Ceara wrote:
> The --nbdb-source and --sbdb-source options allow users to point the
> sandbox daemons to already existing database files.  It's useful if
> these are first converted to use the currently supported schema.
> 
> Signed-off-by: Dumitru Ceara <dceara@redhat.com>
> ---
>   tutorial/ovs-sandbox | 12 ++++++++++--
>   1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox
> index d679cd39b..d81e00496 100755
> --- a/tutorial/ovs-sandbox
> +++ b/tutorial/ovs-sandbox
> @@ -542,7 +542,11 @@ ovn_start_db() {
>       case $model in
>           standalone)
>               case $source_type in
> -                database) run cp "$source" ${db}1.db ;;
> +                database)
> +                    run cp "$source" ${db}1.db
> +                    run ovsdb-tool convert ${db}1.db \
> +                        $srcdir/ovn-${db}.ovsschema
> +                ;;
>                   schema) run ovsdb-tool create ${db}1.db "$source" ;;
>               esac
>               ovn_start_ovsdb_server 1
> @@ -551,7 +555,11 @@ ovn_start_db() {
>           backup)
>               for i in 1 2; do
>                   case $source_type in
> -                    database) run cp "$source" $db$i.db ;;
> +                    database)
> +                        run cp "$source" $db$i.db
> +                        run ovsdb-tool convert $db$i.db \
> +                            $srcdir/ovn-${db}.ovsschema
> +                    ;;
>                       schema) run ovsdb-tool create $db$i.db "$source" ;;
>                   esac
>               done
>
Numan Siddique Feb. 10, 2022, 11:40 p.m. UTC | #2
On Fri, Feb 4, 2022 at 2:34 PM Mark Michelson <mmichels@redhat.com> wrote:
>
> Acked-by: Mark Michelson <mmichels@redhat.com>

Thanks.  Applied to the main branch.

Numan

>
> On 1/26/22 09:17, Dumitru Ceara wrote:
> > The --nbdb-source and --sbdb-source options allow users to point the
> > sandbox daemons to already existing database files.  It's useful if
> > these are first converted to use the currently supported schema.
> >
> > Signed-off-by: Dumitru Ceara <dceara@redhat.com>
> > ---
> >   tutorial/ovs-sandbox | 12 ++++++++++--
> >   1 file changed, 10 insertions(+), 2 deletions(-)
> >
> > diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox
> > index d679cd39b..d81e00496 100755
> > --- a/tutorial/ovs-sandbox
> > +++ b/tutorial/ovs-sandbox
> > @@ -542,7 +542,11 @@ ovn_start_db() {
> >       case $model in
> >           standalone)
> >               case $source_type in
> > -                database) run cp "$source" ${db}1.db ;;
> > +                database)
> > +                    run cp "$source" ${db}1.db
> > +                    run ovsdb-tool convert ${db}1.db \
> > +                        $srcdir/ovn-${db}.ovsschema
> > +                ;;
> >                   schema) run ovsdb-tool create ${db}1.db "$source" ;;
> >               esac
> >               ovn_start_ovsdb_server 1
> > @@ -551,7 +555,11 @@ ovn_start_db() {
> >           backup)
> >               for i in 1 2; do
> >                   case $source_type in
> > -                    database) run cp "$source" $db$i.db ;;
> > +                    database)
> > +                        run cp "$source" $db$i.db
> > +                        run ovsdb-tool convert $db$i.db \
> > +                            $srcdir/ovn-${db}.ovsschema
> > +                    ;;
> >                       schema) run ovsdb-tool create $db$i.db "$source" ;;
> >                   esac
> >               done
> >
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
diff mbox series

Patch

diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox
index d679cd39b..d81e00496 100755
--- a/tutorial/ovs-sandbox
+++ b/tutorial/ovs-sandbox
@@ -542,7 +542,11 @@  ovn_start_db() {
     case $model in
         standalone)
             case $source_type in
-                database) run cp "$source" ${db}1.db ;;
+                database)
+                    run cp "$source" ${db}1.db
+                    run ovsdb-tool convert ${db}1.db \
+                        $srcdir/ovn-${db}.ovsschema
+                ;;
                 schema) run ovsdb-tool create ${db}1.db "$source" ;;
             esac
             ovn_start_ovsdb_server 1
@@ -551,7 +555,11 @@  ovn_start_db() {
         backup)
             for i in 1 2; do
                 case $source_type in
-                    database) run cp "$source" $db$i.db ;;
+                    database)
+                        run cp "$source" $db$i.db
+                        run ovsdb-tool convert $db$i.db \
+                            $srcdir/ovn-${db}.ovsschema
+                    ;;
                     schema) run ovsdb-tool create $db$i.db "$source" ;;
                 esac
             done