commit | a79cbf75de93ac580a880f4fad0924b4d9a15420 | [log] [tgz] |
---|---|---|
author | Thomas Vachuska <tom@onlab.us> | Fri Jan 13 15:07:04 2017 -0800 |
committer | Thomas Vachuska <tom@onlab.us> | Fri Jan 13 15:07:04 2017 -0800 |
tree | 34be93daa0fdc71c0cfa8c0e1cd9eee642daf3ae | |
parent | 587a4831d34c868b607d22a53dd8f281e7347ecc [diff] |
Backing out memoizing driver name from the OF device provider because it breaks number of STC scenarios. Change-Id: Ie07ebe4428ffc70273b494a6a6bd303c05b70a8c
diff --git a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java index dc5ef97..c1e2843 100644 --- a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java +++ b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -387,9 +387,10 @@ Driver driver = driverService.getDriver(sw.manufacturerDescription(), sw.hardwareDescription(), sw.softwareDescription()); - if (driver != null) { - annotationsBuilder.set(AnnotationKeys.DRIVER, driver.name()); - } + // FIXME: The following breaks the STC tests and will require to be revisited. +// if (driver != null) { +// annotationsBuilder.set(AnnotationKeys.DRIVER, driver.name()); +// } SparseAnnotations annotations = annotationsBuilder.build();