From: Tiago Pires <[email protected]>

This commit fixes some issues with the OVN multi-node scenario testing:
- correct interfaces MTU
- fixing central prefix name according with ovn-fake-multinode default
configuration
- Picks up the v0.2 of ovn-fake-multinode.

Signed-off-by: Tiago Pires <[email protected]>
(cherry picked from commit bf69ba5d897b77a6f7753371158eed3185205564)
(amended due to mtu missing in one test due to cherry-pick ordering)
---
 .../workflows/ovn-fake-multinode-tests.yml    | 12 ++--
 AUTHORS.rst                                   |  1 +
 tests/multinode-macros.at                     | 14 ++--
 tests/multinode.at                            | 68 +++++++++----------
 4 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/ovn-fake-multinode-tests.yml 
b/.github/workflows/ovn-fake-multinode-tests.yml
index 9cfab4aed..718279415 100644
--- a/.github/workflows/ovn-fake-multinode-tests.yml
+++ b/.github/workflows/ovn-fake-multinode-tests.yml
@@ -31,7 +31,7 @@ jobs:
       with:
         repository: 'ovn-org/ovn-fake-multinode'
         path: 'ovn-fake-multinode'
-        ref: 'v0.1'
+        ref: 'v0.2'
 
     # Check out ovn and ovs separately inside ovn-fake-multinode/ovn and 
ovn-fake-multinode/ovs
     # ovn-fake-multinode builds and installs ovs from ovn-fake-multinode/ovs
@@ -154,7 +154,7 @@ jobs:
       with:
         repository: 'ovn-org/ovn-fake-multinode'
         path: 'ovn-fake-multinode'
-        ref: 'v0.1'
+        ref: 'v0.2'
 
     - name: Start openvswitch
       run: |
@@ -164,8 +164,8 @@ jobs:
     - name: Start basic cluster
       run: |
         sudo -E CHASSIS_COUNT=3 GW_COUNT=3 ./ovn_cluster.sh start
-        sudo podman exec -it ovn-central ovn-nbctl show
-        sudo podman exec -it ovn-central ovn-appctl -t ovn-northd version
+        sudo podman exec -it ovn-central-az1-1 ovn-nbctl show
+        sudo podman exec -it ovn-central-az1-1 ovn-appctl -t ovn-northd version
         sudo podman exec -it ovn-chassis-1 ovn-appctl -t ovn-controller version
       working-directory: ovn-fake-multinode
 
@@ -201,8 +201,8 @@ jobs:
     - name: Run fake-multinode system tests
       run: |
         if ! sudo make check-multinode TESTSUITEFLAGS="${{ 
matrix.cfg.testsuiteflags }}"; then
-          sudo podman exec -it ovn-central ovn-nbctl show || :
-          sudo podman exec -it ovn-central ovn-sbctl show || :
+          sudo podman exec -it ovn-central-az1-1 ovn-nbctl show || :
+          sudo podman exec -it ovn-central-az1-1 ovn-sbctl show || :
           sudo podman exec -it ovn-chassis-1 ovs-vsctl show || :
           sudo podman exec -it ovn-chassis-1 ip netns || :
           sudo podman exec -it ovn-chassis-1 cat 
/var/log/ovn/ovn-controller.log || :
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 812fa501a..0fece927d 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -394,6 +394,7 @@ Thomas F. Herbert                  [email protected]
 Thomas Goirand                     [email protected]
 Thomas Graf                        [email protected]
 Thomas Lacroix                     [email protected]
+Tiago Pires                        [email protected]
 Tim Rozet                          [email protected]
 Timo Puha                          [email protected]
 Timothy Redaelli                   [email protected]
diff --git a/tests/multinode-macros.at b/tests/multinode-macros.at
index 89c885960..c2f16edb9 100644
--- a/tests/multinode-macros.at
+++ b/tests/multinode-macros.at
@@ -51,11 +51,11 @@ m_as() {
 }
 
 m_central_as () {
-    podman exec ovn-central "$@"
+    podman exec ovn-central-az1-1 "$@"
 }
 
 check_fake_multinode_setup() {
-    check m_as ovn-central ovn-nbctl --wait=sb sync
+    check m_as ovn-central-az1-1 ovn-nbctl --wait=sb sync
     AT_CHECK([m_as ovn-chassis-1 ovn-appctl -t ovn-controller version], [0], 
[ignore])
     AT_CHECK([m_as ovn-chassis-2 ovn-appctl -t ovn-controller version], [0], 
[ignore])
     AT_CHECK([m_as ovn-chassis-3 ovn-appctl -t ovn-controller version], [0], 
[ignore])
@@ -76,9 +76,9 @@ check_fake_multinode_setup() {
 }
 
 cleanup_multinode_resources() {
-    m_as ovn-central rm -f /etc/ovn/ovnnb_db.db
-    m_as ovn-central /usr/share/ovn/scripts/ovn-ctl restart_northd
-    check m_as ovn-central ovn-nbctl --wait=sb sync
+    m_as ovn-central-az1-1 rm -f /etc/ovn/ovnnb_db.db
+    m_as ovn-central-az1-1 /usr/share/ovn/scripts/ovn-ctl restart_northd
+    check m_as ovn-central-az1-1 ovn-nbctl --wait=sb sync
     for c in ovn-chassis-1 ovn-chassis-2 ovn-chassis-3 ovn-gw-1 ovn-gw-2 
ovn-gw-3
     do
         m_as $c ovs-vsctl del-br br-int
@@ -92,11 +92,11 @@ cleanup_multinode_resources() {
 }
 
 multinode_nbctl () {
-    m_as ovn-central ovn-nbctl "$@"
+    m_as ovn-central-az1-1 ovn-nbctl "$@"
 }
 
 multinode_sbctl () {
-    m_as ovn-central ovn-sbctl "$@"
+    m_as ovn-central-az1-1 ovn-sbctl "$@"
 }
 
 # m_count_rows TABLE [CONDITION...]
diff --git a/tests/multinode.at b/tests/multinode.at
index a102f0258..1ce026c00 100644
--- a/tests/multinode.at
+++ b/tests/multinode.at
@@ -15,8 +15,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 
"50:54:00:00:00:03 10.0.0.3 10
 check multinode_nbctl lsp-add sw0 sw0-port2
 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 
1000::4"
 
-m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
+m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
 
 m_wait_for_ports_up
 
@@ -55,7 +55,7 @@ check multinode_nbctl lsp-add-router-port sw0 sw0-lr0 lr0-sw0
 check multinode_nbctl lrp-add lr0 lr0-sw1 00:00:00:00:ff:02 20.0.0.1/24 
2000::a/64
 check multinode_nbctl lsp-add-router-port sw1 sw1-lr0 lr0-sw1
 
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
20.0.0.3 24 20.0.0.1 2000::4/64 1000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
1342 20.0.0.3 24 20.0.0.1 2000::4/64 1000::a
 
 m_wait_for_ports_up sw1-port1
 
@@ -103,8 +103,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 
"50:54:00:00:00:03 10.0.0.3 10
 check multinode_nbctl lsp-add sw0 sw0-port2
 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 
1000::4"
 
-m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
+m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
 
 m_wait_for_ports_up
 
@@ -126,7 +126,7 @@ check multinode_nbctl lsp-add-router-port sw0 sw0-lr0 
lr0-sw0
 check multinode_nbctl lrp-add lr0 lr0-sw1 00:00:00:00:ff:02 20.0.0.1/24 
2000::a/64
 check multinode_nbctl lsp-add-router-port sw1 sw1-lr0 lr0-sw1
 
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
 
 # create exteranl connection for N/S traffic
 check multinode_nbctl ls-add public
@@ -225,8 +225,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 
"50:54:00:00:00:03 10.0.0.3 10
 check multinode_nbctl lsp-add sw0 sw0-port2
 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 
1000::4"
 
-m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
+m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
 
 m_wait_for_ports_up
 
@@ -248,7 +248,7 @@ check multinode_nbctl lsp-add-router-port sw0 sw0-lr0 
lr0-sw0
 check multinode_nbctl lrp-add lr0 lr0-sw1 00:00:00:00:ff:02 20.0.0.1/24 
2000::a/64
 check multinode_nbctl lsp-add-router-port sw1 sw1-lr0 lr0-sw1
 
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
 
 # create exteranl connection for N/S traffic
 check multinode_nbctl ls-add public
@@ -328,8 +328,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 
"50:54:00:00:00:03 10.0.0.3 10
 check multinode_nbctl lsp-add sw0 sw0-port2
 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 
1000::4"
 
-m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
+m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
 
 m_wait_for_ports_up
 
@@ -351,7 +351,7 @@ check multinode_nbctl lsp-add-router-port sw0 sw0-lr0 
lr0-sw0
 check multinode_nbctl lrp-add lr0 lr0-sw1 00:00:00:00:ff:02 20.0.0.1/24 
2000::a/64
 check multinode_nbctl lsp-add-router-port sw1 sw1-lr0 lr0-sw1
 
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
 
 # create exteranl connection for N/S traffic
 check multinode_nbctl ls-add public
@@ -444,8 +444,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 
"50:54:00:00:00:03 10.0.0.3 10
 check multinode_nbctl lsp-add sw0 sw0-port2
 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 
1000::4"
 
-m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
+m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
 
 m_wait_for_ports_up
 
@@ -467,7 +467,7 @@ check multinode_nbctl lsp-add-router-port sw0 sw0-lr0 
lr0-sw0
 check multinode_nbctl lrp-add lr0 lr0-sw1 00:00:00:00:ff:02 20.0.0.1/24 
2000::a/64
 check multinode_nbctl lsp-add-router-port sw1 sw1-lr0 lr0-sw1
 
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
 
 # create exteranl connection for N/S traffic
 check multinode_nbctl ls-add public
@@ -553,8 +553,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 
"50:54:00:00:00:03 10.0.0.3 10
 check multinode_nbctl lsp-add sw0 sw0-port2
 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 
1000::4"
 
-m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
+m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
 
 m_wait_for_ports_up
 
@@ -576,7 +576,7 @@ check multinode_nbctl lsp-add-router-port sw0 sw0-lr0 
lr0-sw0
 check multinode_nbctl lrp-add lr0 lr0-sw1 00:00:00:00:ff:02 20.0.0.1/24 
2000::a/64
 check multinode_nbctl lsp-add-router-port sw1 sw1-lr0 lr0-sw1
 
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
 
 # create exteranl connection for N/S traffic
 check multinode_nbctl ls-add public
@@ -680,8 +680,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 
"50:54:00:00:00:03 10.0.0.3 10
 check multinode_nbctl lsp-add sw0 sw0-port2
 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 
1000::4"
 
-m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
+m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
 
 m_wait_for_ports_up
 
@@ -703,7 +703,7 @@ check multinode_nbctl lsp-add-router-port sw0 sw0-lr0 
lr0-sw0
 check multinode_nbctl lrp-add lr0 lr0-sw1 00:00:00:00:ff:02 20.0.0.1/24 
2000::a/64
 check multinode_nbctl lsp-add-router-port sw1 sw1-lr0 lr0-sw1
 
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
 
 # create exteranl connection for N/S traffic
 check multinode_nbctl ls-add public
@@ -809,8 +809,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 
"50:54:00:00:00:03 10.0.0.3 10
 check multinode_nbctl lsp-add sw0 sw0-port2
 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 
1000::4"
 
-m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
+m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
 
 # Create the second logical switch with one port
 check multinode_nbctl ls-add sw1
@@ -825,7 +825,7 @@ check multinode_nbctl lsp-add-router-port sw0 sw0-lr0 
lr0-sw0
 check multinode_nbctl lrp-add lr0 lr0-sw1 00:00:00:00:ff:02 20.0.0.1/24 
2000::a/64
 check multinode_nbctl lsp-add-router-port sw1 sw1-lr0 lr0-sw1
 
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
 
 check multinode_nbctl lr-nat-add lr0 snat 172.20.0.100 10.0.0.0/24
 check multinode_nbctl lr-nat-add lr0 snat 172.20.0.100 20.0.0.0/24
@@ -902,8 +902,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 
"50:54:00:00:00:03 10.0.0.3 10
 check multinode_nbctl lsp-add sw0 sw0-port2
 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 
1000::4"
 
-m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
+m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
 
 m_wait_for_ports_up
 
@@ -925,7 +925,7 @@ check multinode_nbctl lsp-add-router-port sw0 sw0-lr0 
lr0-sw0
 check multinode_nbctl lrp-add lr0 lr0-sw1 00:00:00:00:ff:02 20.0.0.1/24 
2000::a/64
 check multinode_nbctl lsp-add-router-port sw1 sw1-lr0 lr0-sw1
 
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
 
 # create exteranl connection for N/S traffic
 check multinode_nbctl ls-add public
@@ -944,7 +944,7 @@ check multinode_nbctl lr-nat-add lr0 snat 172.20.0.100 
20.0.0.0/24
 check multinode_nbctl lsp-add public public-port1
 check multinode_nbctl lsp-set-addresses public-port1 "60:54:00:00:00:03 
172.168.0.50"
 
-m_as ovn-chassis-1 /data/create_fake_vm.sh public-port1 pubp1 
60:54:00:00:00:03 172.20.0.50 24 172.20.0.100
+m_as ovn-chassis-1 /data/create_fake_vm.sh public-port1 pubp1 
60:54:00:00:00:03 1342 172.20.0.50 24 172.20.0.100
 
 check multinode_nbctl --wait=hv sync
 
@@ -1085,8 +1085,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 
"50:54:00:00:00:03 10.0.0.3 10
 check multinode_nbctl lsp-add sw0 sw0-port2
 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 
1000::4"
 
-m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
+m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 
1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 
1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a
 
 m_wait_for_ports_up
 
@@ -1108,7 +1108,7 @@ check multinode_nbctl lsp-add-router-port sw0 sw0-lr0 
lr0-sw0
 check multinode_nbctl lrp-add lr0 lr0-sw1 00:00:00:00:ff:02 20.0.0.1/24 
2000::a/64
 check multinode_nbctl lsp-add-router-port sw1 sw1-lr0 lr0-sw1
 
-m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
+m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 
1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a
 
 # create exteranl connection for N/S traffic
 check multinode_nbctl ls-add public
@@ -1466,10 +1466,10 @@ done
 # Set requested chassis before creating migrator on chassis-3
 check multinode_nbctl --wait=hv set Logical_Switch_Port migrator 
options:requested-chassis=ovn-chassis-1
 
-m_as ovn-chassis-1 /data/create_fake_vm.sh migrator migrator 50:54:00:00:00:09 
10.0.0.9 24 10.0.0.10 1000::9/64 1000::a
-m_as ovn-chassis-3 /data/create_fake_vm.sh migrator migrator 50:54:00:00:00:09 
10.0.0.9 24 10.0.0.10 1000::9/64 1000::a
+m_as ovn-chassis-1 /data/create_fake_vm.sh migrator migrator 50:54:00:00:00:09 
1342 10.0.0.9 24 10.0.0.10 1000::9/64 1000::a
+m_as ovn-chassis-3 /data/create_fake_vm.sh migrator migrator 50:54:00:00:00:09 
1342 10.0.0.9 24 10.0.0.10 1000::9/64 1000::a
 for i in 1 2 3; do
-    m_as ovn-chassis-${i} /data/create_fake_vm.sh sw0-port${i} sw0-port${i} 
50:54:00:00:00:0${i} 10.0.0.${i} 24 10.0.0.10 1000::${i}/64 1000::a
+    m_as ovn-chassis-${i} /data/create_fake_vm.sh sw0-port${i} sw0-port${i} 
50:54:00:00:00:0${i} 1342 10.0.0.${i} 24 10.0.0.10 1000::${i}/64 1000::a
 done
 
 m_wait_for_ports_up
-- 
2.47.1

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to