From b9b4965a5056aa0db20a1e7b47ac864bdb943bc1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= <adetalhouet@inocybe.com>
Date: Tue, 23 Aug 2016 18:24:07 -0400
Subject: [PATCH] Move sal-remote to sal-rest-connector
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This module is only used by sal-rest-connnector bundle,
moreover, it is intended to create notification stream
and/or register a data change event which is done using
RESTCONF, thus it make sense to move it to the appropriate
project.
I beleive this is a leftover of the migration that happened
when controller was splitted out..

Change-Id: Ie23fa2fa48cffe3bc395b814b86e70befd4a684a
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
---
 features/restconf/pom.xml                     |  5 -
 .../restconf/src/main/features/features.xml   |  3 -
 restconf/sal-rest-connector/pom.xml           |  4 -
 .../main/yang/opendaylight-md-sal-remote.yang | 97 +++++++++++++++++++
 restconf/sal-restconf-broker/pom.xml          |  4 +-
 5 files changed, 99 insertions(+), 14 deletions(-)
 create mode 100644 restconf/sal-rest-connector/src/main/yang/opendaylight-md-sal-remote.yang

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index c4eb0e19ce..45be172585 100644
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -94,11 +94,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-remote</artifactId>
-      <version>${controller.mdsal.version}</version>
-    </dependency>
 
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
diff --git a/features/restconf/src/main/features/features.xml b/features/restconf/src/main/features/features.xml
index 2855b6176c..fc13c74f34 100644
--- a/features/restconf/src/main/features/features.xml
+++ b/features/restconf/src/main/features/features.xml
@@ -30,9 +30,6 @@
         <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
         <feature version='[4.0.30,4.1.0)'>odl-netty</feature>
         <feature>war</feature>
-        <!-- presently we need sal-remote to be listed BEFORE sal-rest-connector because sal-rest-connector
-             has a yang file which augments a yang file in sal-remote, and order seems to matter -->
-        <bundle>mvn:org.opendaylight.controller/sal-remote/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.netconf/sal-rest-connector/{{VERSION}}</bundle>
         <bundle>mvn:com.google.code.gson/gson/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-codec-gson/{{VERSION}}</bundle>
diff --git a/restconf/sal-rest-connector/pom.xml b/restconf/sal-rest-connector/pom.xml
index d3f6017c75..bce2cbfe3b 100644
--- a/restconf/sal-rest-connector/pom.xml
+++ b/restconf/sal-rest-connector/pom.xml
@@ -74,10 +74,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-remote</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-api</artifactId>
diff --git a/restconf/sal-rest-connector/src/main/yang/opendaylight-md-sal-remote.yang b/restconf/sal-rest-connector/src/main/yang/opendaylight-md-sal-remote.yang
new file mode 100644
index 0000000000..994e070035
--- /dev/null
+++ b/restconf/sal-rest-connector/src/main/yang/opendaylight-md-sal-remote.yang
@@ -0,0 +1,97 @@
+module sal-remote {
+
+    yang-version 1;
+    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:remote";
+    prefix "sal-remote";
+
+    organization "Cisco Systems, Inc.";
+    contact "Martin Bobak <mbobak@cisco.com>";
+
+    description
+          "This module contains the definition of methods related to
+           sal remote model.
+
+           Copyright (c)2013 Cisco Systems, Inc. All rights reserved.
+
+           This program and the accompanying materials are made available
+           under the terms of the Eclipse Public License v1.0 which
+           accompanies this distribution, and is available at
+           http://www.eclipse.org/legal/epl-v10.html";
+
+    revision "2014-01-14" {
+        description
+            "Initial revision";
+    }
+
+
+     typedef q-name {
+       type string;
+       reference
+         "http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#QName";
+     }
+
+    rpc create-data-change-event-subscription {
+        input {
+            leaf path {
+                type instance-identifier;
+                description "Subtree path. ";
+            }
+         }
+         output {
+            leaf stream-name {
+                type string;
+                description "Notification stream name.";
+            }
+         }
+    }
+
+    notification data-changed-notification {
+        description "Data change notification.";
+        list data-change-event {
+            key path;
+            leaf path {
+                type instance-identifier;
+            }
+            leaf store {
+                type enumeration {
+                    enum config;
+                    enum operation;
+                }
+            }
+            leaf operation {
+                type enumeration {
+                    enum created;
+                    enum updated;
+                    enum deleted;
+                }
+            }
+            anyxml data{
+                description "DataObject ";
+            }
+         }
+    }
+
+    rpc create-notification-stream {
+        input {
+            leaf-list notifications {
+                type q-name;
+                description "Notification QNames";
+            }
+         }
+        output {
+            leaf notification-stream-identifier {
+                type string;
+                description "Unique notification stream identifier, in which notifications will be propagated";
+            }
+        }
+    }
+
+    rpc begin-transaction {
+        output {
+            anyxml data-modification-transaction{
+                description "DataModificationTransaction xml";
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/restconf/sal-restconf-broker/pom.xml b/restconf/sal-restconf-broker/pom.xml
index 6cafc73c7d..7f53387752 100644
--- a/restconf/sal-restconf-broker/pom.xml
+++ b/restconf/sal-restconf-broker/pom.xml
@@ -30,8 +30,8 @@
       <artifactId>sal-core-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-remote</artifactId>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>sal-rest-connector</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
-- 
2.36.6