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
diff --git a/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/DriverManager.java b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/DriverManager.java
index 67dd0c3..f7a5f1a 100644
--- a/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/DriverManager.java
+++ b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/DriverManager.java
@@ -16,12 +16,14 @@
package org.onosproject.openflow.drivers;
+import java.util.Collections;
+import java.util.List;
+
import org.onosproject.openflow.controller.Dpid;
import org.onosproject.openflow.controller.RoleState;
import org.onosproject.openflow.controller.driver.AbstractOpenFlowSwitch;
import org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver;
import org.onosproject.openflow.controller.driver.OpenFlowSwitchDriverFactory;
-
import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
import org.projectfloodlight.openflow.protocol.OFMessage;
import org.projectfloodlight.openflow.protocol.OFPortDesc;
@@ -29,9 +31,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Collections;
-import java.util.List;
-
/**
* A simple implementation of a driver manager that differentiates between
* connected switches using the OF Description Statistics Reply message.
@@ -63,8 +62,7 @@
return new OFSwitchImplCPqD13(dpid, desc, cpqdUsePipeline13);
}
- if (vendor.startsWith("Nicira") &&
- hw.startsWith("Open vSwitch")) {
+ if (hw.startsWith("Open vSwitch")) {
if (ofv == OFVersion.OF_10) {
return new OFSwitchImplOVS10(dpid, desc);
} else if (ofv == OFVersion.OF_13) {