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>

6 files changed, 15 insertions, 15 deletions

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