update OFDeviceProviderTest - roleAssertFail
Change-Id: Iccdda5a11a3a6aa019e1641d068e10b2b17c9798
Showing
2 changed files
with
15 additions
and
3 deletions
| ... | @@ -233,7 +233,7 @@ public class DeviceManager | ... | @@ -233,7 +233,7 @@ public class DeviceManager |
| 233 | @Override | 233 | @Override |
| 234 | public void unableToAssertRole(DeviceId deviceId, MastershipRole role) { | 234 | public void unableToAssertRole(DeviceId deviceId, MastershipRole role) { |
| 235 | // FIXME: implement response to this notification | 235 | // FIXME: implement response to this notification |
| 236 | - log.warn("Falied to assert role [{}] onto Device {}", | 236 | + log.warn("Failed to assert role [{}] onto Device {}", |
| 237 | role, deviceId); | 237 | role, deviceId); |
| 238 | } | 238 | } |
| 239 | } | 239 | } | ... | ... |
| ... | @@ -120,6 +120,16 @@ public class OpenFlowDeviceProviderTest { | ... | @@ -120,6 +120,16 @@ public class OpenFlowDeviceProviderTest { |
| 120 | assertEquals("port status unhandled", 3, registry.ports.get(DID1).size()); | 120 | assertEquals("port status unhandled", 3, registry.ports.get(DID1).size()); |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | + @Test | ||
| 124 | + public void roleAssertFailed() { | ||
| 125 | + controller.listener.roleAssertFailed(DPID1, RoleState.MASTER); | ||
| 126 | + assertEquals("wrong role reported", DPID1, registry.roles.get(MASTER)); | ||
| 127 | + controller.listener.roleAssertFailed(DPID1, RoleState.EQUAL); | ||
| 128 | + assertEquals("wrong role reported", DPID1, registry.roles.get(STANDBY)); | ||
| 129 | + controller.listener.roleAssertFailed(DPID1, RoleState.SLAVE); | ||
| 130 | + assertEquals("wrong role reported", DPID1, registry.roles.get(NONE)); | ||
| 131 | + } | ||
| 132 | + | ||
| 123 | private static OFPortDesc portDesc(int port) { | 133 | private static OFPortDesc portDesc(int port) { |
| 124 | OFPortDesc.Builder builder = OFFactoryVer10.INSTANCE.buildPortDesc(); | 134 | OFPortDesc.Builder builder = OFFactoryVer10.INSTANCE.buildPortDesc(); |
| 125 | builder.setPortNo(OFPort.of(port)); | 135 | builder.setPortNo(OFPort.of(port)); |
| ... | @@ -129,9 +139,11 @@ public class OpenFlowDeviceProviderTest { | ... | @@ -129,9 +139,11 @@ public class OpenFlowDeviceProviderTest { |
| 129 | 139 | ||
| 130 | private class TestDeviceRegistry implements DeviceProviderRegistry { | 140 | private class TestDeviceRegistry implements DeviceProviderRegistry { |
| 131 | DeviceProvider provider; | 141 | DeviceProvider provider; |
| 132 | - Set<DeviceId> connected = new HashSet<DeviceId>(); | 142 | + |
| 143 | + Set<DeviceId> connected = new HashSet<>(); | ||
| 133 | Multimap<DeviceId, PortDescription> ports = HashMultimap.create(); | 144 | Multimap<DeviceId, PortDescription> ports = HashMultimap.create(); |
| 134 | PortDescription descr = null; | 145 | PortDescription descr = null; |
| 146 | + Map<MastershipRole, Dpid> roles = new HashMap<>(); | ||
| 135 | 147 | ||
| 136 | @Override | 148 | @Override |
| 137 | public DeviceProviderService register(DeviceProvider provider) { | 149 | public DeviceProviderService register(DeviceProvider provider) { |
| ... | @@ -184,7 +196,7 @@ public class OpenFlowDeviceProviderTest { | ... | @@ -184,7 +196,7 @@ public class OpenFlowDeviceProviderTest { |
| 184 | 196 | ||
| 185 | @Override | 197 | @Override |
| 186 | public void unableToAssertRole(DeviceId deviceId, MastershipRole role) { | 198 | public void unableToAssertRole(DeviceId deviceId, MastershipRole role) { |
| 187 | - // FIXME: add fixture core when tests are done on this | 199 | + roles.put(role, Dpid.dpid(deviceId.uri())); |
| 188 | } | 200 | } |
| 189 | 201 | ||
| 190 | } | 202 | } | ... | ... |
-
Please register or login to post a comment