|
 |
bbaaef |
From fe8a82dfeb6b965472aa66996c85a0a0383ddec1 Mon Sep 17 00:00:00 2001
|
|
|
bbaaef |
From: Russell Bryant <russell@ovn.org>
|
|
|
bbaaef |
Date: Sat, 7 Dec 2019 23:08:56 -0500
|
|
|
bbaaef |
Subject: [PATCH ovn 4/4] tests: Updated expected log message
|
|
|
bbaaef |
|
|
|
bbaaef |
A previous commit added more detail to this log message. Fix the test
|
|
|
bbaaef |
to reflect the new text.
|
|
|
bbaaef |
|
|
|
bbaaef |
Signed-off-by: Russell Bryant <russell@ovn.org>
|
|
|
bbaaef |
Acked-by: Dumitru Ceara <dceara@redhat.com>
|
|
|
bbaaef |
|
|
|
bbaaef |
(cherry picked from upstream commit b3e0e3b12426d47a153506c92fa578fcc2ccf7c1)
|
|
|
bbaaef |
---
|
|
|
bbaaef |
tests/ovn.at | 12 ++++++------
|
|
|
bbaaef |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
bbaaef |
|
|
|
bbaaef |
diff --git a/tests/ovn.at b/tests/ovn.at
|
|
|
bbaaef |
index e2565f2..90830dc 100644
|
|
|
bbaaef |
--- a/tests/ovn.at
|
|
|
bbaaef |
+++ b/tests/ovn.at
|
|
|
bbaaef |
@@ -13674,22 +13674,22 @@ ovn-nbctl list logical_switch_port
|
|
|
bbaaef |
# Now try to add duplicate addresses on a new port. These should all fail
|
|
|
bbaaef |
ovn-nbctl --wait=sb lsp-add sw1 sw1-p5
|
|
|
bbaaef |
AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 10.0.0.1"], [1], [],
|
|
|
bbaaef |
-[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 10.0.0.1
|
|
|
bbaaef |
+[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '10.0.0.1' found on logical switch port 'sw1-p1'
|
|
|
bbaaef |
])
|
|
|
bbaaef |
AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 10.0.0.2"], [1], [],
|
|
|
bbaaef |
-[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 10.0.0.2
|
|
|
bbaaef |
+[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '10.0.0.2' found on logical switch port 'sw1-p1'
|
|
|
bbaaef |
])
|
|
|
bbaaef |
AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 aef0::1"], [1], [],
|
|
|
bbaaef |
-[ovn-nbctl: Error on switch sw1: duplicate IPv6 address aef0::1
|
|
|
bbaaef |
+[ovn-nbctl: Error on switch sw1: duplicate IPv6 address 'aef0::1' found on logical switch port 'sw1-p1'
|
|
|
bbaaef |
])
|
|
|
bbaaef |
AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 aef0::2"], [1], [],
|
|
|
bbaaef |
-[ovn-nbctl: Error on switch sw1: duplicate IPv6 address aef0::2
|
|
|
bbaaef |
+[ovn-nbctl: Error on switch sw1: duplicate IPv6 address 'aef0::2' found on logical switch port 'sw1-p1'
|
|
|
bbaaef |
])
|
|
|
bbaaef |
AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 192.168.0.2"], [1], [],
|
|
|
bbaaef |
-[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 192.168.0.2
|
|
|
bbaaef |
+[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '192.168.0.2' found on logical switch port 'sw1-p2'
|
|
|
bbaaef |
])
|
|
|
bbaaef |
AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 192.168.0.3"], [1], [],
|
|
|
bbaaef |
-[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 192.168.0.3
|
|
|
bbaaef |
+[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '192.168.0.3' found on logical switch port 'sw1-p3'
|
|
|
bbaaef |
])
|
|
|
bbaaef |
|
|
|
bbaaef |
# Now try re-setting sw1-p1. This should succeed
|
|
|
bbaaef |
--
|
|
|
bbaaef |
1.8.3.1
|
|
|
bbaaef |
|