onos commit hash c2999f30c69e50df905a9d175ef80b3f23a98514

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

7 files changed, 0 insertions, 1031 deletions

diff --git a/framework/src/onos/ovsdb/ctl/pom.xml b/framework/src/onos/ovsdb/ctl/pom.xml
deleted file mode 100644
index b8366296..00000000
--- a/framework/src/onos/ovsdb/ctl/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.onosproject</groupId>
-        <artifactId>onos-ovsdb</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>onos-ovsdb-ctl</artifactId>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr.annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-ovsdb-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-ovsdb-rfc</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/ChannelConnectionListener.java b/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/ChannelConnectionListener.java
deleted file mode 100644
index f17c25f7..00000000
--- a/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/ChannelConnectionListener.java
+++ /dev/null
@@ -1,43 +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.ovsdb.controller.impl;
-
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-
-import org.onosproject.ovsdb.controller.driver.OvsdbProviderService;
-
-/**
- * The listener class. Handles when the node disconnect.
- */
-public class ChannelConnectionListener implements ChannelFutureListener {
-
-    private final OvsdbProviderService providerService;
-
-    /**
-     * Constructor from a OvsdbProviderService providerService.
-     *
-     * @param providerService the providerService to use
-     */
-    public ChannelConnectionListener(OvsdbProviderService providerService) {
-        this.providerService = providerService;
-    }
-
-    @Override
-    public void operationComplete(ChannelFuture arg0) {
-        providerService.nodeRemoved();
-    }
-}
diff --git a/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/Controller.java b/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/Controller.java
deleted file mode 100644
index fcbbff8e..00000000
--- a/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/Controller.java
+++ /dev/null
@@ -1,299 +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.ovsdb.controller.impl;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelOption;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.EventLoop;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.ServerChannel;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.handler.codec.string.StringEncoder;
-import io.netty.handler.timeout.IdleState;
-import io.netty.handler.timeout.IdleStateEvent;
-import io.netty.handler.timeout.IdleStateHandler;
-import io.netty.util.CharsetUtil;
-
-import java.net.InetSocketAddress;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.TpPort;
-import org.onosproject.ovsdb.controller.OvsdbConstant;
-import org.onosproject.ovsdb.controller.OvsdbNodeId;
-import org.onosproject.ovsdb.controller.driver.DefaultOvsdbClient;
-import org.onosproject.ovsdb.controller.driver.OvsdbAgent;
-import org.onosproject.ovsdb.controller.driver.OvsdbProviderService;
-import org.onosproject.ovsdb.rfc.jsonrpc.Callback;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The main controller class. Handles all setup and network listeners -
- * distributed OVSDBClient.
- */
-public class Controller {
-    protected static final Logger log = LoggerFactory
-            .getLogger(Controller.class);
-
-    private int ovsdbPort = OvsdbConstant.OVSDBPORT;
-
-    private OvsdbAgent agent;
-    private Callback monitorCallback;
-
-    private final ExecutorService executorService = Executors
-            .newFixedThreadPool(10);
-
-    private EventLoopGroup bossGroup;
-    private EventLoopGroup workerGroup;
-    private Class<? extends ServerChannel> serverChannelClass;
-
-    private static final int MAX_RETRY = 5;
-    private static final int IDLE_TIMEOUT_SEC = 10;
-
-    /**
-     * Initialization.
-     */
-    private void initEventLoopGroup() {
-        bossGroup = new NioEventLoopGroup();
-        workerGroup = new NioEventLoopGroup();
-        serverChannelClass = NioServerSocketChannel.class;
-    }
-
-    /**
-     * Accepts incoming connections.
-     */
-    private void startAcceptingConnections() throws InterruptedException {
-        ServerBootstrap b = new ServerBootstrap();
-
-        b.group(bossGroup, workerGroup).channel(serverChannelClass)
-                .childHandler(new OnosCommunicationChannelInitializer());
-        b.option(ChannelOption.SO_BACKLOG, 128);
-        b.option(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 32 * 1024);
-        b.option(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 8 * 1024);
-        b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
-        b.childOption(ChannelOption.SO_KEEPALIVE, true);
-        b.bind(ovsdbPort).sync();
-    }
-
-    /**
-     * Tells controller that we're ready to accept OVSDB node loop.
-     * @throws InterruptedException if thread is interrupted
-     */
-    public void run() throws InterruptedException {
-        initEventLoopGroup();
-        startAcceptingConnections();
-    }
-
-    /**
-     * Adds channel pipeline to handle a new connected node.
-     */
-    private class OnosCommunicationChannelInitializer
-            extends ChannelInitializer<SocketChannel> {
-        protected void initChannel(SocketChannel channel) throws Exception {
-            log.info("New channel created");
-            channel.pipeline().addLast(new StringEncoder(CharsetUtil.UTF_8));
-            channel.pipeline().addLast(new MessageDecoder());
-            handleNewNodeConnection(channel);
-
-        }
-    }
-
-    /**
-     * Handles the new connection of node.
-     *
-     * @param channel the channel to use.
-     */
-    private void handleNewNodeConnection(final Channel channel) {
-        executorService.execute(new Runnable() {
-            @Override
-            public void run() {
-                log.info("Handle new node connection");
-
-                IpAddress ipAddress = IpAddress
-                        .valueOf(((InetSocketAddress) channel.remoteAddress())
-                                .getAddress().getHostAddress());
-                long port = ((InetSocketAddress) channel.remoteAddress())
-                        .getPort();
-
-                log.info("Get connection from ip address {} : {}",
-                         ipAddress.toString(), port);
-
-                OvsdbNodeId nodeId = new OvsdbNodeId(ipAddress, port);
-                OvsdbProviderService ovsdbProviderService = getNodeInstance(nodeId,
-                                                                            agent,
-                                                                            monitorCallback,
-                                                                            channel);
-                ovsdbProviderService.setConnection(true);
-                OvsdbJsonRpcHandler ovsdbJsonRpcHandler = new OvsdbJsonRpcHandler(
-                                                                                  nodeId);
-                ovsdbJsonRpcHandler
-                        .setOvsdbProviderService(ovsdbProviderService);
-                channel.pipeline().addLast(ovsdbJsonRpcHandler);
-
-                ovsdbProviderService.nodeAdded();
-                ChannelFuture closeFuture = channel.closeFuture();
-                closeFuture
-                        .addListener(new ChannelConnectionListener(
-                                                                   ovsdbProviderService));
-            }
-        });
-    }
-
-    /**
-     * Gets an OVSDB client instance.
-     *
-     * @param nodeId data OVSDB node id
-     * @param agent OvsdbAgent
-     * @param monitorCallback Callback
-     * @param channel Channel
-     * @return OvsdbProviderService instance
-     */
-    protected OvsdbProviderService getNodeInstance(OvsdbNodeId nodeId,
-                                                   OvsdbAgent agent,
-                                                   Callback monitorCallback,
-                                                   Channel channel) {
-        OvsdbProviderService ovsdbProviderService = new DefaultOvsdbClient(
-                                                                           nodeId);
-        ovsdbProviderService.setAgent(agent);
-        ovsdbProviderService.setCallback(monitorCallback);
-        ovsdbProviderService.setChannel(channel);
-        return ovsdbProviderService;
-    }
-
-    /**
-     * Starts controller.
-     *
-     * @param agent OvsdbAgent
-     * @param monitorCallback Callback
-     */
-    public void start(OvsdbAgent agent, Callback monitorCallback) {
-        this.agent = agent;
-        this.monitorCallback = monitorCallback;
-        try {
-            this.run();
-        } catch (InterruptedException e) {
-            log.warn("Interrupted while waiting to start");
-            Thread.currentThread().interrupt();
-        }
-    }
-
-    /**
-     * Stops controller.
-     *
-     */
-    public void stop() {
-        workerGroup.shutdownGracefully();
-        bossGroup.shutdownGracefully();
-    }
-
-    /**
-     * Connect to the ovsdb server with given ip address and port number.
-     *
-     * @param ip ip address
-     * @param port port number
-     */
-    public void connect(IpAddress ip, TpPort port) {
-        ChannelFutureListener listener = new ConnectionListener(this, ip, port);
-        connectRetry(ip, port, listener);
-    }
-
-    private void connectRetry(IpAddress ip, TpPort port, ChannelFutureListener listener) {
-        try {
-            Bootstrap b = new Bootstrap();
-            b.group(workerGroup)
-                    .channel(NioSocketChannel.class)
-                    .option(ChannelOption.TCP_NODELAY, true)
-                    .handler(new ChannelInitializer<SocketChannel>() {
-
-                        @Override
-                        protected void initChannel(SocketChannel channel) throws Exception {
-                            ChannelPipeline p = channel.pipeline();
-                            p.addLast(new MessageDecoder(),
-                                      new StringEncoder(CharsetUtil.UTF_8),
-                                      new IdleStateHandler(IDLE_TIMEOUT_SEC, 0, 0),
-                                      new ConnectionHandler());
-                        }
-                    });
-            b.remoteAddress(ip.toString(), port.toInt());
-            b.connect().addListener(listener);
-        } catch (Exception e) {
-            log.warn("Connection to the ovsdb server {}:{} failed", ip.toString(), port.toString());
-        }
-    }
-
-    private class ConnectionListener implements ChannelFutureListener {
-        private Controller controller;
-        private IpAddress ip;
-        private TpPort port;
-        private AtomicInteger count = new AtomicInteger();
-
-        public ConnectionListener(Controller controller,
-                                  IpAddress ip,
-                                  TpPort port) {
-            this.controller = controller;
-            this.ip = ip;
-            this.port = port;
-        }
-
-        @Override
-        public void operationComplete(ChannelFuture channelFuture) throws Exception {
-            if (!channelFuture.isSuccess()) {
-                channelFuture.channel().close();
-
-                if (count.incrementAndGet() < MAX_RETRY) {
-                    final EventLoop loop = channelFuture.channel().eventLoop();
-
-                    loop.schedule(() -> {
-                        controller.connectRetry(this.ip, this.port, this);
-                    }, 1L, TimeUnit.SECONDS);
-                } else {
-                    log.info("Connection to the ovsdb {}:{} failed",
-                             this.ip.toString(), this.port.toString());
-                }
-            } else {
-                handleNewNodeConnection(channelFuture.channel());
-            }
-        }
-    }
-
-    private class ConnectionHandler extends ChannelDuplexHandler {
-
-        @Override
-        public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-            IdleStateEvent e = (IdleStateEvent) evt;
-
-            if (e.state() == IdleState.READER_IDLE) {
-                ctx.close();
-            }
-        }
-    }
-}
diff --git a/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/MessageDecoder.java b/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/MessageDecoder.java
deleted file mode 100644
index e0e22753..00000000
--- a/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/MessageDecoder.java
+++ /dev/null
@@ -1,55 +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.ovsdb.controller.impl;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.ByteToMessageDecoder;
-
-import java.util.List;
-
-import org.onosproject.ovsdb.rfc.jsonrpc.JsonReadContext;
-import org.onosproject.ovsdb.rfc.utils.JsonRpcReaderUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Decoder for inbound messages.
- */
-public class MessageDecoder extends ByteToMessageDecoder {
-
-    private final Logger log = LoggerFactory.getLogger(MessageDecoder.class);
-    private final JsonReadContext context = new JsonReadContext();
-
-    /**
-     * Default constructor.
-     */
-    public MessageDecoder() {
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext ctx, ByteBuf buf,
-                          List<Object> out) throws Exception {
-        log.debug("Message decoder");
-        JsonRpcReaderUtil.readToJsonNode(buf, out, context);
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext context, Throwable cause) {
-        log.error("Exception inside channel handling pipeline.", cause);
-        context.close();
-    }
-}
diff --git a/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbControllerImpl.java b/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbControllerImpl.java
deleted file mode 100644
index c2cbbf8b..00000000
--- a/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbControllerImpl.java
+++ /dev/null
@@ -1,418 +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.ovsdb.controller.impl;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.collect.ImmutableList;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Service;
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
-import org.onlab.packet.TpPort;
-import org.onosproject.ovsdb.controller.DefaultEventSubject;
-import org.onosproject.ovsdb.controller.EventSubject;
-import org.onosproject.ovsdb.controller.OvsdbClientService;
-import org.onosproject.ovsdb.controller.OvsdbConstant;
-import org.onosproject.ovsdb.controller.OvsdbController;
-import org.onosproject.ovsdb.controller.OvsdbDatapathId;
-import org.onosproject.ovsdb.controller.OvsdbEvent;
-import org.onosproject.ovsdb.controller.OvsdbEvent.Type;
-import org.onosproject.ovsdb.controller.OvsdbEventListener;
-import org.onosproject.ovsdb.controller.OvsdbIfaceId;
-import org.onosproject.ovsdb.controller.OvsdbNodeId;
-import org.onosproject.ovsdb.controller.OvsdbNodeListener;
-import org.onosproject.ovsdb.controller.OvsdbPortName;
-import org.onosproject.ovsdb.controller.OvsdbPortNumber;
-import org.onosproject.ovsdb.controller.OvsdbPortType;
-import org.onosproject.ovsdb.controller.driver.OvsdbAgent;
-import org.onosproject.ovsdb.rfc.jsonrpc.Callback;
-import org.onosproject.ovsdb.rfc.message.TableUpdate;
-import org.onosproject.ovsdb.rfc.message.TableUpdates;
-import org.onosproject.ovsdb.rfc.message.UpdateNotification;
-import org.onosproject.ovsdb.rfc.notation.OvsdbMap;
-import org.onosproject.ovsdb.rfc.notation.OvsdbSet;
-import org.onosproject.ovsdb.rfc.notation.Row;
-import org.onosproject.ovsdb.rfc.notation.UUID;
-import org.onosproject.ovsdb.rfc.schema.DatabaseSchema;
-import org.onosproject.ovsdb.rfc.table.Bridge;
-import org.onosproject.ovsdb.rfc.table.Interface;
-import org.onosproject.ovsdb.rfc.table.OvsdbTable;
-import org.onosproject.ovsdb.rfc.table.TableGenerator;
-import org.onosproject.ovsdb.rfc.utils.FromJsonUtil;
-import org.osgi.service.component.ComponentContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.math.BigInteger;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.ExecutionException;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-/**
- * The implementation of OvsdbController.
- */
-@Component(immediate = true)
-@Service
-public class OvsdbControllerImpl implements OvsdbController {
-
-    public static final Logger log = LoggerFactory
-            .getLogger(OvsdbControllerImpl.class);
-
-    protected ConcurrentHashMap<OvsdbNodeId, OvsdbClientService> ovsdbClients =
-            new ConcurrentHashMap<OvsdbNodeId, OvsdbClientService>();
-
-    protected OvsdbAgent agent = new InternalOvsdbNodeAgent();
-    protected InternalMonitorCallBack updateCallback = new InternalMonitorCallBack();
-
-    protected Set<OvsdbNodeListener> ovsdbNodeListener = new CopyOnWriteArraySet<>();
-    protected Set<OvsdbEventListener> ovsdbEventListener = new CopyOnWriteArraySet<>();
-
-    protected ConcurrentHashMap<String, OvsdbClientService> requestNotification =
-            new ConcurrentHashMap<String, OvsdbClientService>();
-
-    protected ConcurrentHashMap<String, String> requestDbName = new ConcurrentHashMap<String, String>();
-
-    private final Controller controller = new Controller();
-
-    @Activate
-    public void activate(ComponentContext context) {
-        controller.start(agent, updateCallback);
-        log.info("Started");
-    }
-
-    @Deactivate
-    public void deactivate() {
-        controller.stop();
-        log.info("Stoped");
-    }
-
-    @Override
-    public void addNodeListener(OvsdbNodeListener listener) {
-        if (!ovsdbNodeListener.contains(listener)) {
-            this.ovsdbNodeListener.add(listener);
-        }
-    }
-
-    @Override
-    public void removeNodeListener(OvsdbNodeListener listener) {
-        this.ovsdbNodeListener.remove(listener);
-    }
-
-    @Override
-    public void addOvsdbEventListener(OvsdbEventListener listener) {
-        if (!ovsdbEventListener.contains(listener)) {
-            this.ovsdbEventListener.add(listener);
-        }
-    }
-
-    @Override
-    public void removeOvsdbEventListener(OvsdbEventListener listener) {
-        this.ovsdbEventListener.remove(listener);
-    }
-
-    @Override
-    public List<OvsdbNodeId> getNodeIds() {
-        return ImmutableList.copyOf(ovsdbClients.keySet());
-    }
-
-    @Override
-    public OvsdbClientService getOvsdbClient(OvsdbNodeId nodeId) {
-        return ovsdbClients.get(nodeId);
-    }
-
-    @Override
-    public void connect(IpAddress ip, TpPort port) {
-        controller.connect(ip, port);
-    }
-
-    /**
-     * Implementation of an Ovsdb Agent which is responsible for keeping track
-     * of connected node and the state in which they are.
-     */
-    private class InternalOvsdbNodeAgent implements OvsdbAgent {
-        @Override
-        public void addConnectedNode(OvsdbNodeId nodeId,
-                                     OvsdbClientService ovsdbClient) {
-
-            if (ovsdbClients.get(nodeId) != null) {
-                return;
-            } else {
-                ovsdbClients.put(nodeId, ovsdbClient);
-
-                try {
-                    List<String> dbNames = ovsdbClient.listDbs().get();
-                    for (String dbName : dbNames) {
-                        DatabaseSchema dbSchema;
-                        dbSchema = ovsdbClient.getOvsdbSchema(dbName).get();
-
-                        log.debug("Begin to monitor tables");
-                        String id = java.util.UUID.randomUUID().toString();
-                        TableUpdates updates = ovsdbClient
-                                .monitorTables(dbName, id).get();
-
-                        requestDbName.put(id, dbName);
-                        requestNotification.put(id, ovsdbClient);
-
-                        if (updates != null) {
-                            processTableUpdates(ovsdbClient, updates,
-                                                dbSchema.name());
-                        }
-                    }
-                } catch (InterruptedException e) {
-                    log.warn("Interrupted while waiting to get message from ovsdb");
-                    Thread.currentThread().interrupt();
-                } catch (ExecutionException e) {
-                    log.error("Exception thrown while to get message from ovsdb");
-                }
-
-                log.debug("Add node to north");
-                for (OvsdbNodeListener l : ovsdbNodeListener) {
-                    l.nodeAdded(nodeId);
-                }
-                return;
-            }
-        }
-
-        @Override
-        public void removeConnectedNode(OvsdbNodeId nodeId) {
-            ovsdbClients.remove(nodeId);
-            log.debug("Node connection is removed");
-            for (OvsdbNodeListener l : ovsdbNodeListener) {
-                l.nodeRemoved(nodeId);
-            }
-        }
-    }
-
-    /**
-     * Processes table updates.
-     *
-     * @param clientService OvsdbClientService instance
-     * @param updates       TableUpdates instance
-     * @param dbName        ovsdb database name
-     */
-    private void processTableUpdates(OvsdbClientService clientService,
-                                     TableUpdates updates, String dbName)
-            throws InterruptedException {
-        checkNotNull(clientService, "OvsdbClientService is not null");
-
-        DatabaseSchema dbSchema = clientService.getDatabaseSchema(dbName);
-
-        for (String tableName : updates.result().keySet()) {
-            TableUpdate update = updates.result().get(tableName);
-            for (UUID uuid : (Set<UUID>) update.rows().keySet()) {
-                log.debug("Begin to process table updates uuid: {}, databaseName: {}, tableName: {}",
-                          uuid.value(), dbName, tableName);
-
-                Row newRow = update.getNew(uuid);
-                if (newRow != null) {
-                    clientService.updateOvsdbStore(dbName, tableName,
-                                                   uuid.value(), newRow);
-
-                    if (OvsdbConstant.INTERFACE.equals(tableName)) {
-                        dispatchInterfaceEvent(clientService,
-                                               newRow,
-                                               OvsdbEvent.Type.PORT_ADDED,
-                                               dbSchema);
-                    }
-                } else if (update.getOld(uuid) != null) {
-                    if (OvsdbConstant.INTERFACE.equals(tableName)) {
-                        Row row = clientService.getRow(OvsdbConstant.DATABASENAME, tableName, uuid.value());
-                        dispatchInterfaceEvent(clientService,
-                                               row,
-                                               OvsdbEvent.Type.PORT_REMOVED,
-                                               dbSchema);
-                    }
-                    clientService.removeRow(dbName, tableName, uuid.value());
-                }
-            }
-        }
-    }
-
-    /**
-     * Dispatches event to the north.
-     *
-     * @param clientService OvsdbClientService instance
-     * @param newRow        a new row
-     * @param oldRow        an old row
-     * @param eventType     type of event
-     * @param dbSchema      ovsdb database schema
-     */
-    private void dispatchInterfaceEvent(OvsdbClientService clientService,
-                                        Row row,
-                                        Type eventType,
-                                        DatabaseSchema dbSchema) {
-
-        long dpid = getDataPathid(clientService, dbSchema);
-        Interface intf = (Interface) TableGenerator
-                .getTable(dbSchema, row, OvsdbTable.INTERFACE);
-        if (intf == null) {
-            return;
-        }
-
-        String portType = (String) intf.getTypeColumn().data();
-        long localPort = getOfPort(intf);
-        if (localPort < 0) {
-            return;
-        }
-        String[] macAndIfaceId = getMacAndIfaceid(intf);
-        if (macAndIfaceId == null) {
-            return;
-        }
-
-        EventSubject eventSubject = new DefaultEventSubject(MacAddress.valueOf(
-                macAndIfaceId[0]),
-                                                            new HashSet<IpAddress>(),
-                                                            new OvsdbPortName(intf
-                                                                                      .getName()),
-                                                            new OvsdbPortNumber(localPort),
-                                                            new OvsdbDatapathId(Long
-                                                                                        .toString(dpid)),
-                                                            new OvsdbPortType(portType),
-                                                            new OvsdbIfaceId(macAndIfaceId[1]));
-        for (OvsdbEventListener listener : ovsdbEventListener) {
-            listener.handle(new OvsdbEvent<EventSubject>(eventType,
-                                                         eventSubject));
-        }
-    }
-
-    /**
-     * Gets mac and iface from the table Interface.
-     *
-     * @param intf Interface instance
-     * @return attachedMac, ifaceid
-     */
-    private String[] getMacAndIfaceid(Interface intf) {
-        OvsdbMap ovsdbMap = (OvsdbMap) intf.getExternalIdsColumn().data();
-        @SuppressWarnings("unchecked")
-        Map<String, String> externalIds = ovsdbMap.map();
-        if (externalIds == null) {
-            log.warn("The external_ids is null");
-            return null;
-        }
-
-        String attachedMac = externalIds.get(OvsdbConstant.EXTERNAL_ID_VM_MAC);
-        if (attachedMac == null) {
-            log.debug("The attachedMac is null"); //FIXME why always null?
-            return null;
-        }
-        String ifaceid = externalIds
-                .get(OvsdbConstant.EXTERNAL_ID_INTERFACE_ID);
-        if (ifaceid == null) {
-            log.warn("The ifaceid is null");
-            return null;
-        }
-        return new String[]{attachedMac, ifaceid};
-    }
-
-    /**
-     * Gets ofPorts number from table Interface.
-     *
-     * @param intf Interface instance
-     * @return ofport the ofport number
-     */
-    private long getOfPort(Interface intf) {
-        OvsdbSet ofPortSet = (OvsdbSet) intf.getOpenFlowPortColumn().data();
-        @SuppressWarnings("unchecked")
-        Set<Integer> ofPorts = ofPortSet.set();
-        while (ofPorts == null || ofPorts.size() <= 0) {
-            log.debug("The ofport is null in {}", intf.getName());
-            return -1;
-        }
-        Iterator<Integer> it = ofPorts.iterator();
-        return Long.parseLong(it.next().toString());
-    }
-
-    /**
-     * Gets datapathid from table bridge.
-     *
-     * @param clientService OvsdbClientService instance
-     * @param dbSchema      ovsdb database schema
-     * @return datapathid the bridge datapathid
-     */
-    private long getDataPathid(OvsdbClientService clientService,
-                               DatabaseSchema dbSchema) {
-        String bridgeUuid = clientService
-                .getBridgeUuid(OvsdbConstant.INTEGRATION_BRIDGE);
-        if (bridgeUuid == null) {
-            log.debug("Unable to spot bridge uuid for {} in {}",
-                      OvsdbConstant.INTEGRATION_BRIDGE, clientService);
-            return 0;
-        }
-
-        Row bridgeRow = clientService.getRow(OvsdbConstant.DATABASENAME,
-                                             "Bridge", bridgeUuid);
-        Bridge bridge = (Bridge) TableGenerator.getTable(dbSchema, bridgeRow,
-                                                         OvsdbTable.BRIDGE);
-        OvsdbSet dpidSet = (OvsdbSet) bridge.getDatapathIdColumn().data();
-        @SuppressWarnings("unchecked")
-        Set<String> dpids = dpidSet.set();
-        if (dpids == null || dpids.size() == 0) {
-            return 0;
-        }
-        return stringToLong((String) dpids.toArray()[0]);
-    }
-
-    private long stringToLong(String values) {
-        long value = (new BigInteger(values.replaceAll(":", ""), 16))
-                .longValue();
-        return value;
-    }
-
-    /**
-     * Implementation of an Callback which is responsible for receiving request
-     * infomation from ovsdb.
-     */
-    private class InternalMonitorCallBack implements Callback {
-        @Override
-        public void update(UpdateNotification updateNotification) {
-            Object key = updateNotification.jsonValue();
-            OvsdbClientService ovsdbClient = requestNotification.get(key);
-
-            String dbName = requestDbName.get(key);
-            JsonNode updatesJson = updateNotification.tbUpdatesJsonNode();
-            DatabaseSchema dbSchema = ovsdbClient.getDatabaseSchema(dbName);
-            TableUpdates updates = FromJsonUtil
-                    .jsonNodeToTableUpdates(updatesJson, dbSchema);
-            try {
-                processTableUpdates(ovsdbClient, updates, dbName);
-            } catch (InterruptedException e) {
-                log.warn("Interrupted while processing table updates");
-                Thread.currentThread().interrupt();
-            }
-        }
-
-        @Override
-        public void locked(List<String> ids) {
-            // TODO Auto-generated method stub
-        }
-
-        @Override
-        public void stolen(List<String> ids) {
-            // TODO Auto-generated method stub
-        }
-
-    }
-
-}
diff --git a/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbJsonRpcHandler.java b/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbJsonRpcHandler.java
deleted file mode 100644
index 1956a1eb..00000000
--- a/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbJsonRpcHandler.java
+++ /dev/null
@@ -1,131 +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.ovsdb.controller.impl;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-
-import org.onosproject.ovsdb.controller.OvsdbNodeId;
-import org.onosproject.ovsdb.controller.driver.OvsdbProviderService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Strings;
-
-/**
- * Channel handler deals with the node connection and dispatches
- * ovsdb messages to the appropriate locations.
- */
-public final class OvsdbJsonRpcHandler extends ChannelInboundHandlerAdapter {
-    protected static final Logger log = LoggerFactory
-            .getLogger(OvsdbJsonRpcHandler.class);
-    private OvsdbNodeId ovsdbNodeId;
-    private OvsdbProviderService ovsdbProviderService;
-
-    /**
-     * Constructor from a OvsdbNodeId ovsdbNodeId.
-     *
-     * @param ovsdbNodeId the ovsdbNodeId to use
-     */
-    public OvsdbJsonRpcHandler(OvsdbNodeId ovsdbNodeId) {
-        super();
-        this.ovsdbNodeId = ovsdbNodeId;
-    }
-
-    /**
-     * Gets the ovsdbProviderService instance.
-     *
-     * @return the instance of the ovsdbProviderService
-     */
-    public OvsdbProviderService getOvsdbProviderService() {
-        return ovsdbProviderService;
-    }
-
-    /**
-     * Sets the ovsdbProviderService instance.
-     *
-     * @param ovsdbNodeDriver the ovsdbNodeDriver to use
-     */
-    public void setOvsdbProviderService(OvsdbProviderService ovsdbNodeDriver) {
-        this.ovsdbProviderService = ovsdbNodeDriver;
-    }
-
-    /**
-     * Gets the OvsdbNodeId instance.
-     *
-     * @return the instance of the OvsdbNodeId
-     */
-    public OvsdbNodeId getNodeId() {
-        return ovsdbNodeId;
-    }
-
-    /**
-     * Sets the ovsdb node id.
-     *
-     * @param ovsdbNodeId the ovsdbNodeId to use
-     */
-    public void setNodeId(OvsdbNodeId ovsdbNodeId) {
-        this.ovsdbNodeId = ovsdbNodeId;
-    }
-
-    /**
-     * Processes an JsonNode message received on the channel.
-     *
-     * @param jsonNode The OvsdbJsonRpcHandler that received the message
-     */
-    private void processOvsdbMessage(JsonNode jsonNode) {
-
-        log.debug("Handle ovsdb message");
-
-        if (jsonNode.has("result")) {
-
-            log.debug("Handle ovsdb result");
-            ovsdbProviderService.processResult(jsonNode);
-
-        } else if (jsonNode.hasNonNull("method")) {
-
-            log.debug("Handle ovsdb request");
-            if (jsonNode.has("id")
-                    && !Strings.isNullOrEmpty(jsonNode.get("id").asText())) {
-                ovsdbProviderService.processRequest(jsonNode);
-            }
-
-        }
-        return;
-    }
-
-    @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg)
-            throws Exception {
-        log.debug("Receive message from ovsdb");
-        if (msg instanceof JsonNode) {
-            JsonNode jsonNode = (JsonNode) msg;
-            processOvsdbMessage(jsonNode);
-        }
-    }
-
-    @Override
-    public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
-        ctx.flush();
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext context, Throwable cause) {
-        log.error("Exception inside channel handling pipeline.", cause);
-        context.close();
-    }
-}
diff --git a/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/package-info.java b/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/package-info.java
deleted file mode 100644
index 379e947a..00000000
--- a/framework/src/onos/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/package-info.java
+++ /dev/null
@@ -1,20 +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.
- */
-
-/**
- * Implementation of the OVSDB controller IO subsystem.
- */
-package org.onosproject.ovsdb.controller.impl;
\ No newline at end of file