From 45dad62cd60b4957de85a4d2ad135341ac850f41 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 23 Oct 2020 16:57:35 +0200
Subject: [PATCH] Move models to top-level directory

Having the 'opendaylight' indirection is useless, move the models
first as we expect few changes to them. Also cleanup module order
in top-level aggragator.

Change-Id: Ibbdcc6c68f643f13e58741ab5e59b4724693806c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../model => model}/model-inventory/pom.xml    |  0
 .../src/main/yang/opendaylight-inventory.yang  |  0
 .../model => model}/model-topology/pom.xml     |  2 +-
 .../yang/opendaylight-topology-inventory.yang  |  0
 .../main/yang/opendaylight-topology-view.yang  |  0
 .../src/main/yang/opendaylight-topology.yang   |  0
 {opendaylight/model => model}/pom.xml          |  0
 pom.xml                                        | 18 +++++++-----------
 8 files changed, 8 insertions(+), 12 deletions(-)
 rename {opendaylight/model => model}/model-inventory/pom.xml (100%)
 rename {opendaylight/model => model}/model-inventory/src/main/yang/opendaylight-inventory.yang (100%)
 rename {opendaylight/model => model}/model-topology/pom.xml (96%)
 rename {opendaylight/model => model}/model-topology/src/main/yang/opendaylight-topology-inventory.yang (100%)
 rename {opendaylight/model => model}/model-topology/src/main/yang/opendaylight-topology-view.yang (100%)
 rename {opendaylight/model => model}/model-topology/src/main/yang/opendaylight-topology.yang (100%)
 rename {opendaylight/model => model}/pom.xml (100%)

diff --git a/opendaylight/model/model-inventory/pom.xml b/model/model-inventory/pom.xml
similarity index 100%
rename from opendaylight/model/model-inventory/pom.xml
rename to model/model-inventory/pom.xml
diff --git a/opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang b/model/model-inventory/src/main/yang/opendaylight-inventory.yang
similarity index 100%
rename from opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang
rename to model/model-inventory/src/main/yang/opendaylight-inventory.yang
diff --git a/opendaylight/model/model-topology/pom.xml b/model/model-topology/pom.xml
similarity index 96%
rename from opendaylight/model/model-topology/pom.xml
rename to model/model-topology/pom.xml
index 6e3fe7ecb1..2ce97576e3 100644
--- a/opendaylight/model/model-topology/pom.xml
+++ b/model/model-topology/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-parent</artifactId>
         <version>3.0.2-SNAPSHOT</version>
-        <relativePath>../../md-sal/parent</relativePath>
+        <relativePath>../opendaylight/md-sal/parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller.model</groupId>
diff --git a/opendaylight/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang b/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang
similarity index 100%
rename from opendaylight/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang
rename to model/model-topology/src/main/yang/opendaylight-topology-inventory.yang
diff --git a/opendaylight/model/model-topology/src/main/yang/opendaylight-topology-view.yang b/model/model-topology/src/main/yang/opendaylight-topology-view.yang
similarity index 100%
rename from opendaylight/model/model-topology/src/main/yang/opendaylight-topology-view.yang
rename to model/model-topology/src/main/yang/opendaylight-topology-view.yang
diff --git a/opendaylight/model/model-topology/src/main/yang/opendaylight-topology.yang b/model/model-topology/src/main/yang/opendaylight-topology.yang
similarity index 100%
rename from opendaylight/model/model-topology/src/main/yang/opendaylight-topology.yang
rename to model/model-topology/src/main/yang/opendaylight-topology.yang
diff --git a/opendaylight/model/pom.xml b/model/pom.xml
similarity index 100%
rename from opendaylight/model/pom.xml
rename to model/pom.xml
diff --git a/pom.xml b/pom.xml
index 064fac1daf..748492f925 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,28 +22,24 @@
 
   <modules>
     <module>artifacts</module>
-    <module>bundle-parent</module>
+    <module>docs</module>
+    <module>features</module>
+    <module>karaf</module>
+
     <module>akka</module>
+    <module>bundle-parent</module>
+    <module>benchmark</module>
+    <module>model</module>
 
     <!-- md-sal -->
     <module>opendaylight/md-sal</module>
     <!-- config -->
     <module>opendaylight/config</module>
 
-    <module>opendaylight/model</module>
-
     <module>opendaylight/blueprint</module>
 
     <!-- Parents -->
-    <module>benchmark</module>
     <module>opendaylight/commons/jolokia</module>
-
-    <!-- Karaf Distribution -->
-    <module>karaf</module>
-    <module>features</module>
-
-    <!-- documentation -->
-    <module>docs</module>
   </modules>
 
   <profiles>
-- 
2.36.6