ovn-nbctl: Update logical switch port commands.

A few minor changes related to logical switch port commands:

    - Use "lsp" instead of "lport" to be more consistent with later
      changes.
    - Use commands where possible in ovn unit tests.
    - Update references from "lport" to "lsp" (code) or "port" (user).

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

9 files changed, 76 insertions, 76 deletions

diff --git a/tutorial/ovn/env1/add-third-port.sh b/tutorial/ovn/env1/add-third-port.sh
index e2faab27c..06c496923 100755
--- a/tutorial/ovn/env1/add-third-port.sh
+++ b/tutorial/ovn/env1/add-third-port.sh
@@ -15,7 +15,7 @@
 
 set -o xtrace
 
-ovn-nbctl lport-add sw0 sw0-port3
-ovn-nbctl lport-set-addresses sw0-port3 00:00:00:00:00:03
-ovn-nbctl lport-set-port-security sw0-port3 00:00:00:00:00:03
+ovn-nbctl lsp-add sw0 sw0-port3
+ovn-nbctl lsp-set-addresses sw0-port3 00:00:00:00:00:03
+ovn-nbctl lsp-set-port-security sw0-port3 00:00:00:00:00:03
 ovs-vsctl add-port br-int lport3 -- set Interface lport3 external_ids:iface-id=sw0-port3
diff --git a/tutorial/ovn/env1/setup.sh b/tutorial/ovn/env1/setup.sh
index 78657e94c..a89c0091e 100755
--- a/tutorial/ovn/env1/setup.sh
+++ b/tutorial/ovn/env1/setup.sh
@@ -23,18 +23,18 @@ set -o xtrace
 ovn-nbctl lswitch-add sw0
 
 # Create two logical ports on "sw0".
-ovn-nbctl lport-add sw0 sw0-port1
-ovn-nbctl lport-add sw0 sw0-port2
+ovn-nbctl lsp-add sw0 sw0-port1
+ovn-nbctl lsp-add sw0 sw0-port2
 
 # Set a MAC address for each of the two logical ports.
-ovn-nbctl lport-set-addresses sw0-port1 00:00:00:00:00:01
-ovn-nbctl lport-set-addresses sw0-port2 00:00:00:00:00:02
+ovn-nbctl lsp-set-addresses sw0-port1 00:00:00:00:00:01
+ovn-nbctl lsp-set-addresses sw0-port2 00:00:00:00:00:02
 
 # Set up port security for the two logical ports.  This ensures that
 # the logical port mac address we have configured is the only allowed
 # source and destination mac address for these ports.
-ovn-nbctl lport-set-port-security sw0-port1 00:00:00:00:00:01
-ovn-nbctl lport-set-port-security sw0-port2 00:00:00:00:00:02
+ovn-nbctl lsp-set-port-security sw0-port1 00:00:00:00:00:01
+ovn-nbctl lsp-set-port-security sw0-port2 00:00:00:00:00:02
 
 # Create ports on the local OVS bridge, br-int.  When ovn-controller
 # sees these ports show up with an "iface-id" that matches the OVN
diff --git a/tutorial/ovn/env2/setup.sh b/tutorial/ovn/env2/setup.sh
index 4b8df762e..370882f2c 100755
--- a/tutorial/ovn/env2/setup.sh
+++ b/tutorial/ovn/env2/setup.sh
@@ -17,18 +17,18 @@ set -o xtrace
 
 ovn-nbctl lswitch-add sw0
 ovn-nbctl lswitch-add sw1
-ovn-nbctl lport-add sw0 sw0-port1 
-ovn-nbctl lport-add sw0 sw0-port2 
-ovn-nbctl lport-add sw1 sw1-port1 
-ovn-nbctl lport-add sw1 sw1-port2 
-ovn-nbctl lport-set-addresses sw0-port1 00:00:00:00:00:01
-ovn-nbctl lport-set-addresses sw0-port2 00:00:00:00:00:02
-ovn-nbctl lport-set-addresses sw1-port1 00:00:00:00:00:03
-ovn-nbctl lport-set-addresses sw1-port2 00:00:00:00:00:04
-ovn-nbctl lport-set-port-security sw0-port1 00:00:00:00:00:01
-ovn-nbctl lport-set-port-security sw0-port2 00:00:00:00:00:02
-ovn-nbctl lport-set-port-security sw1-port1 00:00:00:00:00:03
-ovn-nbctl lport-set-port-security sw1-port2 00:00:00:00:00:04
+ovn-nbctl lsp-add sw0 sw0-port1
+ovn-nbctl lsp-add sw0 sw0-port2
+ovn-nbctl lsp-add sw1 sw1-port1
+ovn-nbctl lsp-add sw1 sw1-port2
+ovn-nbctl lsp-set-addresses sw0-port1 00:00:00:00:00:01
+ovn-nbctl lsp-set-addresses sw0-port2 00:00:00:00:00:02
+ovn-nbctl lsp-set-addresses sw1-port1 00:00:00:00:00:03
+ovn-nbctl lsp-set-addresses sw1-port2 00:00:00:00:00:04
+ovn-nbctl lsp-set-port-security sw0-port1 00:00:00:00:00:01
+ovn-nbctl lsp-set-port-security sw0-port2 00:00:00:00:00:02
+ovn-nbctl lsp-set-port-security sw1-port1 00:00:00:00:00:03
+ovn-nbctl lsp-set-port-security sw1-port2 00:00:00:00:00:04
 
 ovs-vsctl add-port br-int lport1 -- set Interface lport1 external_ids:iface-id=sw0-port1
 ovs-vsctl add-port br-int lport2 -- set Interface lport2 external_ids:iface-id=sw0-port2
diff --git a/tutorial/ovn/env3/setup.sh b/tutorial/ovn/env3/setup.sh
index 7a7f0a6e2..fc214a7b4 100755
--- a/tutorial/ovn/env3/setup.sh
+++ b/tutorial/ovn/env3/setup.sh
@@ -17,20 +17,20 @@ set -o xtrace
 
 ovn-nbctl lswitch-add sw0
 
-ovn-nbctl lport-add sw0 sw0-port1
-ovn-nbctl lport-add sw0 sw0-port2
-ovn-nbctl lport-add sw0 sw0-port3
-ovn-nbctl lport-add sw0 sw0-port4
-
-ovn-nbctl lport-set-addresses sw0-port1 00:00:00:00:00:01
-ovn-nbctl lport-set-addresses sw0-port2 00:00:00:00:00:02
-ovn-nbctl lport-set-addresses sw0-port3 00:00:00:00:00:03
-ovn-nbctl lport-set-addresses sw0-port4 00:00:00:00:00:04
-
-ovn-nbctl lport-set-port-security sw0-port1 00:00:00:00:00:01
-ovn-nbctl lport-set-port-security sw0-port2 00:00:00:00:00:02
-ovn-nbctl lport-set-port-security sw0-port3 00:00:00:00:00:03
-ovn-nbctl lport-set-port-security sw0-port4 00:00:00:00:00:04
+ovn-nbctl lsp-add sw0 sw0-port1
+ovn-nbctl lsp-add sw0 sw0-port2
+ovn-nbctl lsp-add sw0 sw0-port3
+ovn-nbctl lsp-add sw0 sw0-port4
+
+ovn-nbctl lsp-set-addresses sw0-port1 00:00:00:00:00:01
+ovn-nbctl lsp-set-addresses sw0-port2 00:00:00:00:00:02
+ovn-nbctl lsp-set-addresses sw0-port3 00:00:00:00:00:03
+ovn-nbctl lsp-set-addresses sw0-port4 00:00:00:00:00:04
+
+ovn-nbctl lsp-set-port-security sw0-port1 00:00:00:00:00:01
+ovn-nbctl lsp-set-port-security sw0-port2 00:00:00:00:00:02
+ovn-nbctl lsp-set-port-security sw0-port3 00:00:00:00:00:03
+ovn-nbctl lsp-set-port-security sw0-port4 00:00:00:00:00:04
 
 # Bind sw0-port1 and sw0-port2 to the local chassis
 ovs-vsctl add-port br-int lport1 -- set Interface lport1 external_ids:iface-id=sw0-port1
diff --git a/tutorial/ovn/env4/setup2.sh b/tutorial/ovn/env4/setup2.sh
index 361ec99f4..3daeff67c 100755
--- a/tutorial/ovn/env4/setup2.sh
+++ b/tutorial/ovn/env4/setup2.sh
@@ -30,14 +30,14 @@ 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 lport-add provnet1-$n provnet1-$n-port1
-    ovn-nbctl lport-set-addresses provnet1-$n-port1 00:00:00:00:00:0$n
-    ovn-nbctl lport-set-port-security provnet1-$n-port1 00:00:00:00:00:0$n
-
-    ovn-nbctl lport-add provnet1-$n provnet1-$n-physnet1
-    ovn-nbctl lport-set-addresses provnet1-$n-physnet1 unknown
-    ovn-nbctl lport-set-type provnet1-$n-physnet1 localnet
-    ovn-nbctl lport-set-options provnet1-$n-physnet1 network_name=physnet1
+    ovn-nbctl lsp-add provnet1-$n provnet1-$n-port1
+    ovn-nbctl lsp-set-addresses provnet1-$n-port1 00:00:00:00:00:0$n
+    ovn-nbctl lsp-set-port-security provnet1-$n-port1 00:00:00:00:00:0$n
+
+    ovn-nbctl lsp-add provnet1-$n provnet1-$n-physnet1
+    ovn-nbctl lsp-set-addresses provnet1-$n-physnet1 unknown
+    ovn-nbctl lsp-set-type provnet1-$n-physnet1 localnet
+    ovn-nbctl lsp-set-options provnet1-$n-physnet1 network_name=physnet1
 done
 
 ovs-vsctl add-port br-int lport1 -- set Interface lport1 external_ids:iface-id=provnet1-1-port1
diff --git a/tutorial/ovn/env5/setup.sh b/tutorial/ovn/env5/setup.sh
index f73a52df0..7690aacff 100755
--- a/tutorial/ovn/env5/setup.sh
+++ b/tutorial/ovn/env5/setup.sh
@@ -33,27 +33,27 @@ 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"
-        lport_name="$lswitch_name-port1"
+        lsp_name="$lswitch_name-port1"
     else
         lswitch_name="provnet1-$n"
     fi
     ovn-nbctl lswitch-add $lswitch_name
 
-    lport_name="$lswitch_name-port1"
-    ovn-nbctl lport-add $lswitch_name $lport_name
-    ovn-nbctl lport-set-addresses $lport_name 00:00:00:00:00:0$n
-    ovn-nbctl lport-set-port-security $lport_name 00:00:00:00:00:0$n
+    lsp_name="$lswitch_name-port1"
+    ovn-nbctl lsp-add $lswitch_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
-        lport_name="provnet1-$n-physnet1-101"
-        ovn-nbctl lport-add $lswitch_name $lport_name "" 101
+        lsp_name="provnet1-$n-physnet1-101"
+        ovn-nbctl lsp-add $lswitch_name $lsp_name "" 101
     else
-        lport_name="provnet1-$n-physnet1"
-        ovn-nbctl lport-add $lswitch_name $lport_name
+        lsp_name="provnet1-$n-physnet1"
+        ovn-nbctl lsp-add $lswitch_name $lsp_name
     fi
-    ovn-nbctl lport-set-addresses $lport_name unknown
-    ovn-nbctl lport-set-type $lport_name localnet
-    ovn-nbctl lport-set-options $lport_name network_name=physnet1
+    ovn-nbctl lsp-set-addresses $lsp_name unknown
+    ovn-nbctl lsp-set-type $lsp_name localnet
+    ovn-nbctl lsp-set-options $lsp_name network_name=physnet1
 done
 
 ovs-vsctl add-port br-int lport1 -- set Interface lport1 external_ids:iface-id=provnet1-1-port1
diff --git a/tutorial/ovn/env6/setup.sh b/tutorial/ovn/env6/setup.sh
index 78657e94c..a89c0091e 100755
--- a/tutorial/ovn/env6/setup.sh
+++ b/tutorial/ovn/env6/setup.sh
@@ -23,18 +23,18 @@ set -o xtrace
 ovn-nbctl lswitch-add sw0
 
 # Create two logical ports on "sw0".
-ovn-nbctl lport-add sw0 sw0-port1
-ovn-nbctl lport-add sw0 sw0-port2
+ovn-nbctl lsp-add sw0 sw0-port1
+ovn-nbctl lsp-add sw0 sw0-port2
 
 # Set a MAC address for each of the two logical ports.
-ovn-nbctl lport-set-addresses sw0-port1 00:00:00:00:00:01
-ovn-nbctl lport-set-addresses sw0-port2 00:00:00:00:00:02
+ovn-nbctl lsp-set-addresses sw0-port1 00:00:00:00:00:01
+ovn-nbctl lsp-set-addresses sw0-port2 00:00:00:00:00:02
 
 # Set up port security for the two logical ports.  This ensures that
 # the logical port mac address we have configured is the only allowed
 # source and destination mac address for these ports.
-ovn-nbctl lport-set-port-security sw0-port1 00:00:00:00:00:01
-ovn-nbctl lport-set-port-security sw0-port2 00:00:00:00:00:02
+ovn-nbctl lsp-set-port-security sw0-port1 00:00:00:00:00:01
+ovn-nbctl lsp-set-port-security sw0-port2 00:00:00:00:00:02
 
 # Create ports on the local OVS bridge, br-int.  When ovn-controller
 # sees these ports show up with an "iface-id" that matches the OVN
diff --git a/tutorial/ovn/env7/add-container-ports.sh b/tutorial/ovn/env7/add-container-ports.sh
index 482c969cb..c7308492b 100755
--- a/tutorial/ovn/env7/add-container-ports.sh
+++ b/tutorial/ovn/env7/add-container-ports.sh
@@ -19,14 +19,14 @@ set -o xtrace
 ovn-nbctl lswitch-add csw0
 
 # create a container port with parent set to sw0-port1
-ovn-nbctl lport-add csw0 csw0-cport1 sw0-port1 42
-ovn-nbctl lport-set-addresses csw0-cport1 00:00:00:00:01:01
-ovn-nbctl lport-set-port-security csw0-cport1 00:00:00:00:01:01
+ovn-nbctl lsp-add csw0 csw0-cport1 sw0-port1 42
+ovn-nbctl lsp-set-addresses csw0-cport1 00:00:00:00:01:01
+ovn-nbctl lsp-set-port-security csw0-cport1 00:00:00:00:01:01
 
 # create another container port with parent set to sw0-port1
-ovn-nbctl lport-add csw0 csw0-cport2 sw0-port2 43
-ovn-nbctl lport-set-addresses csw0-cport2 00:00:00:00:01:02
-ovn-nbctl lport-set-port-security csw0-cport2 00:00:00:00:01:02
+ovn-nbctl lsp-add csw0 csw0-cport2 sw0-port2 43
+ovn-nbctl lsp-set-addresses csw0-cport2 00:00:00:00:01:02
+ovn-nbctl lsp-set-port-security csw0-cport2 00:00:00:00:01:02
 
 
 # Make lport1 as a patch port, other end connected to br-vmport1
diff --git a/tutorial/ovn/env7/setup.sh b/tutorial/ovn/env7/setup.sh
index 2df0f0ea3..05fd5c59b 100755
--- a/tutorial/ovn/env7/setup.sh
+++ b/tutorial/ovn/env7/setup.sh
@@ -19,17 +19,17 @@ set -o xtrace
 ovn-nbctl lswitch-add sw0
 
 # Create two logical ports on "sw0".
-ovn-nbctl lport-add sw0 sw0-port1
-ovn-nbctl lport-add sw0 sw0-port2
-ovn-nbctl lport-add sw0 sw0-port3
+ovn-nbctl lsp-add sw0 sw0-port1
+ovn-nbctl lsp-add sw0 sw0-port2
+ovn-nbctl lsp-add sw0 sw0-port3
 
-ovn-nbctl lport-set-addresses sw0-port1 00:00:00:00:00:01
-ovn-nbctl lport-set-addresses sw0-port2 00:00:00:00:00:02
-ovn-nbctl lport-set-addresses sw0-port3 00:00:00:00:00:03
+ovn-nbctl lsp-set-addresses sw0-port1 00:00:00:00:00:01
+ovn-nbctl lsp-set-addresses sw0-port2 00:00:00:00:00:02
+ovn-nbctl lsp-set-addresses sw0-port3 00:00:00:00:00:03
 
-ovn-nbctl lport-set-port-security sw0-port1 00:00:00:00:00:01
-ovn-nbctl lport-set-port-security sw0-port2 00:00:00:00:00:02
-ovn-nbctl lport-set-port-security sw0-port3 00:00:00:00:00:03
+ovn-nbctl lsp-set-port-security sw0-port1 00:00:00:00:00:01
+ovn-nbctl lsp-set-port-security sw0-port2 00:00:00:00:00:02
+ovn-nbctl lsp-set-port-security sw0-port3 00:00:00:00:00:03
 
 ovs-vsctl add-port br-int lport1 -- set Interface lport1 external_ids:iface-id=sw0-port1
 ovs-vsctl add-port br-int lport2 -- set Interface lport2 external_ids:iface-id=sw0-port2