Update to MD-SAL models

Fixed bug in MD-SAL activation

Change-Id: I636d4d7c7b696c68572e94456a87edc358af4850
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
index b335b32f1f0df69bed9df54bc8b3cf6628a64aab..eee233f3d6dd6f86fbff7b164f4639d28b17b7a5 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
@@ -27,7 +27,7 @@ module opendaylight-group-types {
     
     grouping group {
         
     
     grouping group {
         

-        uses group-types;       
+        uses group-types;

         
         leaf group-id {
             type group-ref;
         
         leaf group-id {
             type group-ref;

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
index 76c172bcf07fa8c11729731a9b06d7cb6aab40b4..80a4ccf0878de6bd5a9b2775377fc7ec133e5162 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
@@ -11,6 +11,23 @@ module flow-node-inventory {
         description "Flow Capable Node extensions to the nventory model";
     }
     
         description "Flow Capable Node extensions to the nventory model";
     }
     

+    
+    grouping queue {
+         leaf queue-id {
+            type uint32;
+            description "id for the specific queue";
+            mandatory true; 
+        }
+        container properties {
+            leaf minimum-rate {
+                type uint32;
+            }
+            leaf maximum-rate{
+                type uint32;
+            }
+        }
+    }
+

     grouping flow-capable-node-capabilities {
         container tables {
             leaf support-state {
     grouping flow-capable-node-capabilities {
         container tables {
             leaf support-state {


@@ -59,12 +76,20 @@ module flow-node-inventory {
         }
     }
     
         }
     }
     

-    augment "/inv:nodes/inv:node" {
-        augment-identifier "flow-capable-node";
-        uses flow-capable-node-capabilities;
+    grouping flow-capable-node-connector {
+        

     }
     }

-    
+

     notification node-capabilities-updated {
         uses flow-capable-node-capabilities;
     }
     notification node-capabilities-updated {
         uses flow-capable-node-capabilities;
     }

+
+    notification node-connector-capabilities-updated {
+        uses flow-capable-node-connector;
+    }
+
+    augment "/inv:nodes/inv:node" {
+        augment-identifier "flow-capable-node";
+        uses flow-capable-node-capabilities;
+    }

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/opendaylight/md-sal/model/model-inventory/src/main/yang/inventory.yang b/opendaylight/md-sal/model/model-inventory/src/main/yang/node-inventory.yang
similarity index 98%
rename from opendaylight/md-sal/model/model-inventory/src/main/yang/inventory.yang
rename to opendaylight/md-sal/model/model-inventory/src/main/yang/node-inventory.yang
index 0bf146365393aa3f3a4c57703a65a1f89114531d..6ef5b63bd4fa47ef1df89daa2e24f63eb1ff983e 100644 (file)
--- a/opendaylight/md-sal/model/model-inventory/src/main/yang/inventory.yang
+++ b/opendaylight/md-sal/model/model-inventory/src/main/yang/node-inventory.yang
@@ -41,7 +41,7 @@ module opendaylight-inventory {
     }
 
     identity node-connector-context {
     }
 
     identity node-connector-context {

-
+        

     }
 
     grouping node {
     }
 
     grouping node {


@@ -56,9 +56,6 @@ module opendaylight-inventory {
         }
     }
 
         }
     }
 

-
-
-

     /** Base structure **/
     container nodes {
         list node {
     /** Base structure **/
     container nodes {
         list node {


@@ -70,7 +67,7 @@ module opendaylight-inventory {
             list "node-connector" {
                 key "id";
                 ext:context-instance "node-connector-context";
             list "node-connector" {
                 key "id";
                 ext:context-instance "node-connector-context";

-                
+

                 use node-connector;
             }
         }
                 use node-connector;
             }
         }

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/BindingAwareBrokerImpl.xtend b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/BindingAwareBrokerImpl.xtend
index ff8cefe01c885028163a1e0c8e60dca1791d9963..2bae9f515f40bfe4ed25e95ccd4426493c413a22 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/BindingAwareBrokerImpl.xtend
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/BindingAwareBrokerImpl.xtend
@@ -31,6 +31,8 @@ import org.opendaylight.controller.sal.binding.codegen.impl.RuntimeCodeGenerator
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration

+import org.opendaylight.controller.sal.binding.api.data.DataProviderService
+import org.opendaylight.controller.sal.binding.api.data.DataBrokerService

 
 class BindingAwareBrokerImpl implements BindingAwareBroker {
     private static val log = LoggerFactory.getLogger(BindingAwareBrokerImpl)
 
 class BindingAwareBrokerImpl implements BindingAwareBroker {
     private static val log = LoggerFactory.getLogger(BindingAwareBrokerImpl)


@@ -50,10 +52,14 @@ class BindingAwareBrokerImpl implements BindingAwareBroker {
 
         // Initialization of notificationBroker
         notifyBroker = new NotificationBrokerImpl(null);
 
         // Initialization of notificationBroker
         notifyBroker = new NotificationBrokerImpl(null);

+        dataBroker = new DataBrokerImpl();

         val brokerProperties = newProperties();
         notifyBrokerRegistration = brokerBundleContext.registerService(NotificationProviderService, notifyBroker,
             brokerProperties)
         brokerBundleContext.registerService(NotificationService, notifyBroker, brokerProperties)
         val brokerProperties = newProperties();
         notifyBrokerRegistration = brokerBundleContext.registerService(NotificationProviderService, notifyBroker,
             brokerProperties)
         brokerBundleContext.registerService(NotificationService, notifyBroker, brokerProperties)

+        brokerBundleContext.registerService(DataProviderService,dataBroker,brokerProperties)
+        brokerBundleContext.registerService(DataBrokerService,dataBroker,brokerProperties)
+        

     }
 
     def initGenerator() {
     }
 
     def initGenerator() {