1 files changed, 22 insertions, 54 deletions

diff --git a/sdnr/wt/devicemanager/model/src/main/yang/devicemanager.yang b/sdnr/wt/devicemanager/model/src/main/yang/devicemanager.yang
index 97eb099aa..b1dea1357 100644
--- a/sdnr/wt/devicemanager/model/src/main/yang/devicemanager.yang
+++ b/sdnr/wt/devicemanager/model/src/main/yang/devicemanager.yang
@@ -4,6 +4,8 @@ module devicemanager {
     namespace "urn:opendaylight:params:xml:ns:yang:devicemanager";
     prefix "devicemanager";
 
+    import data-provider { prefix "data-provider"; }
+
     description
         "DeviceManager Api Module";
 
@@ -12,63 +14,14 @@ module devicemanager {
             "Initial revision";
     }
 
-    grouping maintenance-mode-g {
-        leaf mountpoint-name{
-            mandatory true;
-            type string;
-            description
-                "Mountpoint-name as key of node";
-        }
-        leaf node-name {
-            mandatory true;
-            type string;
-            description
-                "Node-name as node";
-        }
-        list filter {
-            container definition {
-                leaf object-id-ref {
-                    mandatory true;
-                    type string;
-                    description
-                        "object id to filter on";
-                }
-                leaf problem {
-                    mandatory true;
-                    type string;
-                    description
-                        "name of the problem to filter";
-                }
-            }
-            leaf description {
-                mandatory true;
-                type string;
-                description
-                    "Node-name as node";
-            }
-            leaf start-date {
-                mandatory true;
-                type string;
-                description
-                    "begin of maintenance-mode";
-            }
-            leaf end-date {
-                mandatory true;
-                type string;
-                description
-                    "end of maintenance-mode";
-            }
-        }
-    }
-
     rpc set-maintenance-mode{
         description
             "Set maintenance mode for network element";
         input{
-            uses maintenance-mode-g;
+            uses data-provider:maintenance-entity;
         }
         output {
-            uses maintenance-mode-g;
+            uses data-provider:maintenance-entity;
         }
     }
     rpc get-maintenance-mode{
@@ -83,7 +36,7 @@ module devicemanager {
             }
         }
         output {
-            uses maintenance-mode-g;
+            uses data-provider:maintenance-entity;
         }
     }
     rpc test-maintenance-mode{
@@ -118,7 +71,7 @@ module devicemanager {
                 type string;
                 description    "Describin if mountpoint was found and result of maintenance mode testing";
             }
-            uses maintenance-mode-g;
+            uses data-provider:maintenance-entity;
         }
     }
     rpc show-required-network-element {
@@ -184,6 +137,21 @@ module devicemanager {
             }
         }
     }
-
+    rpc push-fault-notification {
+        description
+            "Forward fault problem notification of a network-element";
+        input {
+        	uses data-provider:object-change-reference;
+        	uses data-provider:fault;
+        }
+    }
+    rpc push-attribute-change-notification {
+        description
+            "Forward attribute change notification of a network-element";
+        input {
+	    	uses data-provider:object-change-reference;
+    		uses data-provider:attribute-change;
+        }
+    }
 }