Adding a cord-config appliation which hosts configuration
classes common to several cord applications.
Change-Id: Ie8fba7dbfacb50f627407a6c9d96bfaea43a6b61
diff --git a/apps/cordconfig/pom.xml b/apps/cordconfig/pom.xml
new file mode 100644
index 0000000..1b16cec
--- /dev/null
+++ b/apps/cordconfig/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2015-present Open Networking Laboratory
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<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.onosproject</groupId>
+ <artifactId>onos-apps</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+
+ <artifactId>onos-cord-config</artifactId>
+ <packaging>bundle</packaging>
+
+ <description>Cord configuration meta applications </description>
+
+ <properties>
+ <onos.app.name>org.onosproject.cord-config</onos.app.name>
+ <onos.app.title>Cord Configuratuon Meta Application</onos.app.title>
+ <onos.app.category>Utility</onos.app.category>
+ <onos.app.url>http://opencord.org</onos.app.url>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-api</artifactId>
+ </dependency>
+ </dependencies>
+
+
+</project>
diff --git a/apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceConfig.java b/apps/cordconfig/src/main/java/org/onosproject/cordconfig/access/AccessDeviceConfig.java
similarity index 97%
rename from apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceConfig.java
rename to apps/cordconfig/src/main/java/org/onosproject/cordconfig/access/AccessDeviceConfig.java
index 5532e54..1e5e8cf 100644
--- a/apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceConfig.java
+++ b/apps/cordconfig/src/main/java/org/onosproject/cordconfig/access/AccessDeviceConfig.java
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-package org.onosproject.olt;
+package org.onosproject.cordconfig.access;
+import org.onosproject.net.DeviceId;
import com.fasterxml.jackson.databind.JsonNode;
import org.onlab.packet.VlanId;
-import org.onosproject.net.DeviceId;
+
import org.onosproject.net.PortNumber;
import org.onosproject.net.config.Config;
diff --git a/apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceData.java b/apps/cordconfig/src/main/java/org/onosproject/cordconfig/access/AccessDeviceData.java
similarity index 97%
rename from apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceData.java
rename to apps/cordconfig/src/main/java/org/onosproject/cordconfig/access/AccessDeviceData.java
index e292cef..74894d5 100644
--- a/apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceData.java
+++ b/apps/cordconfig/src/main/java/org/onosproject/cordconfig/access/AccessDeviceData.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.onosproject.olt;
+package org.onosproject.cordconfig.access;
import org.onlab.packet.VlanId;
import org.onosproject.net.DeviceId;
diff --git a/apps/cordconfig/src/main/java/org/onosproject/cordconfig/access/package-info.java b/apps/cordconfig/src/main/java/org/onosproject/cordconfig/access/package-info.java
new file mode 100644
index 0000000..55c553a
--- /dev/null
+++ b/apps/cordconfig/src/main/java/org/onosproject/cordconfig/access/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Meta Application for hosting common cord configuration classes.
+ */
+package org.onosproject.cordconfig.access;
\ No newline at end of file
diff --git a/apps/cordmcast/src/main/java/org/onosproject/cordmcast/CordMcast.java b/apps/cordmcast/src/main/java/org/onosproject/cordmcast/CordMcast.java
index 012e7ed..19b4e2d 100644
--- a/apps/cordmcast/src/main/java/org/onosproject/cordmcast/CordMcast.java
+++ b/apps/cordmcast/src/main/java/org/onosproject/cordmcast/CordMcast.java
@@ -37,6 +37,8 @@
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.JsonCodec;
+import org.onosproject.cordconfig.access.AccessDeviceConfig;
+import org.onosproject.cordconfig.access.AccessDeviceData;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.net.ConnectPoint;
@@ -62,8 +64,7 @@
import org.onosproject.net.mcast.McastRoute;
import org.onosproject.net.mcast.McastRouteInfo;
import org.onosproject.net.mcast.MulticastRouteService;
-import org.onosproject.olt.AccessDeviceConfig;
-import org.onosproject.olt.AccessDeviceData;
+
import org.onosproject.rest.AbstractWebResource;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
diff --git a/apps/igmp/src/main/java/org/onosproject/igmp/IgmpSnoop.java b/apps/igmp/src/main/java/org/onosproject/igmp/IgmpSnoop.java
index 96a94cb..aba5bbf 100644
--- a/apps/igmp/src/main/java/org/onosproject/igmp/IgmpSnoop.java
+++ b/apps/igmp/src/main/java/org/onosproject/igmp/IgmpSnoop.java
@@ -34,6 +34,8 @@
import org.onlab.util.SafeRecurringTask;
import org.onlab.util.Tools;
import org.onosproject.cfg.ComponentConfigService;
+import org.onosproject.cordconfig.access.AccessDeviceConfig;
+import org.onosproject.cordconfig.access.AccessDeviceData;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.net.ConnectPoint;
@@ -64,8 +66,7 @@
import org.onosproject.net.packet.PacketContext;
import org.onosproject.net.packet.PacketProcessor;
import org.onosproject.net.packet.PacketService;
-import org.onosproject.olt.AccessDeviceConfig;
-import org.onosproject.olt.AccessDeviceData;
+
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
diff --git a/apps/olt/api/pom.xml b/apps/olt/api/pom.xml
index b884942..570d55b 100644
--- a/apps/olt/api/pom.xml
+++ b/apps/olt/api/pom.xml
@@ -52,6 +52,11 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-cord-config</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
diff --git a/apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceService.java b/apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceService.java
index ab6cd68..aa90540 100644
--- a/apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceService.java
+++ b/apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceService.java
@@ -17,6 +17,7 @@
package org.onosproject.olt;
import org.onlab.packet.VlanId;
+import org.onosproject.cordconfig.access.AccessDeviceData;
import org.onosproject.event.ListenerService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
diff --git a/apps/olt/app/pom.xml b/apps/olt/app/pom.xml
index 2657db3..91cce29 100644
--- a/apps/olt/app/pom.xml
+++ b/apps/olt/app/pom.xml
@@ -43,6 +43,11 @@
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
+ <artifactId>onos-cord-config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-app-olt-api</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/apps/olt/app/src/main/java/org/onosproject/olt/cli/ShowOltCommand.java b/apps/olt/app/src/main/java/org/onosproject/olt/cli/ShowOltCommand.java
index 1c121b3..a59714b 100644
--- a/apps/olt/app/src/main/java/org/onosproject/olt/cli/ShowOltCommand.java
+++ b/apps/olt/app/src/main/java/org/onosproject/olt/cli/ShowOltCommand.java
@@ -19,8 +19,8 @@
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cordconfig.access.AccessDeviceData;
import org.onosproject.net.DeviceId;
-import org.onosproject.olt.AccessDeviceData;
import org.onosproject.olt.AccessDeviceService;
import java.util.Map;
diff --git a/apps/olt/app/src/main/java/org/onosproject/olt/impl/Olt.java b/apps/olt/app/src/main/java/org/onosproject/olt/impl/Olt.java
index 3e766e6..7075213 100644
--- a/apps/olt/app/src/main/java/org/onosproject/olt/impl/Olt.java
+++ b/apps/olt/app/src/main/java/org/onosproject/olt/impl/Olt.java
@@ -27,6 +27,8 @@
import org.onlab.packet.EthType;
import org.onlab.packet.VlanId;
import org.onosproject.cfg.ComponentConfigService;
+import org.onosproject.cordconfig.access.AccessDeviceConfig;
+import org.onosproject.cordconfig.access.AccessDeviceData;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.event.AbstractListenerManager;
@@ -56,8 +58,6 @@
import org.onosproject.net.flowobjective.Objective;
import org.onosproject.net.flowobjective.ObjectiveContext;
import org.onosproject.net.flowobjective.ObjectiveError;
-import org.onosproject.olt.AccessDeviceConfig;
-import org.onosproject.olt.AccessDeviceData;
import org.onosproject.olt.AccessDeviceEvent;
import org.onosproject.olt.AccessDeviceListener;
import org.onosproject.olt.AccessDeviceService;
diff --git a/apps/pom.xml b/apps/pom.xml
index 73479f7..501b4f0 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -74,6 +74,7 @@
<module>gangliametrics</module>
<module>graphitemetrics</module>
<module>xosclient</module>
+ <module>cordconfig</module>
</modules>
<properties>