Merge "Prepare upgrade to Netty 4.1"

[openflowjava.git] / openflow-protocol-impl / src / main / yang / openflow-switch-connection-provider-impl.yang

diff --git a/openflow-protocol-impl/src/main/yang/openflow-switch-connection-provider-impl.yang b/openflow-protocol-impl/src/main/yang/openflow-switch-connection-provider-impl.yang
index cb714d6b5e27fe452778494bd19fce44d3afc139..81e5b3e378dc0eea52cd0b9830c2ea1e6d720a01 100644 (file)
--- a/openflow-protocol-impl/src/main/yang/openflow-switch-connection-provider-impl.yang
+++ b/openflow-protocol-impl/src/main/yang/openflow-switch-connection-provider-impl.yang
@@ -5,7 +5,7 @@ module openflow-switch-connection-provider-impl {
 
     import config {prefix config; revision-date 2013-04-05; }
     import openflow-switch-connection-provider {prefix openflow-switch-connection-provider; revision-date 2014-03-28; }
-    import ietf-inet-types {prefix ietf-inet; revision-date 2010-09-24; }
+    import ietf-inet-types {prefix ietf-inet; revision-date 2013-07-15; }
     import openflow-configuration {prefix of-config; revision-date 2014-06-30; }
     import rpc-context { prefix rpcx; revision-date 2013-06-17; }
 
@@ -21,6 +21,7 @@ module openflow-switch-connection-provider-impl {
         base "config:module-type";
         config:provided-service openflow-switch-connection-provider:openflow-switch-connection-provider;
         config:java-name-prefix SwitchConnectionProvider;
+        status deprecated;
     }
 
     identity statistics-collection-service-impl {
@@ -35,6 +36,12 @@ module openflow-switch-connection-provider-impl {
         case openflow-switch-connection-provider-impl {
             when "/config:modules/config:module/config:type = 'openflow-switch-connection-provider-impl'";
 
+            leaf use-barrier {
+                description "Enable barrier in Openflow java";
+                type boolean;
+                default true;
+            }
+
             leaf port {
                 description "local listening port";
                 type uint16;
@@ -91,6 +98,10 @@ module openflow-switch-connection-provider-impl {
                     description "password protecting truststore";
                     type string;
                 }
+                leaf-list cipher-suites {
+                    description "combination of cryptographic algorithms used by TLS connection";
+                    type string;
+                }
             }
             container threads {
                 leaf boss-threads {
@@ -146,7 +157,7 @@ module openflow-switch-connection-provider-impl {
     identity reset-ofjava-statistics-rpc;
 
     rpc print-ofjava-statistics {
-        description 
+        description
             "Shortcut JMX call to printOfjavaStatistics.";
         input {
             uses rpcx:rpc-context-ref {
@@ -163,7 +174,7 @@ module openflow-switch-connection-provider-impl {
     }
 
     rpc reset-ofjava-statistics {
-        description 
+        description
             "Shortcut JMX call to resetOfjavaStatistics.";
         input {
             uses rpcx:rpc-context-ref {
@@ -178,4 +189,4 @@ module openflow-switch-connection-provider-impl {
             }
         }
     }
-}
\ No newline at end of file
+}