From ddd159be8011711adae09d964fcfbec60ea93fd9 Mon Sep 17 00:00:00 2001
From: Tony Tkacik <ttkacik@cisco.com>
Date: Wed, 19 Aug 2015 14:35:34 +0200
Subject: [PATCH] Moved non MD-SAL models outside of MD-SAL folder

This is just simple file movement without changing
group-ids and packages to better reflect their use.

This models are general purpose and are not part of MD-SAL,
but rather used on top of MD-SAL.

Change-Id: I4ed842ae878e5470ac16348a4f7e92231ae67f8e
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
---
 opendaylight/md-sal/pom.xml                                     | 1 -
 opendaylight/{md-sal => }/model/model-inventory/pom.xml         | 0
 .../model-inventory/src/main/yang/netconf-node-inventory.yang   | 0
 .../model-inventory/src/main/yang/opendaylight-inventory.yang   | 0
 opendaylight/{md-sal => }/model/model-topology/pom.xml          | 0
 .../src/main/yang/opendaylight-topology-inventory.yang          | 0
 .../src/main/yang/opendaylight-topology-view.yang               | 0
 .../model-topology/src/main/yang/opendaylight-topology.yang     | 0
 opendaylight/{md-sal => }/model/pom.xml                         | 0
 opendaylight/{md-sal => }/model/src/main/yang/.gitignore        | 0
 pom.xml                                                         | 2 ++
 11 files changed, 2 insertions(+), 1 deletion(-)
 rename opendaylight/{md-sal => }/model/model-inventory/pom.xml (100%)
 rename opendaylight/{md-sal => }/model/model-inventory/src/main/yang/netconf-node-inventory.yang (100%)
 rename opendaylight/{md-sal => }/model/model-inventory/src/main/yang/opendaylight-inventory.yang (100%)
 rename opendaylight/{md-sal => }/model/model-topology/pom.xml (100%)
 rename opendaylight/{md-sal => }/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang (100%)
 rename opendaylight/{md-sal => }/model/model-topology/src/main/yang/opendaylight-topology-view.yang (100%)
 rename opendaylight/{md-sal => }/model/model-topology/src/main/yang/opendaylight-topology.yang (100%)
 rename opendaylight/{md-sal => }/model/pom.xml (100%)
 rename opendaylight/{md-sal => }/model/src/main/yang/.gitignore (100%)

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index bab6bb9cc6..baa85ff788 100644
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -44,7 +44,6 @@
     <module>samples</module>
 
     <!-- Base Models -->
-    <module>model</module>
     <module>sal-remote</module>
     <module>sal-restconf-broker</module>
 
diff --git a/opendaylight/md-sal/model/model-inventory/pom.xml b/opendaylight/model/model-inventory/pom.xml
similarity index 100%
rename from opendaylight/md-sal/model/model-inventory/pom.xml
rename to opendaylight/model/model-inventory/pom.xml
diff --git a/opendaylight/md-sal/model/model-inventory/src/main/yang/netconf-node-inventory.yang b/opendaylight/model/model-inventory/src/main/yang/netconf-node-inventory.yang
similarity index 100%
rename from opendaylight/md-sal/model/model-inventory/src/main/yang/netconf-node-inventory.yang
rename to opendaylight/model/model-inventory/src/main/yang/netconf-node-inventory.yang
diff --git a/opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory.yang b/opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang
similarity index 100%
rename from opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory.yang
rename to opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang
diff --git a/opendaylight/md-sal/model/model-topology/pom.xml b/opendaylight/model/model-topology/pom.xml
similarity index 100%
rename from opendaylight/md-sal/model/model-topology/pom.xml
rename to opendaylight/model/model-topology/pom.xml
diff --git a/opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang b/opendaylight/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang
similarity index 100%
rename from opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang
rename to opendaylight/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang
diff --git a/opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-view.yang b/opendaylight/model/model-topology/src/main/yang/opendaylight-topology-view.yang
similarity index 100%
rename from opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-view.yang
rename to opendaylight/model/model-topology/src/main/yang/opendaylight-topology-view.yang
diff --git a/opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology.yang b/opendaylight/model/model-topology/src/main/yang/opendaylight-topology.yang
similarity index 100%
rename from opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology.yang
rename to opendaylight/model/model-topology/src/main/yang/opendaylight-topology.yang
diff --git a/opendaylight/md-sal/model/pom.xml b/opendaylight/model/pom.xml
similarity index 100%
rename from opendaylight/md-sal/model/pom.xml
rename to opendaylight/model/pom.xml
diff --git a/opendaylight/md-sal/model/src/main/yang/.gitignore b/opendaylight/model/src/main/yang/.gitignore
similarity index 100%
rename from opendaylight/md-sal/model/src/main/yang/.gitignore
rename to opendaylight/model/src/main/yang/.gitignore
diff --git a/pom.xml b/pom.xml
index bd5c3e1608..6ff7637298 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,8 @@
     <!-- netconf -->
     <module>opendaylight/netconf</module>
 
+    <module>opendaylight/model</module>
+
     <!-- Parents -->
     <module>opendaylight/commons/concepts</module>
     <module>opendaylight/commons/protocol-framework</module>
-- 
2.36.6