Classify hardware running OVS as an OVS switch.
Without this we use the default abstract switch, which doesn't push a table-miss entry. Fixes ONOS-558. Cherry-picked from onos-1.0. Change-Id: I296c7fff6e94575e72829fb4e1aa3d1e5b82852c
Showing
1 changed file
with
4 additions
and
6 deletions
... | @@ -16,12 +16,14 @@ | ... | @@ -16,12 +16,14 @@ |
16 | package org.onosproject.openflow.drivers; | 16 | package org.onosproject.openflow.drivers; |
17 | 17 | ||
18 | 18 | ||
19 | +import java.util.Collections; | ||
20 | +import java.util.List; | ||
21 | + | ||
19 | import org.onosproject.openflow.controller.Dpid; | 22 | import org.onosproject.openflow.controller.Dpid; |
20 | import org.onosproject.openflow.controller.RoleState; | 23 | import org.onosproject.openflow.controller.RoleState; |
21 | import org.onosproject.openflow.controller.driver.AbstractOpenFlowSwitch; | 24 | import org.onosproject.openflow.controller.driver.AbstractOpenFlowSwitch; |
22 | import org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver; | 25 | import org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver; |
23 | import org.onosproject.openflow.controller.driver.OpenFlowSwitchDriverFactory; | 26 | import org.onosproject.openflow.controller.driver.OpenFlowSwitchDriverFactory; |
24 | - | ||
25 | import org.projectfloodlight.openflow.protocol.OFDescStatsReply; | 27 | import org.projectfloodlight.openflow.protocol.OFDescStatsReply; |
26 | import org.projectfloodlight.openflow.protocol.OFMessage; | 28 | import org.projectfloodlight.openflow.protocol.OFMessage; |
27 | import org.projectfloodlight.openflow.protocol.OFPortDesc; | 29 | import org.projectfloodlight.openflow.protocol.OFPortDesc; |
... | @@ -29,9 +31,6 @@ import org.projectfloodlight.openflow.protocol.OFVersion; | ... | @@ -29,9 +31,6 @@ import org.projectfloodlight.openflow.protocol.OFVersion; |
29 | import org.slf4j.Logger; | 31 | import org.slf4j.Logger; |
30 | import org.slf4j.LoggerFactory; | 32 | import org.slf4j.LoggerFactory; |
31 | 33 | ||
32 | -import java.util.Collections; | ||
33 | -import java.util.List; | ||
34 | - | ||
35 | /** | 34 | /** |
36 | * A simple implementation of a driver manager that differentiates between | 35 | * A simple implementation of a driver manager that differentiates between |
37 | * connected switches using the OF Description Statistics Reply message. | 36 | * connected switches using the OF Description Statistics Reply message. |
... | @@ -63,8 +62,7 @@ public final class DriverManager implements OpenFlowSwitchDriverFactory { | ... | @@ -63,8 +62,7 @@ public final class DriverManager implements OpenFlowSwitchDriverFactory { |
63 | return new OFSwitchImplCPqD13(dpid, desc, cpqdUsePipeline13); | 62 | return new OFSwitchImplCPqD13(dpid, desc, cpqdUsePipeline13); |
64 | } | 63 | } |
65 | 64 | ||
66 | - if (vendor.startsWith("Nicira") && | 65 | + if (hw.startsWith("Open vSwitch")) { |
67 | - hw.startsWith("Open vSwitch")) { | ||
68 | if (ofv == OFVersion.OF_10) { | 66 | if (ofv == OFVersion.OF_10) { |
69 | return new OFSwitchImplOVS10(dpid, desc); | 67 | return new OFSwitchImplOVS10(dpid, desc); |
70 | } else if (ofv == OFVersion.OF_13) { | 68 | } else if (ofv == OFVersion.OF_13) { | ... | ... |
-
Please register or login to post a comment