Keep only Open ROARM models in ordmodels

All other yang files are moved into api.
It may allow using git submodules or git subtree to get ordmodels.

Change-Id: Ib887868bd7213a3e02bbe58a1531f8d1b05ae6f1
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/api/pom.xml b/api/pom.xml
index 9422d1bf2b6bf6baaccd61cd9609457e1048b52b..905b5f676ee2922fe6c793e03dfa980429ab6996 100644 (file)
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -29,4 +29,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
   </dependencies>
 
+  <!--
+    Private references
+  -->
+  <build>
+     <plugins>
+       <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>3.0.1</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Include-Resource>{maven-resources},target/classes/LICENSE,META-INF/git.properties=-target/classes/META-INF/git.properties</Include-Resource>
+            <_exportcontents>
+              org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.transportpce.stubrenderer.rev170403.service.implementation.request.input,
+              org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.rev170120.service.implementation.request.input,
+              org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev161014.internal.link,
+              org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev161014.internal.links,*
+            </_exportcontents>
+          </instructions>
+        </configuration>
+       </plugin>
+     </plugins>
+  </build>
+
 </project>

diff --git a/ordmodels/src/main/yang/service_path_v1.5/transportpce-common-service-path-types.yang b/api/src/main/yang/service_path_v1.5/transportpce-common-service-path-types.yang
similarity index 100%
rename from ordmodels/src/main/yang/service_path_v1.5/transportpce-common-service-path-types.yang
rename to api/src/main/yang/service_path_v1.5/transportpce-common-service-path-types.yang

diff --git a/ordmodels/src/main/yang/service_path_v1.5/transportpce-pathDescription.yang b/api/src/main/yang/service_path_v1.5/transportpce-pathDescription.yang
similarity index 100%
rename from ordmodels/src/main/yang/service_path_v1.5/transportpce-pathDescription.yang
rename to api/src/main/yang/service_path_v1.5/transportpce-pathDescription.yang

diff --git a/ordmodels/src/main/yang/service_path_v1.5/transportpce-routing-constraints.yang b/api/src/main/yang/service_path_v1.5/transportpce-routing-constraints.yang
similarity index 100%
rename from ordmodels/src/main/yang/service_path_v1.5/transportpce-routing-constraints.yang
rename to api/src/main/yang/service_path_v1.5/transportpce-routing-constraints.yang

diff --git a/ordmodels/src/main/yang/service_path_v1.5/transportpce-service-path.yang b/api/src/main/yang/service_path_v1.5/transportpce-service-path.yang
similarity index 100%
rename from ordmodels/src/main/yang/service_path_v1.5/transportpce-service-path.yang
rename to api/src/main/yang/service_path_v1.5/transportpce-service-path.yang

diff --git a/ordmodels/src/main/yang/servicehandler@2016-10-14.yang b/api/src/main/yang/servicehandler@2016-10-14.yang
similarity index 100%
rename from ordmodels/src/main/yang/servicehandler@2016-10-14.yang
rename to api/src/main/yang/servicehandler@2016-10-14.yang

diff --git a/ordmodels/src/main/yang/stubpce.yang b/api/src/main/yang/stubpce.yang
similarity index 100%
rename from ordmodels/src/main/yang/stubpce.yang
rename to api/src/main/yang/stubpce.yang

diff --git a/ordmodels/src/main/yang/stubrenderer.yang b/api/src/main/yang/stubrenderer.yang
similarity index 100%
rename from ordmodels/src/main/yang/stubrenderer.yang
rename to api/src/main/yang/stubrenderer.yang

diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml
index 97dec4712c366934d006c073d13ec4d90dcf21a2..855c650875610e9087e4503f78f71e52f4bce4c6 100644 (file)
--- a/ordmodels/pom.xml
+++ b/ordmodels/pom.xml
@@ -62,30 +62,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>ietf-packet-fields</artifactId>
       <version>0.9.0-SNAPSHOT</version>
     </dependency>
-
   </dependencies>
-  <!--
-       Private references
-  -->
-  <build>
-    <plugins>
-                <plugin>
-                         <groupId>org.apache.felix</groupId>
-                         <artifactId>maven-bundle-plugin</artifactId>
-                         <version>3.0.1</version>
-                         <extensions>true</extensions>
-                         <configuration>
-                               <instructions>
-                                 <Include-Resource>{maven-resources},target/classes/LICENSE,META-INF/git.properties=-target/classes/META-INF/git.properties</Include-Resource>
-                                         <_exportcontents>
-                                                 org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.transportpce.stubrenderer.rev170403.service.implementation.request.input,
-                                                 org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.rev170120.service.implementation.request.input,
-                                                 org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev161014.internal.link,
-                                                 org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev161014.internal.links,*
-                                         </_exportcontents>
-                               </instructions>
-                         </configuration>
-        </plugin>
-       </plugins>
-  </build> 
 </project>