BUG-726: Move pcep topology tunnel to aggregator 83/66183/1
authorClaudio D. Gasparini <claudio.gasparini@pantheon.tech>
Sat, 2 Dec 2017 13:27:47 +0000 (14:27 +0100)
committerClaudio D. Gasparini <claudio.gasparini@pantheon.tech>
Sat, 2 Dec 2017 13:31:49 +0000 (14:31 +0100)
Change-Id: Ib6b63744c2ac9d7c345c5d85cddc02a19ca3ea3f
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
19 files changed:
pcep/pom.xml
pcep/tunnel/pom.xml [new file with mode: 0644]
pcep/tunnel/tunnel-api/pom.xml [moved from pcep/tunnel-api/pom.xml with 98% similarity]
pcep/tunnel/tunnel-api/src/main/yang/topology-tunnel-pcep-programming.yang [moved from pcep/tunnel-api/src/main/yang/topology-tunnel-pcep-programming.yang with 100% similarity]
pcep/tunnel/tunnel-api/src/main/yang/topology-tunnel-pcep.yang [moved from pcep/tunnel-api/src/main/yang/topology-tunnel-pcep.yang with 100% similarity]
pcep/tunnel/tunnel-provider/pom.xml [moved from pcep/tunnel-provider/pom.xml with 99% similarity]
pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java [moved from pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java with 100% similarity]
pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/DestroyTunnelInstructionExecutor.java [moved from pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/DestroyTunnelInstructionExecutor.java with 100% similarity]
pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java [moved from pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java with 100% similarity]
pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/PCEPTunnelTopologyProvider.java [moved from pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/PCEPTunnelTopologyProvider.java with 100% similarity]
pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunelProgrammingUtil.java [moved from pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunelProgrammingUtil.java with 100% similarity]
pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java [moved from pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java with 100% similarity]
pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/UpdateTunnelInstructionExecutor.java [moved from pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/UpdateTunnelInstructionExecutor.java with 100% similarity]
pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModule.java [moved from pcep/tunnel-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModule.java with 100% similarity]
pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleFactory.java [moved from pcep/tunnel-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleFactory.java with 100% similarity]
pcep/tunnel/tunnel-provider/src/main/yang/odl-pcep-tunnel-provider-cfg.yang [moved from pcep/tunnel-provider/src/main/yang/odl-pcep-tunnel-provider-cfg.yang with 100% similarity]
pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java [moved from pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java with 100% similarity]
pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java [moved from pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java with 100% similarity]
pcep/tunnel/tunnel-provider/src/test/resources/logback-test.xml [moved from pcep/tunnel-provider/src/test/resources/logback-test.xml with 100% similarity]

index e6246276094074e17e5c32ef3e321349d9bad3ba..243f376a06c37dcb85c18951e5218450f01e16fb 100644 (file)
         <module>base-parser</module>
         <module>ietf-stateful07</module>
         <module>testtool</module>
-        <module>tunnel-api</module>
-        <module>tunnel-provider</module>
         <module>topology</module>
         <module>segment-routing</module>
         <module>pcc-mock</module>
         <module>auto-bandwidth-extension</module>
         <module>config-example</module>
+        <module>tunnel</module>
     </modules>
 </project>
diff --git a/pcep/tunnel/pom.xml b/pcep/tunnel/pom.xml
new file mode 100644 (file)
index 0000000..d4fbbb4
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2017 AT&T Intellectual Property. 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
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.0.5</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.bgpcep</groupId>
+    <artifactId>pcep-tunnel-parent</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <description>PCEP Tunnel Topology related components</description>
+    <name>${project.artifactId}</name>
+
+    <modules>
+        <module>tunnel-api</module>
+        <module>tunnel-provider</module>
+    </modules>
+</project>
\ No newline at end of file
similarity index 98%
rename from pcep/tunnel-api/pom.xml
rename to pcep/tunnel/tunnel-api/pom.xml
index 81bffb77f44e4170f707ae42ace73631678554cc..ae9df71712e90abadd495c7a7d4e43d83405fca5 100644 (file)
@@ -16,7 +16,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>binding-parent</artifactId>
         <version>0.9.0-SNAPSHOT</version>
-        <relativePath>../../binding-parent</relativePath>
+        <relativePath>../../../binding-parent</relativePath>
     </parent>
 
     <artifactId>pcep-tunnel-api</artifactId>
similarity index 99%
rename from pcep/tunnel-provider/pom.xml
rename to pcep/tunnel/tunnel-provider/pom.xml
index d5e9d47653e2d94b5d4085d8a932bd38588ec8dc..1a5ad225dfb6abf14db1e3b1278b9827e2aad6c4 100644 (file)
@@ -16,7 +16,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>config-parent</artifactId>
         <version>0.9.0-SNAPSHOT</version>
-        <relativePath>../../config-parent</relativePath>
+        <relativePath>../../../config-parent</relativePath>
     </parent>
 
     <artifactId>pcep-tunnel-provider</artifactId>