diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-01-26 11:35:38 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-02-01 10:05:44 -0800 |
| commit | 6468b79c635570168de53534dcb3a7feec0d5ba7 (patch) | |
| tree | b630b79db5a8c260892c52be5dd440bd4c3b1d5e /vswitchd | |
| parent | 999401aa9caf241400406192ca7e55d7732a1c44 (diff) | |
ofproto: Remove support for OpenFlow-based management protocol.
Older versions of Open vSwitch supported a management protocol based on
OpenFlow message framing. The current Open vSwitch instead uses the
OVSDB protocol for the same purposes. We don't plan to support this older
protocol any longer, so this commit deletes support.
This commit also deletes the management_id column from the vswitch's
database schema. The management_id was used by the older management
protocol to match up OpenFlow switch connections to management connections,
but the current implementation instead matches up connections based on
the datapath IDs exported by the configuration database. In fact, the
OpenFlow connections had no way to actually export the management ID, so
this just deletes code that was essentially without function anyhow.
Diffstat (limited to 'vswitchd')
| -rw-r--r-- | vswitchd/bridge.c | 4 | ||||
| -rw-r--r-- | vswitchd/vswitch.ovsschema | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 6fc24414..66f0884f 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -1262,7 +1262,6 @@ bridge_reconfigure_one(const struct ovsrec_open_vswitch *ovs_cfg, struct svec listeners, old_listeners; struct svec snoops, old_snoops; struct shash_node *node; - uint64_t mgmt_id; size_t i; /* Collect old ports. */ @@ -1298,9 +1297,6 @@ bridge_reconfigure_one(const struct ovsrec_open_vswitch *ovs_cfg, } } - dpid_from_string(ovs_cfg->management_id, &mgmt_id); - ofproto_set_mgmt_id(br->ofproto, mgmt_id); - /* Get rid of deleted ports and add new ports. */ SHASH_FOR_EACH (node, &old_ports) { if (!shash_find(&new_ports, node->name)) { diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema index e9f615b6..7b0a5398 100644 --- a/vswitchd/vswitch.ovsschema +++ b/vswitchd/vswitch.ovsschema @@ -7,9 +7,6 @@ "bridges": { "comment": "Set of bridges managed by the daemon.", "type": {"key": "uuid", "min": 0, "max": "unlimited"}}, - "management_id": { - "comment": "Exactly 12 hex digits that identify the daemon.", - "type": "string"}, "controller": { "comment": "Default Controller used by bridges.", "type": {"key": "uuid", "min": 0, "max": 1}}, |