diff mbox series

[ovs-dev,v9,1/7] ovs-sandbox: Print and check results of *ctl commands.

Message ID 20201202065018.2269685-2-blp@ovn.org
State Accepted
Headers show
Series Add DDlog implementation of ovn-northd | expand

Commit Message

Ben Pfaff Dec. 2, 2020, 6:50 a.m. UTC 
Otherwise when something hangs or goes wrong, it's not obvious what
happened.

Signed-off-by: Ben Pfaff <blp@ovn.org>
---
 tutorial/ovs-sandbox | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

Comments

0-day Robot Dec. 2, 2020, 8:55 a.m. UTC | #1 
Bleep bloop.  Greetings Ben Pfaff, I am a robot and I have tried out your patch.
Thanks for your contribution.

I encountered some error that I wasn't expecting.  See the details below.


checkpatch:
WARNING: Line is 110 characters long (recommended limit is 79)
#46 FILE: tutorial/ovs-sandbox:590:
    run ovn-nbctl set-ssl $sandbox/ovnnb-privkey.pem  $sandbox/ovnnb-cert.pem $sandbox/pki/switchca/cacert.pem

WARNING: Line is 110 characters long (recommended limit is 79)
#48 FILE: tutorial/ovs-sandbox:592:
    run ovn-sbctl set-ssl $sandbox/ovnsb-privkey.pem  $sandbox/ovnsb-cert.pem $sandbox/pki/switchca/cacert.pem

Lines checked: 67, Warnings: 2, Errors: 0


Please check this out.  If you feel there has been an error, please email aconole@redhat.com

Thanks,
0-day Robot
Dumitru Ceara Dec. 11, 2020, 12:36 p.m. UTC | #2 
On 12/2/20 7:50 AM, Ben Pfaff wrote:
> Otherwise when something hangs or goes wrong, it's not obvious what
> happened.
> 
> Signed-off-by: Ben Pfaff <blp@ovn.org>
> ---

Looks good to me, thanks!

Acked-by: Dumitru Ceara <dceara@redhat.com>
Ben Pfaff Feb. 2, 2021, 12:40 a.m. UTC | #3 
On Fri, Dec 11, 2020 at 01:36:13PM +0100, Dumitru Ceara wrote:
> On 12/2/20 7:50 AM, Ben Pfaff wrote:
> > Otherwise when something hangs or goes wrong, it's not obvious what
> > happened.
> > 
> > Signed-off-by: Ben Pfaff <blp@ovn.org>
> > ---
> 
> Looks good to me, thanks!
> 
> Acked-by: Dumitru Ceara <dceara@redhat.com>
> 

Thanks.  I applied this to ovn master.
diff mbox series

Patch

diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox
index 1841776a476d..63ba1ea005d7 100755
--- a/tutorial/ovs-sandbox
+++ b/tutorial/ovs-sandbox
@@ -575,30 +575,30 @@  run ovs-vsctl --no-wait -- init
 rungdb $gdb_vswitchd $gdb_vswitchd_ex ovs-vswitchd --detach --no-chdir --pidfile -vconsole:off --log-file -vsyslog:off \
     --enable-dummy=$dummy -vvconn -vnetdev_dummy
 
-ovn-nbctl init
-ovn-sbctl init
-ovn-ic-nbctl init
-ovn-ic-sbctl init
-ovn-nbctl set NB_Global . name=az-1
+run ovn-nbctl init
+run ovn-sbctl init
+run ovn-ic-nbctl init
+run ovn-ic-sbctl init
+run ovn-nbctl set NB_Global . name=az-1
 
-ovs-vsctl set open . external-ids:system-id=chassis-1
-ovs-vsctl set open . external-ids:hostname=sandbox
-ovs-vsctl set open . external-ids:ovn-encap-type=geneve
-ovs-vsctl set open . external-ids:ovn-encap-ip=127.0.0.1
+run ovs-vsctl set open . external-ids:system-id=chassis-1
+run ovs-vsctl set open . external-ids:hostname=sandbox
+run ovs-vsctl set open . external-ids:ovn-encap-type=geneve
+run ovs-vsctl set open . external-ids:ovn-encap-ip=127.0.0.1
 
 if [ "$HAVE_OPENSSL" = yes ]; then
-    ovn-nbctl set-ssl $sandbox/ovnnb-privkey.pem  $sandbox/ovnnb-cert.pem $sandbox/pki/switchca/cacert.pem
-    ovn-nbctl set-connection pssl:6641
-    ovn-sbctl set-ssl $sandbox/ovnsb-privkey.pem  $sandbox/ovnsb-cert.pem $sandbox/pki/switchca/cacert.pem
+    run ovn-nbctl set-ssl $sandbox/ovnnb-privkey.pem  $sandbox/ovnnb-cert.pem $sandbox/pki/switchca/cacert.pem
+    run ovn-nbctl set-connection pssl:6641
+    run ovn-sbctl set-ssl $sandbox/ovnsb-privkey.pem  $sandbox/ovnsb-cert.pem $sandbox/pki/switchca/cacert.pem
     if $ovn_rbac; then
-        ovn-sbctl set-connection role=ovn-controller pssl:6642
+        run ovn-sbctl set-connection role=ovn-controller pssl:6642
     else
-        ovn-sbctl set-connection pssl:6642
+        run ovn-sbctl set-connection pssl:6642
     fi
-    ovs-vsctl set open . external-ids:ovn-remote=ssl:127.0.0.1:6642
+    run ovs-vsctl set open . external-ids:ovn-remote=ssl:127.0.0.1:6642
     OVN_CTRLR_PKI="-p $sandbox/chassis-1-privkey.pem -c $sandbox/chassis-1-cert.pem -C $sandbox/pki/switchca/cacert.pem"
 else
-    ovs-vsctl set open . external-ids:ovn-remote=$OVN_SB_DB
+    run ovs-vsctl set open . external-ids:ovn-remote=$OVN_SB_DB
     OVN_CTRLR_PKI=""
 fi
 for i in $(seq $n_ics); do