Removed patch path since changes have been merged upstream to a different path. Updated README with directions.

Change-Id: Ie419abd2d3d3ef7315de9f607dcd757a78190995
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>

12 files changed, 0 insertions, 1656 deletions

diff --git a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/ChannelAdapter.java b/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/ChannelAdapter.java
deleted file mode 100644
index 75260a1d..00000000
--- a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/ChannelAdapter.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.openflow;
-
-import java.net.SocketAddress;
-
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelConfig;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-
-/**
- * Adapter for testing against a netty channel.
- */
-public class ChannelAdapter implements Channel {
-    @Override
-    public Integer getId() {
-        return null;
-    }
-
-    @Override
-    public ChannelFactory getFactory() {
-        return null;
-    }
-
-    @Override
-    public Channel getParent() {
-        return null;
-    }
-
-    @Override
-    public ChannelConfig getConfig() {
-        return null;
-    }
-
-    @Override
-    public ChannelPipeline getPipeline() {
-        return null;
-    }
-
-    @Override
-    public boolean isOpen() {
-        return false;
-    }
-
-    @Override
-    public boolean isBound() {
-        return false;
-    }
-
-    @Override
-    public boolean isConnected() {
-        return false;
-    }
-
-    @Override
-    public SocketAddress getLocalAddress() {
-        return null;
-    }
-
-    @Override
-    public SocketAddress getRemoteAddress() {
-        return null;
-    }
-
-    @Override
-    public ChannelFuture write(Object o) {
-        return null;
-    }
-
-    @Override
-    public ChannelFuture write(Object o, SocketAddress socketAddress) {
-        return null;
-    }
-
-    @Override
-    public ChannelFuture bind(SocketAddress socketAddress) {
-        return null;
-    }
-
-    @Override
-    public ChannelFuture connect(SocketAddress socketAddress) {
-        return null;
-    }
-
-    @Override
-    public ChannelFuture disconnect() {
-        return null;
-    }
-
-    @Override
-    public ChannelFuture unbind() {
-        return null;
-    }
-
-    @Override
-    public ChannelFuture close() {
-        return null;
-    }
-
-    @Override
-    public ChannelFuture getCloseFuture() {
-        return null;
-    }
-
-    @Override
-    public int getInterestOps() {
-        return 0;
-    }
-
-    @Override
-    public boolean isReadable() {
-        return false;
-    }
-
-    @Override
-    public boolean isWritable() {
-        return false;
-    }
-
-    @Override
-    public ChannelFuture setInterestOps(int i) {
-        return null;
-    }
-
-    @Override
-    public ChannelFuture setReadable(boolean b) {
-        return null;
-    }
-
-    @Override
-    public Object getAttachment() {
-        return null;
-    }
-
-    @Override
-    public void setAttachment(Object o) {
-
-    }
-
-    @Override
-    public int compareTo(Channel o) {
-        return 0;
-    }
-}
diff --git a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/ChannelHandlerContextAdapter.java b/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/ChannelHandlerContextAdapter.java
deleted file mode 100644
index 5b6c2a36..00000000
--- a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/ChannelHandlerContextAdapter.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.openflow;
-
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-
-/**
- * Adapter for testing against a netty channel handler context.
- */
-public class ChannelHandlerContextAdapter implements ChannelHandlerContext {
-    @Override
-    public Channel getChannel() {
-        return null;
-    }
-
-    @Override
-    public ChannelPipeline getPipeline() {
-        return null;
-    }
-
-    @Override
-    public String getName() {
-        return null;
-    }
-
-    @Override
-    public ChannelHandler getHandler() {
-        return null;
-    }
-
-    @Override
-    public boolean canHandleUpstream() {
-        return false;
-    }
-
-    @Override
-    public boolean canHandleDownstream() {
-        return false;
-    }
-
-    @Override
-    public void sendUpstream(ChannelEvent channelEvent) {
-
-    }
-
-    @Override
-    public void sendDownstream(ChannelEvent channelEvent) {
-
-    }
-
-    @Override
-    public Object getAttachment() {
-        return null;
-    }
-
-    @Override
-    public void setAttachment(Object o) {
-
-    }
-}
diff --git a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/DriverAdapter.java b/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/DriverAdapter.java
deleted file mode 100644
index 57becf94..00000000
--- a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/DriverAdapter.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.openflow;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.onosproject.net.driver.Behaviour;
-import org.onosproject.net.driver.Driver;
-import org.onosproject.net.driver.DriverData;
-import org.onosproject.net.driver.DriverHandler;
-import org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver;
-
-/**
- * Created by ray on 11/4/15.
- */
-public class DriverAdapter implements Driver {
-    @Override
-    public String name() {
-        return null;
-    }
-
-    @Override
-    public Driver parent() {
-        return null;
-    }
-
-    @Override
-    public String manufacturer() {
-        return null;
-    }
-
-    @Override
-    public String hwVersion() {
-        return null;
-    }
-
-    @Override
-    public String swVersion() {
-        return null;
-    }
-
-    @Override
-    public Set<Class<? extends Behaviour>> behaviours() {
-        return null;
-    }
-
-    @Override
-    public Class<? extends Behaviour> implementation(Class<? extends Behaviour> behaviour) {
-        return null;
-    }
-
-    @Override
-    public boolean hasBehaviour(Class<? extends Behaviour> behaviourClass) {
-        return true;
-    }
-
-    @Override
-    public <T extends Behaviour> T createBehaviour(DriverData data, Class<T> behaviourClass) {
-        return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T extends Behaviour> T createBehaviour(DriverHandler handler, Class<T> behaviourClass) {
-        if (behaviourClass == OpenFlowSwitchDriver.class) {
-            return (T) new OpenflowSwitchDriverAdapter();
-        }
-        return null;
-    }
-
-    @Override
-    public Map<String, String> properties() {
-        return null;
-    }
-
-    @Override
-    public Driver merge(Driver other) {
-        return null;
-    }
-
-    @Override
-    public Set<String> keys() {
-        return null;
-    }
-
-    @Override
-    public String value(String key) {
-        return null;
-    }
-}
diff --git a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/DriverServiceAdapter.java b/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/DriverServiceAdapter.java
deleted file mode 100644
index 25596ada..00000000
--- a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/DriverServiceAdapter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.openflow;
-
-import java.util.Set;
-
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.driver.Behaviour;
-import org.onosproject.net.driver.Driver;
-import org.onosproject.net.driver.DriverHandler;
-import org.onosproject.net.driver.DriverService;
-
-/**
- * Created by ray on 11/4/15.
- */
-public class DriverServiceAdapter implements DriverService {
-    @Override
-    public Set<Driver> getDrivers() {
-        return null;
-    }
-
-    @Override
-    public Set<Driver> getDrivers(Class<? extends Behaviour> withBehaviour) {
-        return null;
-    }
-
-    @Override
-    public Driver getDriver(String mfr, String hw, String sw) {
-        return null;
-    }
-
-    @Override
-    public Driver getDriver(DeviceId deviceId) {
-        return null;
-    }
-
-    @Override
-    public DriverHandler createHandler(DeviceId deviceId, String... credentials) {
-        return null;
-    }
-
-    @Override
-    public Driver getDriver(String driverName) {
-        return null;
-    }
-}
diff --git a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/OFDescStatsReplyAdapter.java b/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/OFDescStatsReplyAdapter.java
deleted file mode 100644
index 1e866413..00000000
--- a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/OFDescStatsReplyAdapter.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.openflow;
-
-import java.util.Set;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
-import org.projectfloodlight.openflow.protocol.OFStatsReplyFlags;
-import org.projectfloodlight.openflow.protocol.OFStatsType;
-import org.projectfloodlight.openflow.protocol.OFType;
-import org.projectfloodlight.openflow.protocol.OFVersion;
-
-import com.google.common.hash.PrimitiveSink;
-
-/**
- * Created by ray on 11/4/15.
- */
-public class OFDescStatsReplyAdapter implements OFDescStatsReply {
-    @Override
-    public OFVersion getVersion() {
-        return null;
-    }
-
-    @Override
-    public OFType getType() {
-        return null;
-    }
-
-    @Override
-    public long getXid() {
-        return 0;
-    }
-
-    @Override
-    public OFStatsType getStatsType() {
-        return null;
-    }
-
-    @Override
-    public Set<OFStatsReplyFlags> getFlags() {
-        return null;
-    }
-
-    @Override
-    public String getMfrDesc() {
-        return null;
-    }
-
-    @Override
-    public String getHwDesc() {
-        return null;
-    }
-
-    @Override
-    public String getSwDesc() {
-        return null;
-    }
-
-    @Override
-    public String getSerialNum() {
-        return null;
-    }
-
-    @Override
-    public String getDpDesc() {
-        return null;
-    }
-
-    @Override
-    public void writeTo(ChannelBuffer channelBuffer) {
-
-    }
-
-    @Override
-    public Builder createBuilder() {
-        return null;
-    }
-
-    @Override
-    public void putTo(PrimitiveSink sink) {
-
-    }
-}
diff --git a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/OfMessageAdapter.java b/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/OfMessageAdapter.java
deleted file mode 100644
index e9b38e3a..00000000
--- a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/OfMessageAdapter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.openflow;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.projectfloodlight.openflow.protocol.OFMessage;
-import org.projectfloodlight.openflow.protocol.OFType;
-import org.projectfloodlight.openflow.protocol.OFVersion;
-
-import com.google.common.hash.PrimitiveSink;
-
-/**
- * Adapter for testing against an OpenFlow message.
- */
-public class OfMessageAdapter implements OFMessage {
-    @Override
-    public OFVersion getVersion() {
-        return null;
-    }
-
-    @Override
-    public OFType getType() {
-        return null;
-    }
-
-    @Override
-    public long getXid() {
-        return 0;
-    }
-
-    @Override
-    public void writeTo(ChannelBuffer channelBuffer) { }
-
-    @Override
-    public Builder createBuilder() {
-        return null;
-    }
-
-    @Override
-    public void putTo(PrimitiveSink sink) { }
-}
diff --git a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/OpenflowSwitchDriverAdapter.java b/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/OpenflowSwitchDriverAdapter.java
deleted file mode 100644
index 9b899a67..00000000
--- a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/OpenflowSwitchDriverAdapter.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.openflow;
-
-import java.util.List;
-
-import org.jboss.netty.channel.Channel;
-import org.onosproject.net.Device;
-import org.onosproject.net.driver.DriverData;
-import org.onosproject.net.driver.DriverHandler;
-import org.onosproject.openflow.controller.Dpid;
-import org.onosproject.openflow.controller.RoleState;
-import org.onosproject.openflow.controller.driver.OpenFlowAgent;
-import org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver;
-import org.onosproject.openflow.controller.driver.RoleHandler;
-import org.onosproject.openflow.controller.driver.SwitchStateException;
-import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
-import org.projectfloodlight.openflow.protocol.OFErrorMsg;
-import org.projectfloodlight.openflow.protocol.OFFactories;
-import org.projectfloodlight.openflow.protocol.OFFactory;
-import org.projectfloodlight.openflow.protocol.OFFeaturesReply;
-import org.projectfloodlight.openflow.protocol.OFMessage;
-import org.projectfloodlight.openflow.protocol.OFPortDesc;
-import org.projectfloodlight.openflow.protocol.OFPortDescStatsReply;
-import org.projectfloodlight.openflow.protocol.OFVersion;
-
-/**
- * Testing adapter for the OpenFlow switch driver class.
- */
-public class OpenflowSwitchDriverAdapter implements OpenFlowSwitchDriver {
-
-    RoleState role = RoleState.MASTER;
-
-    @Override
-    public void setAgent(OpenFlowAgent agent) {
-
-    }
-
-    @Override
-    public void setRoleHandler(RoleHandler roleHandler) {
-
-    }
-
-    @Override
-    public void reassertRole() {
-
-    }
-
-    @Override
-    public boolean handleRoleError(OFErrorMsg error) {
-        return false;
-    }
-
-    @Override
-    public void handleNiciraRole(OFMessage m) throws SwitchStateException {
-
-    }
-
-    @Override
-    public void handleRole(OFMessage m) throws SwitchStateException {
-
-    }
-
-    @Override
-    public boolean connectSwitch() {
-        return false;
-    }
-
-    @Override
-    public boolean activateMasterSwitch() {
-        return false;
-    }
-
-    @Override
-    public boolean activateEqualSwitch() {
-        return false;
-    }
-
-    @Override
-    public void transitionToEqualSwitch() {
-
-    }
-
-    @Override
-    public void transitionToMasterSwitch() {
-
-    }
-
-    @Override
-    public void removeConnectedSwitch() {
-
-    }
-
-    @Override
-    public void setPortDescReply(OFPortDescStatsReply portDescReply) {
-
-    }
-
-    @Override
-    public void setPortDescReplies(List<OFPortDescStatsReply> portDescReplies) {
-
-    }
-
-    @Override
-    public void setFeaturesReply(OFFeaturesReply featuresReply) {
-
-    }
-
-    @Override
-    public void setSwitchDescription(OFDescStatsReply desc) {
-
-    }
-
-    @Override
-    public int getNextTransactionId() {
-        return 0;
-    }
-
-    @Override
-    public void setOFVersion(OFVersion ofV) {
-
-    }
-
-    @Override
-    public void setTableFull(boolean full) {
-
-    }
-
-    @Override
-    public void setChannel(Channel channel) {
-
-    }
-
-    @Override
-    public void setConnected(boolean connected) {
-
-    }
-
-    @Override
-    public void init(Dpid dpid, OFDescStatsReply desc, OFVersion ofv) {
-
-    }
-
-    @Override
-    public Boolean supportNxRole() {
-        return true;
-    }
-
-    @Override
-    public void startDriverHandshake() {
-
-    }
-
-    @Override
-    public boolean isDriverHandshakeComplete() {
-        return false;
-    }
-
-    @Override
-    public void processDriverHandshakeMessage(OFMessage m) {
-
-    }
-
-    @Override
-    public void sendRoleRequest(OFMessage message) {
-
-    }
-
-    @Override
-    public void sendHandshakeMessage(OFMessage message) {
-
-    }
-
-    @Override
-    public DriverHandler handler() {
-        return null;
-    }
-
-    @Override
-    public void setHandler(DriverHandler handler) {
-
-    }
-
-    @Override
-    public DriverData data() {
-        return null;
-    }
-
-    @Override
-    public void setData(DriverData data) {
-
-    }
-
-    @Override
-    public void sendMsg(OFMessage msg) {
-
-    }
-
-    @Override
-    public void sendMsg(List<OFMessage> msgs) {
-
-    }
-
-    @Override
-    public void handleMessage(OFMessage fromSwitch) {
-
-    }
-
-    @Override
-    public void setRole(RoleState role) {
-        this.role = role;
-    }
-
-    @Override
-    public RoleState getRole() {
-        return role;
-    }
-
-    @Override
-    public List<OFPortDesc> getPorts() {
-        return null;
-    }
-
-    @Override
-    public OFFactory factory() {
-        // return what-ever triggers requestPending = true
-        return OFFactories.getFactory(OFVersion.OF_10);
-    }
-
-    @Override
-    public String getStringId() {
-        return "100";
-    }
-
-    @Override
-    public long getId() {
-        return 0;
-    }
-
-    @Override
-    public String manufacturerDescription() {
-        return null;
-    }
-
-    @Override
-    public String datapathDescription() {
-        return null;
-    }
-
-    @Override
-    public String hardwareDescription() {
-        return null;
-    }
-
-    @Override
-    public String softwareDescription() {
-        return null;
-    }
-
-    @Override
-    public String serialNumber() {
-        return null;
-    }
-
-    @Override
-    public boolean isConnected() {
-        return false;
-    }
-
-    @Override
-    public void disconnectSwitch() {
-
-    }
-
-    @Override
-    public void returnRoleReply(RoleState requested, RoleState response) {
-
-    }
-
-    @Override
-    public Device.Type deviceType() {
-        return Device.Type.SWITCH;
-    }
-
-    @Override
-    public String channelId() {
-        return null;
-    }
-}
diff --git a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/ControllerTest.java b/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/ControllerTest.java
deleted file mode 100644
index 3ff3bde5..00000000
--- a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/ControllerTest.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.openflow.controller.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.stream.IntStream;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.onlab.junit.TestTools;
-import org.onlab.util.ItemNotFoundException;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.driver.Driver;
-import org.onosproject.openflow.DriverAdapter;
-import org.onosproject.openflow.DriverServiceAdapter;
-import org.onosproject.openflow.OFDescStatsReplyAdapter;
-import org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver;
-import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.io.Files;
-
-import static com.google.common.io.ByteStreams.toByteArray;
-import static com.google.common.io.Files.write;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.lessThan;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-
-/**
- * Unit tests for the OpenFlow controller class.
- */
-public class ControllerTest {
-
-    Controller controller;
-    protected static final Logger log = LoggerFactory.getLogger(ControllerTest.class);
-
-    static final File TEST_DIR = Files.createTempDir();
-
-    /*
-     * Writes the necessary file for the tests in the temporary directory
-     */
-    static File stageTestResource(String name) throws IOException {
-        File file = new File(TEST_DIR, name);
-        byte[] bytes = toByteArray(ControllerTest.class.getResourceAsStream(name));
-        write(bytes, file);
-        return file;
-    }
-
-    class MockDriverService extends DriverServiceAdapter {
-        static final int NO_SUCH_DRIVER_ID = 1;
-        static final int ITEM_NOT_FOUND_DRIVER_ID = 2;
-        static final int DRIVER_EXISTS_ID = 3;
-
-        static final String BASE_DRIVER_NAME = "of:000000000000000";
-
-        static final String NO_SUCH_DRIVER = BASE_DRIVER_NAME
-                + NO_SUCH_DRIVER_ID;
-        static final String ITEM_NOT_FOUND_DRIVER = BASE_DRIVER_NAME
-                + ITEM_NOT_FOUND_DRIVER_ID;
-        static final String DRIVER_EXISTS = BASE_DRIVER_NAME
-                + DRIVER_EXISTS_ID;
-
-        @Override
-        public Driver getDriver(DeviceId deviceId) {
-            switch (deviceId.toString()) {
-                case NO_SUCH_DRIVER:
-                    return null;
-                case ITEM_NOT_FOUND_DRIVER:
-                    throw new ItemNotFoundException();
-                case DRIVER_EXISTS:
-                    return new DriverAdapter();
-                default:
-                    throw new AssertionError();
-            }
-        }
-    }
-
-    /**
-     * Creates and initializes a new controller.
-     */
-    @Before
-    public void setUp() {
-        controller = new Controller();
-        Dictionary<String, String> properties = new Hashtable<>();
-        properties.put("openflowPorts",
-                       Integer.toString(TestTools.findAvailablePort(0)));
-        controller.setConfigParams(properties);
-    }
-
-    /**
-     * Tests fetching a driver that does not exist.
-     */
-    @Test
-    public void switchInstanceNotFoundTest() {
-        controller.start(null, new MockDriverService());
-        OpenFlowSwitchDriver driver =
-                controller.getOFSwitchInstance(MockDriverService.NO_SUCH_DRIVER_ID,
-                                               null,
-                                               null);
-        assertThat(driver, nullValue());
-        controller.stop();
-    }
-
-    /**
-     * Tests fetching a driver that throws an ItemNotFoundException.
-     */
-    @Test
-    public void switchItemNotFoundTest() {
-        controller.start(null, new MockDriverService());
-        OFDescStatsReply stats =
-                new OFDescStatsReplyAdapter();
-        OpenFlowSwitchDriver driver =
-                controller.getOFSwitchInstance(MockDriverService.ITEM_NOT_FOUND_DRIVER_ID,
-                                               stats,
-                                               null);
-        assertThat(driver, nullValue());
-        controller.stop();
-    }
-
-    /**
-     * Tests fetching a driver that throws an ItemNotFoundException.
-     */
-    @Test
-    public void driverExistsTest() {
-        controller.start(null, new MockDriverService());
-        OFDescStatsReply stats =
-                new OFDescStatsReplyAdapter();
-        OpenFlowSwitchDriver driver =
-                controller.getOFSwitchInstance(MockDriverService.DRIVER_EXISTS_ID,
-                                               stats,
-                                               null);
-        assertThat(driver, notNullValue());
-        controller.stop();
-    }
-
-    /**
-     * Tests configuring the controller.
-     */
-    @Test
-    public void testConfiguration() {
-        Dictionary<String, String> properties = new Hashtable<>();
-        properties.put("openflowPorts", "1,2,3,4,5");
-        properties.put("workerThreads", "5");
-
-        controller.setConfigParams(properties);
-        IntStream.rangeClosed(1, 5)
-                .forEach(i -> assertThat(controller.openFlowPorts, hasItem(i)));
-        assertThat(controller.workerThreads, is(5));
-    }
-
-    /**
-     * Tests the SSL/TLS methods in the controller.
-     */
-    @Test
-    public void testSsl() throws IOException {
-        File keystore = stageTestResource("ControllerTestKeystore.jks");
-        String keystoreName = keystore.getAbsolutePath();
-
-        System.setProperty("enableOFTLS", Boolean.toString(Boolean.TRUE));
-        System.setProperty("javax.net.ssl.keyStore", keystoreName);
-        System.setProperty("javax.net.ssl.trustStore", keystoreName);
-        System.setProperty("javax.net.ssl.keyStorePassword", "password");
-        System.setProperty("javax.net.ssl.trustStorePassword", "password");
-        Dictionary<String, String> properties = new Hashtable<>();
-        properties.put("openflowPorts",
-                       Integer.toString(TestTools.findAvailablePort(0)));
-        properties.put("workerThreads", "0");
-
-        controller.setConfigParams(properties);
-        controller.start(null, new MockDriverService());
-
-        assertThat(controller.serverSSLEngine, notNullValue());
-
-        controller.stop();
-        boolean removed = keystore.delete();
-        if (!removed) {
-            log.warn("Could not remove temporary file");
-        }
-    }
-
-    /**
-     * Tests controll utility health methods.
-     */
-    @Test
-    public void testHealth() {
-        Map<String, Long> memory = controller.getMemory();
-        assertThat(memory.size(), is(2));
-        assertThat(memory.get("total"), is(not(0)));
-        assertThat(memory.get("free"), is(not(0)));
-
-        long startTime = controller.getSystemStartTime();
-        assertThat(startTime, lessThan(System.currentTimeMillis()));
-
-        long upTime = controller.getSystemUptime();
-        assertThat(upTime, lessThan(30L * 1000));
-    }
-}
diff --git a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageDecoderTest.java b/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageDecoderTest.java
deleted file mode 100644
index ed1db238..00000000
--- a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageDecoderTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.openflow.controller.impl;
-
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.junit.Test;
-import org.onosproject.openflow.ChannelAdapter;
-import org.onosproject.openflow.ChannelHandlerContextAdapter;
-import org.projectfloodlight.openflow.protocol.OFHello;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-
-/**
- * Tests for the OpenFlow message decoder.
- */
-public class OFMessageDecoderTest {
-
-    static class ConnectedChannel extends ChannelAdapter {
-        @Override
-        public boolean isConnected() {
-            return true;
-        }
-    }
-
-    private ChannelBuffer getHelloMessageBuffer() {
-        // OFHello, OF version 1, xid of 0, total of 8 bytes
-        byte[] messageData = {0x1, 0x0, 0x0, 0x8, 0x0, 0x0, 0x0, 0x0};
-        ChannelBuffer channelBuffer = ChannelBuffers.dynamicBuffer();
-        channelBuffer.writeBytes(messageData);
-        return channelBuffer;
-    }
-
-    /**
-     * Tests decoding a message on a closed channel.
-     *
-     * @throws Exception when an exception is thrown from the decoder
-     */
-    @Test
-    public void testDecodeNoChannel() throws Exception {
-        OFMessageDecoder decoder = new OFMessageDecoder();
-        ChannelBuffer channelBuffer = getHelloMessageBuffer();
-        Object message =
-                decoder.decode(new ChannelHandlerContextAdapter(),
-                               new ChannelAdapter(),
-                               channelBuffer);
-        assertThat(message, nullValue());
-    }
-
-    /**
-     * Tests decoding a message.
-     *
-     * @throws Exception when an exception is thrown from the decoder
-     */
-    @Test
-    public void testDecode() throws Exception {
-        OFMessageDecoder decoder = new OFMessageDecoder();
-        ChannelBuffer channelBuffer = getHelloMessageBuffer();
-        Object message =
-                decoder.decode(new ChannelHandlerContextAdapter(),
-                               new ConnectedChannel(),
-                               channelBuffer);
-        assertThat(message, notNullValue());
-        assertThat(message, instanceOf(OFHello.class));
-    }
-
-}
diff --git a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageEncoderTest.java b/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageEncoderTest.java
deleted file mode 100644
index 59685f16..00000000
--- a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageEncoderTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.openflow.controller.impl;
-
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.junit.Test;
-import org.onosproject.openflow.OfMessageAdapter;
-import org.projectfloodlight.openflow.protocol.OFMessage;
-
-import com.google.common.collect.ImmutableList;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-
-/**
- * Tests for the OpenFlow message encoder.
- */
-public class OFMessageEncoderTest {
-
-    static class MockOfMessage extends OfMessageAdapter {
-        static int nextId = 1;
-        final int id;
-
-        MockOfMessage() {
-            id = nextId++;
-        }
-
-        @Override
-        public void writeTo(ChannelBuffer channelBuffer) {
-            String message = "message" + Integer.toString(id) + " ";
-            channelBuffer.writeBytes(message.getBytes(StandardCharsets.UTF_8));
-        }
-    }
-
-    /**
-     * Tests that encoding a non-list returns the object specified.
-     *
-     * @throws Exception on exception in the encoder
-     */
-    @Test
-    public void testNoList() throws Exception {
-        OFMessageEncoder encoder = new OFMessageEncoder();
-        MockOfMessage message = new MockOfMessage();
-        OFMessage returnedMessage =
-                (OFMessage) encoder.encode(null, null, message);
-        assertThat(message, is(returnedMessage));
-    }
-
-    /**
-     * Tests that encoding a list returns the proper encoded payload.
-     *
-     * @throws Exception on exception in the encoder
-     */
-    @Test
-    public void testList() throws Exception {
-        OFMessageEncoder encoder = new OFMessageEncoder();
-        MockOfMessage message1 = new MockOfMessage();
-        MockOfMessage message2 = new MockOfMessage();
-        MockOfMessage message3 = new MockOfMessage();
-        List<MockOfMessage> messages = ImmutableList.of(message1, message2, message3);
-        ChannelBuffer returnedChannel =
-                (ChannelBuffer) encoder.encode(null, null, messages);
-        assertThat(returnedChannel, notNullValue());
-        byte[] channelBytes = returnedChannel.array();
-        String expectedListMessage = "message1 message2 message3 ";
-        String listMessage =
-                (new String(channelBytes, StandardCharsets.UTF_8))
-                        .substring(0, expectedListMessage.length());
-        assertThat(listMessage, is(expectedListMessage));
-    }
-}
diff --git a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplTest.java b/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplTest.java
deleted file mode 100644
index e079c590..00000000
--- a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplTest.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.openflow.controller.impl;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import org.easymock.EasyMock;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onlab.junit.TestTools;
-import org.onosproject.cfg.ComponentConfigService;
-import org.onosproject.openflow.OpenflowSwitchDriverAdapter;
-import org.onosproject.openflow.controller.Dpid;
-import org.onosproject.openflow.controller.OpenFlowSwitch;
-import org.onosproject.openflow.controller.OpenFlowSwitchListener;
-import org.onosproject.openflow.controller.RoleState;
-import org.osgi.service.component.ComponentContext;
-import org.projectfloodlight.openflow.protocol.OFPortStatus;
-
-import com.google.common.collect.ImmutableSet;
-
-import static junit.framework.TestCase.fail;
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-
-/**
- * Unit tests for the open flow controller implementation test.
- */
-public class OpenFlowControllerImplTest {
-
-    OpenFlowSwitch switch1;
-    Dpid dpid1;
-    OpenFlowSwitch switch2;
-    Dpid dpid2;
-    OpenFlowSwitch switch3;
-    Dpid dpid3;
-
-    OpenFlowControllerImpl controller;
-    OpenFlowControllerImpl.OpenFlowSwitchAgent agent;
-    TestSwitchListener switchListener;
-
-    /**
-     * Test harness for a switch listener.
-     */
-    static class TestSwitchListener implements OpenFlowSwitchListener {
-        final List<Dpid> removedDpids = new ArrayList<>();
-        final List<Dpid> addedDpids = new ArrayList<>();
-        final List<Dpid> changedDpids = new ArrayList<>();
-
-        @Override
-        public void switchAdded(Dpid dpid) {
-            addedDpids.add(dpid);
-        }
-
-        @Override
-        public void switchRemoved(Dpid dpid) {
-            removedDpids.add(dpid);
-        }
-
-        @Override
-        public void switchChanged(Dpid dpid) {
-            changedDpids.add(dpid);
-        }
-
-        @Override
-        public void portChanged(Dpid dpid, OFPortStatus status) {
-            // Stub
-        }
-
-        @Override
-        public void receivedRoleReply(Dpid dpid, RoleState requested, RoleState response) {
-            // Stub
-        }
-    }
-
-
-    /**
-     * Sets up switches to use as data, mocks and launches a controller instance.
-     */
-    @Before
-    public void setUp() {
-        try {
-            switch1 = new OpenflowSwitchDriverAdapter();
-            dpid1 = Dpid.dpid(new URI("of:0000000000000111"));
-            switch2 = new OpenflowSwitchDriverAdapter();
-            dpid2 = Dpid.dpid(new URI("of:0000000000000222"));
-            switch3 = new OpenflowSwitchDriverAdapter();
-            dpid3 = Dpid.dpid(new URI("of:0000000000000333"));
-        } catch (URISyntaxException ex) {
-            //  Does not happen
-            fail();
-        }
-
-        controller = new OpenFlowControllerImpl();
-        agent = controller.agent;
-
-        switchListener = new TestSwitchListener();
-        controller.addListener(switchListener);
-
-        ComponentConfigService mockConfigService =
-                EasyMock.createMock(ComponentConfigService.class);
-        expect(mockConfigService.getProperties(anyObject())).andReturn(ImmutableSet.of());
-        mockConfigService.registerProperties(controller.getClass());
-        expectLastCall();
-        mockConfigService.unregisterProperties(controller.getClass(), false);
-        expectLastCall();
-        expect(mockConfigService.getProperties(anyObject())).andReturn(ImmutableSet.of());
-        controller.cfgService = mockConfigService;
-        replay(mockConfigService);
-
-        ComponentContext mockContext = EasyMock.createMock(ComponentContext.class);
-        Dictionary<String, String> properties = new Hashtable<>();
-        properties.put("openflowPorts",
-                       Integer.toString(TestTools.findAvailablePort(0)));
-        expect(mockContext.getProperties()).andReturn(properties);
-        replay(mockContext);
-        controller.activate(mockContext);
-    }
-
-    @After
-    public void tearDown() {
-        controller.removeListener(switchListener);
-        controller.deactivate();
-    }
-
-    /**
-     * Converts an Iterable of some type into a stream of that type.
-     *
-     * @param items Iterable of objects
-     * @param <T> type of the items in the iterable
-     * @return stream of objects of type T
-     */
-    private <T> Stream<T> makeIntoStream(Iterable<T> items) {
-        return StreamSupport.stream(
-                Spliterators.spliteratorUnknownSize(
-                        items.iterator(), Spliterator.ORDERED), false);
-    }
-
-
-    /**
-     * Tests adding and removing connected switches.
-     */
-    @Test
-    public void testAddRemoveConnectedSwitch() {
-
-        // test adding connected switches
-        boolean addSwitch1 = agent.addConnectedSwitch(dpid1, switch1);
-        assertThat(addSwitch1, is(true));
-        boolean addSwitch2 = agent.addConnectedSwitch(dpid2, switch2);
-        assertThat(addSwitch2, is(true));
-        boolean addSwitch3 = agent.addConnectedSwitch(dpid3, switch3);
-        assertThat(addSwitch3, is(true));
-
-        // Make sure the listener add callbacks fired
-        assertThat(switchListener.addedDpids, hasSize(3));
-        assertThat(switchListener.addedDpids, hasItems(dpid1, dpid2, dpid3));
-
-        // Test adding a switch twice - it should fail
-        boolean addBadSwitch1 = agent.addConnectedSwitch(dpid1, switch1);
-        assertThat(addBadSwitch1, is(false));
-
-        assertThat(controller.connectedSwitches.size(), is(3));
-
-        // test querying the switch list
-        Stream<OpenFlowSwitch> fetchedSwitches =
-                makeIntoStream(controller.getSwitches());
-        long switchCount = fetchedSwitches.count();
-        assertThat(switchCount, is(3L));
-
-        // test querying the individual switch
-        OpenFlowSwitch queriedSwitch = controller.getSwitch(dpid1);
-        assertThat(queriedSwitch, is(switch1));
-
-        // Remove a switch
-        agent.removeConnectedSwitch(dpid3);
-        Stream<OpenFlowSwitch> fetchedSwitchesAfterRemove =
-                makeIntoStream(controller.getSwitches());
-        long switchCountAfterRemove = fetchedSwitchesAfterRemove.count();
-        assertThat(switchCountAfterRemove, is(2L));
-
-        // Make sure the listener delete callbacks fired
-        assertThat(switchListener.removedDpids, hasSize(1));
-        assertThat(switchListener.removedDpids, hasItems(dpid3));
-
-        // test querying the removed switch
-        OpenFlowSwitch queriedSwitchAfterRemove = controller.getSwitch(dpid3);
-        assertThat(queriedSwitchAfterRemove, nullValue());
-    }
-
-    /**
-     * Tests adding master switches.
-     */
-    @Test
-    public void testMasterSwitch() {
-        agent.addConnectedSwitch(dpid1, switch1);
-        agent.transitionToMasterSwitch(dpid1);
-
-        Stream<OpenFlowSwitch> fetchedMasterSwitches =
-                makeIntoStream(controller.getMasterSwitches());
-        assertThat(fetchedMasterSwitches.count(), is(1L));
-        Stream<OpenFlowSwitch> fetchedActivatedSwitches =
-                makeIntoStream(controller.getEqualSwitches());
-        assertThat(fetchedActivatedSwitches.count(), is(0L));
-        OpenFlowSwitch fetchedSwitch1 = controller.getMasterSwitch(dpid1);
-        assertThat(fetchedSwitch1, is(switch1));
-
-        agent.addConnectedSwitch(dpid2, switch2);
-        boolean addSwitch2 = agent.addActivatedMasterSwitch(dpid2, switch2);
-        assertThat(addSwitch2, is(true));
-        OpenFlowSwitch fetchedSwitch2 = controller.getMasterSwitch(dpid2);
-        assertThat(fetchedSwitch2, is(switch2));
-    }
-
-    /**
-     * Tests adding equal switches.
-     */
-    @Test
-    public void testEqualSwitch() {
-        agent.addConnectedSwitch(dpid1, switch1);
-        agent.transitionToEqualSwitch(dpid1);
-
-        Stream<OpenFlowSwitch> fetchedEqualSwitches =
-                makeIntoStream(controller.getEqualSwitches());
-        assertThat(fetchedEqualSwitches.count(), is(1L));
-        Stream<OpenFlowSwitch> fetchedActivatedSwitches =
-                makeIntoStream(controller.getMasterSwitches());
-        assertThat(fetchedActivatedSwitches.count(), is(0L));
-        OpenFlowSwitch fetchedSwitch1 = controller.getEqualSwitch(dpid1);
-        assertThat(fetchedSwitch1, is(switch1));
-
-        agent.addConnectedSwitch(dpid2, switch2);
-        boolean addSwitch2 = agent.addActivatedEqualSwitch(dpid2, switch2);
-        assertThat(addSwitch2, is(true));
-        OpenFlowSwitch fetchedSwitch2 = controller.getEqualSwitch(dpid2);
-        assertThat(fetchedSwitch2, is(switch2));
-    }
-
-    /**
-     * Tests changing switch role.
-     */
-    @Test
-    public void testRoleSetting() {
-        agent.addConnectedSwitch(dpid2, switch2);
-
-        // check that state can be changed for a connected switch
-        assertThat(switch2.getRole(), is(RoleState.MASTER));
-        controller.setRole(dpid2, RoleState.EQUAL);
-        assertThat(switch2.getRole(), is(RoleState.EQUAL));
-
-        // check that changing state on an unconnected switch does not crash
-        controller.setRole(dpid3, RoleState.SLAVE);
-    }
-}
diff --git a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java b/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java
deleted file mode 100644
index 4b594383..00000000
--- a/framework/src/onos/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2014-2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.openflow.controller.impl;
-
-import java.io.IOException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onosproject.openflow.OpenflowSwitchDriverAdapter;
-import org.onosproject.openflow.controller.RoleState;
-import org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver;
-import org.onosproject.openflow.controller.driver.RoleRecvStatus;
-import org.onosproject.openflow.controller.driver.RoleReplyInfo;
-import org.onosproject.openflow.controller.driver.SwitchStateException;
-import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
-import org.projectfloodlight.openflow.protocol.OFFeaturesReply;
-import org.projectfloodlight.openflow.types.U64;
-
-import static org.junit.Assert.assertEquals;
-import static org.onosproject.openflow.controller.RoleState.MASTER;
-import static org.onosproject.openflow.controller.RoleState.SLAVE;
-import static org.onosproject.openflow.controller.driver.RoleRecvStatus.MATCHED_CURRENT_ROLE;
-import static org.onosproject.openflow.controller.driver.RoleRecvStatus.OTHER_EXPECTATION;
-
-public class RoleManagerTest {
-
-    private static final U64 GID = U64.of(10L);
-    private static final long XID = 1L;
-
-    private OpenFlowSwitchDriver sw;
-    private RoleManager manager;
-
-    @Before
-    public void setUp() {
-        sw = new TestSwitchDriver();
-        manager = new RoleManager(sw);
-    }
-
-    @After
-    public void tearDown() {
-        manager = null;
-        sw = null;
-    }
-
-    @Test
-    public void deliverRoleReply() {
-        RoleRecvStatus status;
-
-        RoleReplyInfo asserted = new RoleReplyInfo(MASTER, GID, XID);
-        RoleReplyInfo unasserted = new RoleReplyInfo(SLAVE, GID, XID);
-
-        try {
-            //call without sendRoleReq() for requestPending = false
-            //first, sw.role == null
-            status = manager.deliverRoleReply(asserted);
-            assertEquals("expectation wrong", OTHER_EXPECTATION, status);
-
-            sw.setRole(MASTER);
-            assertEquals("expectation wrong", OTHER_EXPECTATION, status);
-            sw.setRole(SLAVE);
-
-            //match to pendingRole = MASTER, requestPending = true
-            manager.sendRoleRequest(MASTER, MATCHED_CURRENT_ROLE);
-            status = manager.deliverRoleReply(asserted);
-            assertEquals("expectation wrong", MATCHED_CURRENT_ROLE, status);
-
-            //requestPending never gets reset -- this might be a bug.
-            status = manager.deliverRoleReply(unasserted);
-            assertEquals("expectation wrong", OTHER_EXPECTATION, status);
-            assertEquals("pending role mismatch", MASTER, ((TestSwitchDriver) sw).failed);
-
-        } catch (IOException | SwitchStateException e) {
-            assertEquals("unexpected error thrown",
-                    SwitchStateException.class, e.getClass());
-        }
-    }
-
-    private class TestSwitchDriver extends OpenflowSwitchDriverAdapter {
-
-        RoleState failed = null;
-        RoleState current = null;
-
-        @Override
-        public void setRole(RoleState role) {
-            current = role;
-        }
-
-        @Override
-        public RoleState getRole() {
-            return current;
-        }
-
-        @Override
-        public void setFeaturesReply(OFFeaturesReply featuresReply) {
-        }
-
-        @Override
-        public void setSwitchDescription(OFDescStatsReply desc) {
-        }
-
-        @Override
-        public int getNextTransactionId() {
-            return (int) XID;
-        }
-
-        @Override
-        public void returnRoleReply(RoleState requested, RoleState response) {
-            failed = requested;
-        }
-
-        @Override
-        public String channelId() {
-            return "1.2.3.4:1";
-        }
-    }
-}