Merge branch 'topic/netty'

Collapsing the branch to master

Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Conflicts:
	ovsdb/.classpath
	ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java

Change-Id: I4bc7cd4b921b5eb8b14cfe4d1c2811214f03e78c
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --cc ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBridgeConfig.java
index 523b31851ef0b0e97205d9b27625b4e151ddaa0f,0000000000000000000000000000000000000000..066f464ec3b509122da92af0256a99b6b595d75e
mode 100644,000000..100644
--- 1/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestBridgeConfig.java
--- /dev/null
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBridgeConfig.java
@@@ -1,50 -1,0 +1,50 @@@
- package org.opendaylight.ovsdb;
++package org.opendaylight.ovsdb.plugin;
 +
 +import org.junit.Test;
 +import org.opendaylight.controller.sal.connection.ConnectionConstants;
 +import org.opendaylight.controller.sal.core.Node;
 +import org.opendaylight.controller.sal.core.NodeConnector;
 +import org.opendaylight.controller.sal.networkconfig.bridgedomain.ConfigConstants;
- import org.opendaylight.ovsdb.internal.ConfigurationService;
- import org.opendaylight.ovsdb.internal.ConnectionService;
++import org.opendaylight.ovsdb.plugin.ConfigurationService;
++import org.opendaylight.ovsdb.plugin.ConnectionService;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import java.util.HashMap;
 +import java.util.Map;
 +
 +public class OvsdbTestBridgeConfig {
 +    private static final Logger logger = LoggerFactory
 +            .getLogger(OvsdbTestSetManager.class);
 +
 +    @Test
 +    public void setBridgeConfig() throws Throwable{
 +        Node.NodeIDType.registerIDType("OVS", String.class);
 +        NodeConnector.NodeConnectorIDType.registerIDType("OVS", String.class, "OVS");
 +
 +        ConnectionService connectionService = new ConnectionService();
 +        connectionService.init();
 +        String identifier = "TEST";
 +        Map<ConnectionConstants, String> params = new HashMap<ConnectionConstants, String>();
 +        params.put(ConnectionConstants.ADDRESS, "192.168.254.128");
 +        params.put(ConnectionConstants.PORT, "6640");
 +
 +        Map<ConfigConstants, Object> configs = new HashMap<ConfigConstants, Object>();
 +
 +        Map<String, String> exterIDPairs = new HashMap<String, String>();
 +        exterIDPairs.put("bridge-foo", "bri-bar");
 +        //Will accept multiple array pairs. Pairs must be arrays not maps.
 +        configs.put(ConfigConstants.CUSTOM, exterIDPairs);
 +
 +        Node node = connectionService.connect(identifier, params);
 +        if(node == null){
 +            logger.error("Could not connect to ovsdb server");
 +            return;
 +        }
 +
 +        ConfigurationService configurationService = new ConfigurationService();
 +        configurationService.setConnectionServiceInternal(connectionService);
 +        configurationService.addBridgeDomainConfig(node, "br0", configs);
 +    }
 +
 +}

diff --cc ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePort.java
index 3edabfb81703ef786451b4b2d3d5e6d8c3c6a70e,0000000000000000000000000000000000000000..a043c6f1944af76905541b4169496d3c449715f3
mode 100644,000000..100644
--- 1/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestDeletePort.java
--- /dev/null
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePort.java
@@@ -1,47 -1,0 +1,47 @@@
- package org.opendaylight.ovsdb;
++package org.opendaylight.ovsdb.plugin;
 +
 +import org.junit.Test;
 +import org.opendaylight.controller.sal.core.Node;
 +import org.opendaylight.controller.sal.core.NodeConnector;
- import org.opendaylight.ovsdb.internal.ConfigurationService;
- import org.opendaylight.ovsdb.internal.ConnectionService;
++import org.opendaylight.ovsdb.plugin.ConfigurationService;
++import org.opendaylight.ovsdb.plugin.ConnectionService;
 +import org.opendaylight.controller.sal.connection.ConnectionConstants;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import java.util.HashMap;
 +import java.util.Map;
 +
 +public class OvsdbTestDeletePort {
 +    private static final Logger logger = LoggerFactory
 +            .getLogger(OvsdbTestAddPort.class);
 +
 +    @Test
 +    public void deletePort() throws Throwable{
 +        Node.NodeIDType.registerIDType("OVS", String.class);
 +        NodeConnector.NodeConnectorIDType.registerIDType("OVS", String.class, "OVS");
 +
 +        ConnectionService connectionService = new ConnectionService();
 +        connectionService.init();
 +        String identifier = "TEST";
 +        Map<ConnectionConstants, String> params = new HashMap<ConnectionConstants, String>();
 +        params.put(ConnectionConstants.ADDRESS, "10.12.0.78");
 +        params.put(ConnectionConstants.PORT, "6634");
 +
 +        Node node = connectionService.connect(identifier, params);
 +        if(node == null){
 +            logger.error("Could not connect to ovsdb server");
 +            return;
 +        }
 +        /**
 +         * Deletes an existing port from an existing bridge
 +         * Ex. ovs-vsctl del-port ovsbr0 tap0
 +         * @param node Node serving this configuration service
 +         * @param bridgeDomainIdentifier String representation of a Bridge Domain
 +         * @param portIdentifier String representation of a user defined Port Name
 +         */
 +        ConfigurationService configurationService = new ConfigurationService();
 +        configurationService.setConnectionServiceInternal(connectionService);
 +        configurationService.deletePort(node, "ovsbr0", "tap2");
 +    }
 +}

diff --cc ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetOFControler.java
index 5fcaee705cb1c50e26c54e71f2fe69d33a797627,0000000000000000000000000000000000000000..60a77bc9c74f6e135ea856cb200461c54caa2bd7
mode 100644,000000..100644
--- 1/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestSetOFControler.java
--- /dev/null
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetOFControler.java
@@@ -1,53 -1,0 +1,53 @@@
- package org.opendaylight.ovsdb;
++package org.opendaylight.ovsdb.plugin;
 +
 +import org.junit.Test;
 +import org.opendaylight.controller.sal.connection.ConnectionConstants;
 +import org.opendaylight.controller.sal.core.Node;
 +import org.opendaylight.controller.sal.core.NodeConnector;
 +import org.opendaylight.controller.sal.networkconfig.bridgedomain.ConfigConstants;
- import org.opendaylight.ovsdb.internal.ConfigurationService;
- import org.opendaylight.ovsdb.internal.ConnectionService;
++import org.opendaylight.ovsdb.plugin.ConfigurationService;
++import org.opendaylight.ovsdb.plugin.ConnectionService;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import java.util.HashMap;
 +import java.util.Map;
 +
 +public class OvsdbTestSetOFControler {
 +    private static final Logger logger = LoggerFactory
 +            .getLogger(OvsdbTestSetOFControler.class);
 +
 +    @Test
 +    public void setController() throws Throwable{
 +        Node.NodeIDType.registerIDType("OVS", String.class);
 +        NodeConnector.NodeConnectorIDType.registerIDType("OVS", String.class, "OVS");
 +
 +        ConnectionService connectionService = new ConnectionService();
 +        connectionService.init();
 +        String identifier = "TEST";
 +        Map<ConnectionConstants, String> params = new HashMap<ConnectionConstants, String>();
 +        params.put(ConnectionConstants.ADDRESS, "192.168.254.128");
 +        params.put(ConnectionConstants.PORT, "6640");
 +
 +        Node node = connectionService.connect(identifier, params);
 +        if(node == null){
 +            logger.error("Could not connect to ovsdb server");
 +            return;
 +        }
 +        /**
 +         * Implements ovs-vsctl set−controller bridge target..
 +         *
 +         * @param node Node serving this configuration service
 +         * @param bridgeDomainIdentifier String representation of a Bridge Domain
 +         * @param configs String passes the OF controllers IP and Port values
 +         *
 +         */
 +        Map<ConfigConstants, Object> configs = new HashMap<ConfigConstants, Object>();
 +        configs.put(ConfigConstants.DEST_IP, "192.168.254.1");
 +        configs.put(ConfigConstants.CUSTOM, "6633");
 +        ConfigurationService configurationService = new ConfigurationService();
 +        configurationService.setConnectionServiceInternal(connectionService);
-         configurationService.setBridgeOFController(node, "br0", configs);
++        configurationService.setBridgeOFController(node, "br0");
 +
 +    }
 +}