ovn-nb: Rename Port_Bindings 'macs' column to 'addresses'.

In an upcoming commit this column will also support IP+MAC pairs.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Justin Pettit <jpettit@nicira.com>

7 files changed, 49 insertions, 49 deletions

diff --git a/tutorial/OVN-Tutorial.md b/tutorial/OVN-Tutorial.md
index 5f8382850..4fc06eb47 100644
--- a/tutorial/OVN-Tutorial.md
+++ b/tutorial/OVN-Tutorial.md
@@ -54,9 +54,9 @@ 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)
         lport sw0-port1
-            macs: 00:00:00:00:00:01
+            addresses: 00:00:00:00:00:01
         lport sw0-port2
-            macs: 00:00:00:00:00:02
+            addresses: 00:00:00:00:00:02
 
 The `ovn-sbctl` utility can be used to see into the state stored in the
 `OVN_Southbound` database.  The `show` command shows that there is a single
@@ -193,14 +193,14 @@ View the logical topology with `ovn-nbctl`.
     $ ovn-nbctl show
     lswitch e3190dc2-89d1-44ed-9308-e7077de782b3 (sw0)
         lport sw0-port1
-            macs: 00:00:00:00:00:01
+            addresses: 00:00:00:00:00:01
         lport sw0-port2
-            macs: 00:00:00:00:00:02
+            addresses: 00:00:00:00:00:02
     lswitch c8ed4c5f-9733-43f6-93da-795b1aabacb1 (sw1)
         lport sw1-port1
-            macs: 00:00:00:00:00:03
+            addresses: 00:00:00:00:00:03
         lport sw1-port2
-            macs: 00:00:00:00:00:04
+            addresses: 00:00:00:00:00:04
 
 Physically, all ports reside on the same chassis.
 
@@ -279,13 +279,13 @@ You can start by viewing the logical topology with `ovn-nbctl`.
     $ ovn-nbctl show
     lswitch b977dc03-79a5-41ba-9665-341a80e1abfd (sw0)
         lport sw0-port1
-            macs: 00:00:00:00:00:01
+            addresses: 00:00:00:00:00:01
         lport sw0-port2
-            macs: 00:00:00:00:00:02
+            addresses: 00:00:00:00:00:02
         lport sw0-port4
-            macs: 00:00:00:00:00:04
+            addresses: 00:00:00:00:00:04
         lport sw0-port3
-            macs: 00:00:00:00:00:03
+            addresses: 00:00:00:00:00:03
 
 Using `ovn-sbctl` to view the state of the system, we can see that there are two
 chassis: one local that we can interact with, and a fake remote chassis. Two
@@ -394,24 +394,24 @@ The logical topology from `ovn-nbctl` should look like this.
     $ ovn-nbctl show
         lswitch 5a652488-cfba-4f3e-929d-00010cdfde40 (provnet1-2)
             lport provnet1-2-physnet1
-                macs: unknown
+                addresses: unknown
             lport provnet1-2-port1
-                macs: 00:00:00:00:00:02
+                addresses: 00:00:00:00:00:02
         lswitch 5829b60a-eda8-4d78-94f6-7017ff9efcf0 (provnet1-4)
             lport provnet1-4-port1
-                macs: 00:00:00:00:00:04
+                addresses: 00:00:00:00:00:04
             lport provnet1-4-physnet1
-                macs: unknown
+                addresses: unknown
         lswitch 06cbbcb6-38e3-418d-a81e-634ec9b54ad6 (provnet1-1)
             lport provnet1-1-port1
-                macs: 00:00:00:00:00:01
+                addresses: 00:00:00:00:00:01
             lport provnet1-1-physnet1
-                macs: unknown
+                addresses: unknown
         lswitch 9cba3b3b-59ae-4175-95f5-b6f1cd9c2afb (provnet1-3)
             lport provnet1-3-physnet1
-                macs: unknown
+                addresses: unknown
             lport provnet1-3-port1
-                macs: 00:00:00:00:00:03
+                addresses: 00:00:00:00:00:03
 
 `port1` on each logical switch represents a regular logical port for a VIF on a
 hypervisor.  `physnet1` on each logical switch is the special `localnet` port.
@@ -548,47 +548,47 @@ set to `101`.
         lswitch 12ea93d0-694b-48e9-adef-d0ddd3ec4ac9 (provnet1-7-101)
             lport provnet1-7-physnet1-101
                 parent: , tag:101
-                macs: unknown
+                addresses: unknown
             lport provnet1-7-101-port1
-                macs: 00:00:00:00:00:07
+                addresses: 00:00:00:00:00:07
         lswitch c9a5ce3a-15ec-48ea-a898-416013463589 (provnet1-4)
             lport provnet1-4-port1
-                macs: 00:00:00:00:00:04
+                addresses: 00:00:00:00:00:04
             lport provnet1-4-physnet1
-                macs: unknown
+                addresses: unknown
         lswitch e07d4f7a-2085-4fbb-9937-d6192b79a397 (provnet1-1)
             lport provnet1-1-physnet1
-                macs: unknown
+                addresses: unknown
             lport provnet1-1-port1
-                macs: 00:00:00:00:00:01
+                addresses: 00:00:00:00:00:01
         lswitch 6c098474-0509-4219-bc9b-eb4e28dd1aeb (provnet1-2)
             lport provnet1-2-physnet1
-                macs: unknown
+                addresses: unknown
             lport provnet1-2-port1
-                macs: 00:00:00:00:00:02
+                addresses: 00:00:00:00:00:02
         lswitch 723c4684-5d58-4202-b8e3-4ba99ad5ed9e (provnet1-8-101)
             lport provnet1-8-101-port1
-                macs: 00:00:00:00:00:08
+                addresses: 00:00:00:00:00:08
             lport provnet1-8-physnet1-101
                 parent: , tag:101
-                macs: unknown
+                addresses: unknown
         lswitch 8444e925-ceb2-4b02-ac20-eb2e4cfb954d (provnet1-6-101)
             lport provnet1-6-physnet1-101
                 parent: , tag:101
-                macs: unknown
+                addresses: unknown
             lport provnet1-6-101-port1
-                macs: 00:00:00:00:00:06
+                addresses: 00:00:00:00:00:06
         lswitch e11e5605-7c46-4395-b28d-cff57451fc7e (provnet1-3)
             lport provnet1-3-port1
-                macs: 00:00:00:00:00:03
+                addresses: 00:00:00:00:00:03
             lport provnet1-3-physnet1
-                macs: unknown
+                addresses: unknown
         lswitch 0706b697-6c92-4d54-bc0a-db5bababb74a (provnet1-5-101)
             lport provnet1-5-101-port1
-                macs: 00:00:00:00:00:05
+                addresses: 00:00:00:00:00:05
             lport provnet1-5-physnet1-101
                 parent: , tag:101
-                macs: unknown
+                addresses: unknown
 
 The physical topology shows that we have 4 regular VIF ports on each simulated
 hypervisor.
diff --git a/tutorial/ovn/env1/add-third-port.sh b/tutorial/ovn/env1/add-third-port.sh
index 51c6190fd..e2faab27c 100755
--- a/tutorial/ovn/env1/add-third-port.sh
+++ b/tutorial/ovn/env1/add-third-port.sh
@@ -16,6 +16,6 @@
 set -o xtrace
 
 ovn-nbctl lport-add sw0 sw0-port3
-ovn-nbctl lport-set-macs sw0-port3 00:00:00:00:00:03
+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
 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 543cde3c0..78657e94c 100755
--- a/tutorial/ovn/env1/setup.sh
+++ b/tutorial/ovn/env1/setup.sh
@@ -27,8 +27,8 @@ ovn-nbctl lport-add sw0 sw0-port1
 ovn-nbctl lport-add sw0 sw0-port2
 
 # Set a MAC address for each of the two logical ports.
-ovn-nbctl lport-set-macs sw0-port1 00:00:00:00:00:01
-ovn-nbctl lport-set-macs sw0-port2 00:00:00:00:00:02
+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
 
 # Set up port security for the two logical ports.  This ensures that
 # the logical port mac address we have configured is the only allowed
diff --git a/tutorial/ovn/env2/setup.sh b/tutorial/ovn/env2/setup.sh
index 9b8a95cf7..4b8df762e 100755
--- a/tutorial/ovn/env2/setup.sh
+++ b/tutorial/ovn/env2/setup.sh
@@ -21,10 +21,10 @@ 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-macs sw0-port1 00:00:00:00:00:01
-ovn-nbctl lport-set-macs sw0-port2 00:00:00:00:00:02
-ovn-nbctl lport-set-macs sw1-port1 00:00:00:00:00:03
-ovn-nbctl lport-set-macs sw1-port2 00:00:00:00:00:04
+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
diff --git a/tutorial/ovn/env3/setup.sh b/tutorial/ovn/env3/setup.sh
index b554d257a..7a7f0a6e2 100755
--- a/tutorial/ovn/env3/setup.sh
+++ b/tutorial/ovn/env3/setup.sh
@@ -22,10 +22,10 @@ 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-macs sw0-port1 00:00:00:00:00:01
-ovn-nbctl lport-set-macs sw0-port2 00:00:00:00:00:02
-ovn-nbctl lport-set-macs sw0-port3 00:00:00:00:00:03
-ovn-nbctl lport-set-macs sw0-port4 00:00:00:00:00:04
+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
diff --git a/tutorial/ovn/env4/setup2.sh b/tutorial/ovn/env4/setup2.sh
index 5eae1d71a..361ec99f4 100755
--- a/tutorial/ovn/env4/setup2.sh
+++ b/tutorial/ovn/env4/setup2.sh
@@ -31,11 +31,11 @@ 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-macs provnet1-$n-port1 00:00:00:00:00:0$n
+    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-macs provnet1-$n-physnet1 unknown
+    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
 done
diff --git a/tutorial/ovn/env5/setup.sh b/tutorial/ovn/env5/setup.sh
index c637aa234..f73a52df0 100755
--- a/tutorial/ovn/env5/setup.sh
+++ b/tutorial/ovn/env5/setup.sh
@@ -41,7 +41,7 @@ for n in 1 2 3 4 5 6 7 8; do
 
     lport_name="$lswitch_name-port1"
     ovn-nbctl lport-add $lswitch_name $lport_name
-    ovn-nbctl lport-set-macs $lport_name 00:00:00:00:00:0$n
+    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
 
     if [ $n -gt 4 ] ; then
@@ -51,7 +51,7 @@ for n in 1 2 3 4 5 6 7 8; do
         lport_name="provnet1-$n-physnet1"
         ovn-nbctl lport-add $lswitch_name $lport_name
     fi
-    ovn-nbctl lport-set-macs $lport_name unknown
+    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
 done