[ovs-dev] [PATCH] bridge: Use correct (legacy) role names in database.

[Ben Pfaff]

The vswitchd database schema requires role names to be "master" or
"slave", but this code tried to use "primary" and "secondary".

Signed-off-by: Ben Pfaff <blp at ovn.org>
Reported-at: https://github.com/openvswitch/ovs-issues/issues/218
Fixes: 807152a4ddfb ("Use primary/secondary, not master/slave, as names for OpenFlow roles.")
---
 vswitchd/bridge.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 0432d2abf0af..cb7c5cb769da 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -3019,9 +3019,9 @@ ofp12_controller_role_to_str(enum ofp12_controller_role role)
     case OFPCR12_ROLE_EQUAL:
         return "other";
     case OFPCR12_ROLE_PRIMARY:
-        return "primary";
+        return "master";
     case OFPCR12_ROLE_SECONDARY:
-        return "secondary";
+        return "slave";
     case OFPCR12_ROLE_NOCHANGE:
     default:
         return NULL;
-- 
2.31.1