diff options
| author | Ben Pfaff <blp@ovn.org> | 2021-07-06 15:37:09 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2021-07-07 11:56:59 -0700 |
| commit | 4e948b86c758971353a003971725ed508962b026 (patch) | |
| tree | a2c1128ffdcd3b17ca2196814ea0874066ab963c /vswitchd | |
| parent | 828d9cb8d493d4f118d6cc826ebcf2d26776e239 (diff) | |
| download | openvswitch-4e948b86c758971353a003971725ed508962b026.tar.gz | |
bridge: Use correct (legacy) role names in database.
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@ovn.org>
Reported-at: https://github.com/openvswitch/ovs-issues/issues/218
Tested-at: https://github.com/openvswitch/ovs-issues/issues/218#issuecomment-875374045
Fixes: 807152a4ddfb ("Use primary/secondary, not master/slave, as names for OpenFlow roles.")
Diffstat (limited to 'vswitchd')
| -rw-r--r-- | vswitchd/bridge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 0432d2abf..cb7c5cb76 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; |