[onos-2116]the implementation of BridgeConfig and modify onos/pom.xml to
add ovsdb module.
Change-Id: I1a1202e4aa4f04d5dbd4aceb6dacccc571e73f39
diff --git a/drivers/pom.xml b/drivers/pom.xml
index 4702f4c..ff8d794 100644
--- a/drivers/pom.xml
+++ b/drivers/pom.xml
@@ -57,7 +57,11 @@
<artifactId>onos-core-serializers</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
-
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-ovsdb-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
diff --git a/drivers/src/main/java/org/onosproject/driver/ovsdb/OvsdbBridgeConfig.java b/drivers/src/main/java/org/onosproject/driver/ovsdb/OvsdbBridgeConfig.java
new file mode 100644
index 0000000..a5c5474
--- /dev/null
+++ b/drivers/src/main/java/org/onosproject/driver/ovsdb/OvsdbBridgeConfig.java
@@ -0,0 +1,136 @@
+/*
+ * 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.driver.ovsdb;
+
+import java.util.Collection;
+import java.util.Set;
+
+import org.onlab.packet.IpAddress;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.behaviour.BridgeConfig;
+import org.onosproject.net.behaviour.BridgeDescription;
+import org.onosproject.net.behaviour.BridgeName;
+import org.onosproject.net.behaviour.DefaultBridgeDescription;
+import org.onosproject.net.device.DefaultPortDescription;
+import org.onosproject.net.device.PortDescription;
+import org.onosproject.net.driver.AbstractHandlerBehaviour;
+import org.onosproject.net.driver.DriverHandler;
+import org.onosproject.ovsdb.controller.OvsdbBridge;
+import org.onosproject.ovsdb.controller.OvsdbClientService;
+import org.onosproject.ovsdb.controller.OvsdbController;
+import org.onosproject.ovsdb.controller.OvsdbNodeId;
+import org.onosproject.ovsdb.controller.OvsdbPort;
+
+import com.google.common.collect.Sets;
+
+/**
+ * The implementation of BridageConfig.
+ */
+public class OvsdbBridgeConfig extends AbstractHandlerBehaviour
+ implements BridgeConfig {
+
+ @Override
+ public void addBridge(BridgeName bridgeName) {
+ DriverHandler handler = handler();
+ OvsdbClientService ovsdbNode = getOvsdbNode(handler);
+ ovsdbNode.createBridge(bridgeName.name());
+ }
+
+ @Override
+ public void deleteBridge(BridgeName bridgeName) {
+ DriverHandler handler = handler();
+ OvsdbClientService ovsdbNode = getOvsdbNode(handler);
+ ovsdbNode.dropBridge(bridgeName.name());
+ }
+
+ @Override
+ public Collection<BridgeDescription> getBridges() {
+ DriverHandler handler = handler();
+ DeviceId deviceId = handler.data().deviceId();
+ OvsdbClientService ovsdbNode = getOvsdbNode(handler);
+ Set<OvsdbBridge> ovsdbSet = ovsdbNode.getBridges();
+ Collection<BridgeDescription> bridges = Sets.newHashSet();
+ ovsdbSet.forEach(o -> {
+ BridgeName bridgeName = BridgeName.bridgeName(o.bridgeName()
+ .toString());
+ DeviceId ownDeviceId = DeviceId.deviceId(o.datapathId().toString());
+ BridgeDescription description = new DefaultBridgeDescription(
+ bridgeName,
+ deviceId,
+ ownDeviceId);
+ bridges.add(description);
+ });
+ return bridges;
+ }
+
+ @Override
+ public void addPort(PortDescription port) {
+ DriverHandler handler = handler();
+ OvsdbClientService ovsdbNode = getOvsdbNode(handler);
+ Set<OvsdbBridge> ovsdbSet = ovsdbNode.getBridges();
+ if (ovsdbSet != null && ovsdbSet.size() > 0) {
+ OvsdbBridge bridge = ovsdbSet.iterator().next();
+ ovsdbNode.createPort(bridge.bridgeName().toString(), port
+ .portNumber().toString());
+ }
+ }
+
+ @Override
+ public void deletePort(PortDescription port) {
+ DriverHandler handler = handler();
+ OvsdbClientService ovsdbNode = getOvsdbNode(handler);
+ Set<OvsdbBridge> ovsdbSet = ovsdbNode.getBridges();
+ if (ovsdbSet != null && ovsdbSet.size() > 0) {
+ OvsdbBridge bridge = ovsdbSet.iterator().next();
+ ovsdbNode.dropPort(bridge.bridgeName().toString(), port
+ .portNumber().toString());
+ }
+ }
+
+ @Override
+ public Collection<PortDescription> getPorts() {
+ DriverHandler handler = handler();
+ OvsdbClientService ovsdbNode = getOvsdbNode(handler);
+ Set<OvsdbPort> ovsdbSet = ovsdbNode.getPorts();
+ Collection<PortDescription> ports = Sets.newHashSet();
+ ovsdbSet.forEach(o -> {
+ PortNumber port = PortNumber.portNumber(o.portNumber().value());
+ PortDescription description = new DefaultPortDescription(port, true);
+ ports.add(description);
+ });
+ return ports;
+ }
+
+ // OvsdbNodeId(IP:port) is used in the adaptor while DeviceId(ovsdb:IP:port)
+ // is used in the core. So DeviceId need be changed to OvsdbNodeId.
+ private OvsdbNodeId changeDeviceIdToNodeId(DeviceId deviceId) {
+ int lastColon = deviceId.toString().lastIndexOf(":");
+ int fistColon = deviceId.toString().indexOf(":");
+ String ip = deviceId.toString().substring(fistColon + 1, lastColon - 1);
+ String port = deviceId.toString().substring(lastColon + 1);
+ IpAddress ipAddress = IpAddress.valueOf(ip);
+ long portL = Long.valueOf(port).longValue();
+ return new OvsdbNodeId(ipAddress, portL);
+ }
+
+ private OvsdbClientService getOvsdbNode(DriverHandler handler) {
+ OvsdbController ovsController = handler.get(OvsdbController.class);
+ DeviceId deviceId = handler.data().deviceId();
+ OvsdbNodeId nodeId = changeDeviceIdToNodeId(deviceId);
+ return ovsController.getOvsdbClient(nodeId);
+ }
+}
diff --git a/drivers/src/main/java/org/onosproject/driver/ovsdb/package-info.java b/drivers/src/main/java/org/onosproject/driver/ovsdb/package-info.java
new file mode 100644
index 0000000..8d878a5
--- /dev/null
+++ b/drivers/src/main/java/org/onosproject/driver/ovsdb/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+/**
+ * Implementations of OVSDB protocol configurations.
+ */
+package org.onosproject.driver.ovsdb;
\ No newline at end of file