commit 80bee53a79281398ce918edf299d646fd3312647
author jaegonkim <jaegon77.kim@samsung.com> Mon May 15 15:16:38 2017 +0900
committer Andrea Campanella <andrea@onlab.us> Tue May 23 08:33:24 2017 +0000
tree b29c1a7d048cd19e492c1b40398a996d72d0ea74
parent d3f9dd6460d4ee8648c98b2da85c394f54a88180

[ONOS-6451] Datapath type setting function for supporting OVS DPDK addBridge

Change-Id: Ib6a8fa79dc1221e1387f8888f606306c671c4133

core/api/src/main/java/org/onosproject/net/behaviour/DefaultBridgeDescription.java

diff --git a/core/api/src/main/java/org/onosproject/net/behaviour/DefaultBridgeDescription.java b/core/api/src/main/java/org/onosproject/net/behaviour/DefaultBridgeDescription.java
index f35b646..ef9c767 100644
--- a/core/api/src/main/java/org/onosproject/net/behaviour/DefaultBridgeDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/behaviour/DefaultBridgeDescription.java
@@ -38,6 +38,7 @@
     private final boolean enableLocalController;
     private final Optional<FailMode> failMode;
     private final Optional<String> datapathId;
+    private final Optional<String> datapathType;
     private final Optional<Boolean> disableInBand;
 
     /* Adds more configurations */
@@ -47,12 +48,14 @@
                                      boolean enableLocalController,
                                      Optional<FailMode> failMode,
                                      Optional<String> datapathId,
+                                     Optional<String> datapathType,
                                      Optional<Boolean> disableInBand) {
         this.name = checkNotNull(name);
         this.controllers = controllers;
         this.enableLocalController = enableLocalController;
         this.failMode = failMode;
         this.datapathId = datapathId;
+        this.datapathType = datapathType;
         this.disableInBand = disableInBand;
     }
 
@@ -87,6 +90,11 @@
     }
 
     @Override
+    public Optional<String> datapathType() {
+        return datapathType;
+    }
+
+    @Override
     public Optional<DeviceId> deviceId() {
         if (datapathId.isPresent()) {
             return Optional.of(DeviceId.deviceId("of:" + datapathId.get()));
@@ -116,6 +124,7 @@
         private boolean enableLocalController = false;
         private Optional<FailMode> failMode = Optional.empty();
         private Optional<String> datapathId = Optional.empty();
+        private Optional<String> datapathType = Optional.empty();
         private Optional<Boolean> disableInBand = Optional.empty();
 
         private Builder() {
@@ -127,6 +136,7 @@
                                                 enableLocalController,
                                                 failMode,
                                                 datapathId,
+                                                datapathType,
                                                 disableInBand);
         }
 
@@ -164,6 +174,12 @@
         }
 
         @Override
+        public Builder datapathType(String datapathType) {
+            this.datapathType = Optional.ofNullable(datapathType);
+            return this;
+        }
+
+        @Override
         public Builder disableInBand() {
             this.disableInBand = Optional.of(Boolean.TRUE);
             return this;