commit a213bce47c852b8f384eaa3b93cfe784f122e112
author Jonathan Hart <jono@onlab.us> Mon Aug 11 15:44:07 2014 -0700
committer Gerrit Code Review <gerrit2@localhost> Mon Aug 11 19:05:01 2014 -0700
tree d3d29cc6b24f6922016bb98b89b1d4b02b41526b
parent 6de2332923fe580eca2079cd18bcb1855a205467

Added getFactory() method to IOFSwitch to get a message factory appropriate
for the switch's OpenFlow version.

This prevents users of the switch having to discriminate what factory to use
based on the switch OpenFlow version.

Change-Id: Iac0454856e35f4429649a6f116da34f4c048f25d

src/test/java/net/onrc/onos/core/flowprogrammer/FlowPusherTest.java

diff --git a/src/test/java/net/onrc/onos/core/flowprogrammer/FlowPusherTest.java b/src/test/java/net/onrc/onos/core/flowprogrammer/FlowPusherTest.java
index ae30949..28b445c 100644
--- a/src/test/java/net/onrc/onos/core/flowprogrammer/FlowPusherTest.java
+++ b/src/test/java/net/onrc/onos/core/flowprogrammer/FlowPusherTest.java
@@ -472,8 +472,6 @@
         //factory10 = EasyMock.createMock(OFFactories.getFactory(OFVersion.OF_10).getClass());
         flProviderService = EasyMock.createMock(IFloodlightProviderService.class);
         threadPoolService = EasyMock.createMock(IThreadPoolService.class);
-        EasyMock.expect(flProviderService.getOFMessageFactory_10()).andReturn(factory10).anyTimes();
-        EasyMock.expect(flProviderService.getOFMessageFactory_13()).andReturn(null).anyTimes();
 
         EasyMock.expect(modContext.getServiceImpl(EasyMock.eq(IThreadPoolService.class)))
                 .andReturn(threadPoolService).once();

src/test/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManagerTest.java

diff --git a/src/test/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManagerTest.java b/src/test/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManagerTest.java
index 7f848a8..8c63293 100644
--- a/src/test/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManagerTest.java
+++ b/src/test/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManagerTest.java
@@ -136,6 +136,7 @@
         IOFSwitch mockSwitch = createNiceMock(IOFSwitch.class);
         expect(mockSwitch.getId()).andReturn(id).anyTimes();
         expect(mockSwitch.portEnabled(EasyMock.anyShort())).andReturn(true).anyTimes();
+        expect(mockSwitch.getFactory()).andReturn(factory10).anyTimes();
         return mockSwitch;
     }