Commit 7ed73428a changed the behavior of flow-restore-wait to
also prevent the switch from connecting to controllers in the
controller table, but failed to update the man page documentation
generated by vswitchd/vswitch.xml to reflect this.
This commit adds that documentation.
Signed-off-by: Zak
and ONF.
Also includes more end-to-end ofproto tests for both
NXT OF1.0 and also ONF OF1.3.
VMware-BZ: 2136594
Signed-off-by: Zak Whittington
---
include/openvswitch/ofp-monitor.h | 1 +
include/openvswitch/ofp-msgs.h| 8 +-
lib/ofp-monitor.c | 22 +++--
ofproto/connmgr.c
Backported OFPT14_REQUESTFORWARD to OF1.0-1.3 as a Nicira
extension. Includes ofp-print tests for multiple OF
verions and multiple payload types, as well as more
comprehensive end-to-end tests using OF1.0 and OF1.3.
VMware-BZ: 2136594
Signed-off-by: Zak Whittington
---
include/openvswitch/ofp
management service controller
which is added via bridge_ofproto_controller_for_mgmt() after
checking whether we should call bridge_get_controllers()
(and thus n_controllers is properly set to 1, etc)
VMware-BZ: 2195377
Signed-off-by: Zak Whittington
---
vswitchd/bridge.c | 3 ++-
1 file changed, 2
management service controller
which is added via bridge_ofproto_controller_for_mgmt() after
checking whether we should call bridge_get_controllers()
(and thus n_controllers is properly set to 1, etc)
VMware-BZ: 2195377
Signed-off-by: Zak Whittington
---
vswitchd/bridge.c | 3 ++-
1 file changed, 2
Backported OFPT14_REQUESTFORWARD to OF1.0-1.3 as a Nicira
extension.
VMware-BZ: 2136594
Signed-off-by: Zak Whittington
---
include/openvswitch/ofp-monitor.h | 1 +
include/openvswitch/ofp-msgs.h| 5 +-
lib/ofp-monitor.c | 11 +++--
ofproto/connmgr.c | 6
Backported OFPT14_REQUESTFORWARD to OF1.0-1.3 as a Nicira
extension. Will only forward GROUP_MOD messages in OF
1.0 through 1.2, since METER_MOD was only added in 1.3.
VMware-BZ: 2136594
Signed-off-by: Zak Whittington
---
include/openvswitch/ofp-monitor.h | 1 +
include/openvswitch/ofp-msgs.h
VMware-BZ: 2192560
Signed-off-by: Zak Whittington
---
utilities/ovs-save | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/utilities/ovs-save b/utilities/ovs-save
index 2294583..5c046bb 100755
--- a/utilities/ovs-save
+++ b/utilities/ovs-save
@@ -121,11
VMware-BZ: 2192560
Signed-off-by: Zak Whittington
---
utilities/ovs-save | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/utilities/ovs-save b/utilities/ovs-save
index 2294583..902d331 100755
--- a/utilities/ovs-save
+++ b/utilities/ovs-save
@@ -121,11 +121,23
Added new helper function similar to xlate_report_error called
xlate_report_info that logs info-level messages, and used that
function to add an extra log message when attempting to send
out an in-port.
VMware-BZ: 2158607
Signed-off-by: Zak Whittington
---
ofproto/ofproto-dpif-xlate.c | 32
VMware-BZ: 2158607
Signed-off-by: Zak Whittington
---
ofproto/ofproto-dpif-xlate.c | 24
1 file changed, 24 insertions(+)
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 01f1faf..9b36536 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b
VMware-BZ: 2158607
Signed-off-by: Zak Whittington
---
ofproto/ofproto-dpif-xlate.c | 4
1 file changed, 4 insertions(+)
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 01f1faf..93fbee5 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif
VMware-BZ: 2158607
---
ofproto/ofproto-dpif-xlate.c | 4
1 file changed, 4 insertions(+)
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 01f1faf..93fbee5 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -5007,6 +5007,8 @@
This patch adds a log message to warn when sending out an in_port.
VMware-BZ: #2158607
Signed-off-by: Zak Whittington
---
ofproto/ofproto-dpif-xlate.c | 4
1 file changed, 4 insertions(+)
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 01f1faf..93fbee5
14 matches
Mail list logo
