ovn-nbctl: Update logical switch commands.

    A few minor changes related to logical switch commands:

        - Use "ls" instead of "lswitch" to be more consistent with other
          command changes.
        - Use commands where possible in ovn unit tests.
        - Update references from "lswitch" to "ls" (code) or "switch" (user).

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ryan Moats <rmoats@us.ibm.com>
Acked-by: Ben Pfaff <blp@ovn.org>

8 files changed, 16 insertions, 16 deletions

diff --git a/tutorial/ovn/env1/setup.sh b/tutorial/ovn/env1/setup.sh
index a89c0091e..08496432e 100755
--- a/tutorial/ovn/env1/setup.sh
+++ b/tutorial/ovn/env1/setup.sh
@@ -20,7 +20,7 @@
 set -o xtrace
 
 # Create a logical switch named "sw0"
-ovn-nbctl lswitch-add sw0
+ovn-nbctl ls-add sw0
 
 # Create two logical ports on "sw0".
 ovn-nbctl lsp-add sw0 sw0-port1
diff --git a/tutorial/ovn/env2/setup.sh b/tutorial/ovn/env2/setup.sh
index 370882f2c..008caa1d1 100755
--- a/tutorial/ovn/env2/setup.sh
+++ b/tutorial/ovn/env2/setup.sh
@@ -15,8 +15,8 @@
 
 set -o xtrace
 
-ovn-nbctl lswitch-add sw0
-ovn-nbctl lswitch-add sw1
+ovn-nbctl ls-add sw0
+ovn-nbctl ls-add sw1
 ovn-nbctl lsp-add sw0 sw0-port1
 ovn-nbctl lsp-add sw0 sw0-port2
 ovn-nbctl lsp-add sw1 sw1-port1
diff --git a/tutorial/ovn/env3/setup.sh b/tutorial/ovn/env3/setup.sh
index fc214a7b4..3f8ef54e4 100755
--- a/tutorial/ovn/env3/setup.sh
+++ b/tutorial/ovn/env3/setup.sh
@@ -15,7 +15,7 @@
 
 set -o xtrace
 
-ovn-nbctl lswitch-add sw0
+ovn-nbctl ls-add sw0
 
 ovn-nbctl lsp-add sw0 sw0-port1
 ovn-nbctl lsp-add sw0 sw0-port2
diff --git a/tutorial/ovn/env4/setup2.sh b/tutorial/ovn/env4/setup2.sh
index 3daeff67c..234508337 100755
--- a/tutorial/ovn/env4/setup2.sh
+++ b/tutorial/ovn/env4/setup2.sh
@@ -28,7 +28,7 @@ set -o xtrace
 ovn-sbctl chassis-add fakechassis geneve 127.0.0.1
 
 for n in 1 2 3 4; do
-    ovn-nbctl lswitch-add provnet1-$n
+    ovn-nbctl ls-add provnet1-$n
 
     ovn-nbctl lsp-add provnet1-$n provnet1-$n-port1
     ovn-nbctl lsp-set-addresses provnet1-$n-port1 00:00:00:00:00:0$n
diff --git a/tutorial/ovn/env5/setup.sh b/tutorial/ovn/env5/setup.sh
index 7690aacff..a1c5a8a5d 100755
--- a/tutorial/ovn/env5/setup.sh
+++ b/tutorial/ovn/env5/setup.sh
@@ -32,24 +32,24 @@ ovn-sbctl chassis-add fakechassis geneve 127.0.0.1
 
 for n in 1 2 3 4 5 6 7 8; do
     if [ $n -gt 4 ] ; then
-        lswitch_name="provnet1-$n-101"
-        lsp_name="$lswitch_name-port1"
+        ls_name="provnet1-$n-101"
+        lsp_name="$ls_name-port1"
     else
-        lswitch_name="provnet1-$n"
+        ls_name="provnet1-$n"
     fi
-    ovn-nbctl lswitch-add $lswitch_name
+    ovn-nbctl ls-add $ls_name
 
-    lsp_name="$lswitch_name-port1"
-    ovn-nbctl lsp-add $lswitch_name $lsp_name
+    lsp_name="$ls_name-port1"
+    ovn-nbctl lsp-add $ls_name $lsp_name
     ovn-nbctl lsp-set-addresses $lsp_name 00:00:00:00:00:0$n
     ovn-nbctl lsp-set-port-security $lsp_name 00:00:00:00:00:0$n
 
     if [ $n -gt 4 ] ; then
         lsp_name="provnet1-$n-physnet1-101"
-        ovn-nbctl lsp-add $lswitch_name $lsp_name "" 101
+        ovn-nbctl lsp-add $ls_name $lsp_name "" 101
     else
         lsp_name="provnet1-$n-physnet1"
-        ovn-nbctl lsp-add $lswitch_name $lsp_name
+        ovn-nbctl lsp-add $ls_name $lsp_name
     fi
     ovn-nbctl lsp-set-addresses $lsp_name unknown
     ovn-nbctl lsp-set-type $lsp_name localnet
diff --git a/tutorial/ovn/env6/setup.sh b/tutorial/ovn/env6/setup.sh
index a89c0091e..08496432e 100755
--- a/tutorial/ovn/env6/setup.sh
+++ b/tutorial/ovn/env6/setup.sh
@@ -20,7 +20,7 @@
 set -o xtrace
 
 # Create a logical switch named "sw0"
-ovn-nbctl lswitch-add sw0
+ovn-nbctl ls-add sw0
 
 # Create two logical ports on "sw0".
 ovn-nbctl lsp-add sw0 sw0-port1
diff --git a/tutorial/ovn/env7/add-container-ports.sh b/tutorial/ovn/env7/add-container-ports.sh
index c7308492b..fc9b001f9 100755
--- a/tutorial/ovn/env7/add-container-ports.sh
+++ b/tutorial/ovn/env7/add-container-ports.sh
@@ -16,7 +16,7 @@
 set -o xtrace
 
 # create a logical switch
-ovn-nbctl lswitch-add csw0
+ovn-nbctl ls-add csw0
 
 # create a container port with parent set to sw0-port1
 ovn-nbctl lsp-add csw0 csw0-cport1 sw0-port1 42
diff --git a/tutorial/ovn/env7/setup.sh b/tutorial/ovn/env7/setup.sh
index 05fd5c59b..39acf3a6e 100755
--- a/tutorial/ovn/env7/setup.sh
+++ b/tutorial/ovn/env7/setup.sh
@@ -16,7 +16,7 @@
 set -o xtrace
 
 # Create a logical switch named "sw0"
-ovn-nbctl lswitch-add sw0
+ovn-nbctl ls-add sw0
 
 # Create two logical ports on "sw0".
 ovn-nbctl lsp-add sw0 sw0-port1