From ea46a4e9707921fa6bfd5fcffc5da31960788ee9 Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Wed, 8 Jun 2016 17:15:02 -0700 Subject: 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 Acked-by: Ryan Moats Acked-by: Ben Pfaff --- tutorial/OVN-Tutorial.md | 32 ++++++++++++++++---------------- tutorial/ovn/env1/setup.sh | 2 +- tutorial/ovn/env2/setup.sh | 4 ++-- tutorial/ovn/env3/setup.sh | 2 +- tutorial/ovn/env4/setup2.sh | 2 +- tutorial/ovn/env5/setup.sh | 16 ++++++++-------- tutorial/ovn/env6/setup.sh | 2 +- tutorial/ovn/env7/add-container-ports.sh | 2 +- tutorial/ovn/env7/setup.sh | 2 +- 9 files changed, 32 insertions(+), 32 deletions(-) (limited to 'tutorial') diff --git a/tutorial/OVN-Tutorial.md b/tutorial/OVN-Tutorial.md index 41e9456e6..c4bcbae42 100644 --- a/tutorial/OVN-Tutorial.md +++ b/tutorial/OVN-Tutorial.md @@ -64,7 +64,7 @@ Start by running the setup script for this environment. You can use the `ovn-nbctl` utility to see an overview of the logical topology. $ ovn-nbctl show - lswitch 78687d53-e037-4555-bcd3-f4f8eaf3f2aa (sw0) + switch 78687d53-e037-4555-bcd3-f4f8eaf3f2aa (sw0) port sw0-port1 addresses: 00:00:00:00:00:01 port sw0-port2 @@ -237,12 +237,12 @@ switch. View the logical topology with `ovn-nbctl`. $ ovn-nbctl show - lswitch e3190dc2-89d1-44ed-9308-e7077de782b3 (sw0) + switch e3190dc2-89d1-44ed-9308-e7077de782b3 (sw0) port sw0-port1 addresses: 00:00:00:00:00:01 port sw0-port2 addresses: 00:00:00:00:00:02 - lswitch c8ed4c5f-9733-43f6-93da-795b1aabacb1 (sw1) + switch c8ed4c5f-9733-43f6-93da-795b1aabacb1 (sw1) port sw1-port1 addresses: 00:00:00:00:00:03 port sw1-port2 @@ -348,7 +348,7 @@ two hypervisors with two of the logical ports bound to each hypervisor. You can start by viewing the logical topology with `ovn-nbctl`. $ ovn-nbctl show - lswitch b977dc03-79a5-41ba-9665-341a80e1abfd (sw0) + switch b977dc03-79a5-41ba-9665-341a80e1abfd (sw0) port sw0-port1 addresses: 00:00:00:00:00:01 port sw0-port2 @@ -463,22 +463,22 @@ regular VIF port and a `localnet` port. The logical topology from `ovn-nbctl` should look like this. $ ovn-nbctl show - lswitch 5a652488-cfba-4f3e-929d-00010cdfde40 (provnet1-2) + switch 5a652488-cfba-4f3e-929d-00010cdfde40 (provnet1-2) port provnet1-2-physnet1 addresses: unknown port provnet1-2-port1 addresses: 00:00:00:00:00:02 - lswitch 5829b60a-eda8-4d78-94f6-7017ff9efcf0 (provnet1-4) + switch 5829b60a-eda8-4d78-94f6-7017ff9efcf0 (provnet1-4) port provnet1-4-port1 addresses: 00:00:00:00:00:04 port provnet1-4-physnet1 addresses: unknown - lswitch 06cbbcb6-38e3-418d-a81e-634ec9b54ad6 (provnet1-1) + switch 06cbbcb6-38e3-418d-a81e-634ec9b54ad6 (provnet1-1) port provnet1-1-port1 addresses: 00:00:00:00:00:01 port provnet1-1-physnet1 addresses: unknown - lswitch 9cba3b3b-59ae-4175-95f5-b6f1cd9c2afb (provnet1-3) + switch 9cba3b3b-59ae-4175-95f5-b6f1cd9c2afb (provnet1-3) port provnet1-3-physnet1 addresses: unknown port provnet1-3-port1 @@ -616,45 +616,45 @@ ports representing connectivity to VLAN 101 of `physnet1` have the `tag` field set to `101`. $ ovn-nbctl show - lswitch 12ea93d0-694b-48e9-adef-d0ddd3ec4ac9 (provnet1-7-101) + switch 12ea93d0-694b-48e9-adef-d0ddd3ec4ac9 (provnet1-7-101) port provnet1-7-physnet1-101 parent: , tag:101 addresses: unknown port provnet1-7-101-port1 addresses: 00:00:00:00:00:07 - lswitch c9a5ce3a-15ec-48ea-a898-416013463589 (provnet1-4) + switch c9a5ce3a-15ec-48ea-a898-416013463589 (provnet1-4) port provnet1-4-port1 addresses: 00:00:00:00:00:04 port provnet1-4-physnet1 addresses: unknown - lswitch e07d4f7a-2085-4fbb-9937-d6192b79a397 (provnet1-1) + switch e07d4f7a-2085-4fbb-9937-d6192b79a397 (provnet1-1) port provnet1-1-physnet1 addresses: unknown port provnet1-1-port1 addresses: 00:00:00:00:00:01 - lswitch 6c098474-0509-4219-bc9b-eb4e28dd1aeb (provnet1-2) + switch 6c098474-0509-4219-bc9b-eb4e28dd1aeb (provnet1-2) port provnet1-2-physnet1 addresses: unknown port provnet1-2-port1 addresses: 00:00:00:00:00:02 - lswitch 723c4684-5d58-4202-b8e3-4ba99ad5ed9e (provnet1-8-101) + switch 723c4684-5d58-4202-b8e3-4ba99ad5ed9e (provnet1-8-101) port provnet1-8-101-port1 addresses: 00:00:00:00:00:08 port provnet1-8-physnet1-101 parent: , tag:101 addresses: unknown - lswitch 8444e925-ceb2-4b02-ac20-eb2e4cfb954d (provnet1-6-101) + switch 8444e925-ceb2-4b02-ac20-eb2e4cfb954d (provnet1-6-101) port provnet1-6-physnet1-101 parent: , tag:101 addresses: unknown port provnet1-6-101-port1 addresses: 00:00:00:00:00:06 - lswitch e11e5605-7c46-4395-b28d-cff57451fc7e (provnet1-3) + switch e11e5605-7c46-4395-b28d-cff57451fc7e (provnet1-3) port provnet1-3-port1 addresses: 00:00:00:00:00:03 port provnet1-3-physnet1 addresses: unknown - lswitch 0706b697-6c92-4d54-bc0a-db5bababb74a (provnet1-5-101) + switch 0706b697-6c92-4d54-bc0a-db5bababb74a (provnet1-5-101) port provnet1-5-101-port1 addresses: 00:00:00:00:00:05 port provnet1-5-physnet1-101 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 -- cgit v1.2.1