Refactors IGMPProxy application in API and APP bundles
Change-Id: I465d6c0f49079804ae8e0a1f464581c25c6d2300
diff --git a/api/pom.xml b/api/pom.xml
new file mode 100644
index 0000000..d710660
--- /dev/null
+++ b/api/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2015-present Open Networking Foundation
+ ~
+ ~ 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">
+ <parent>
+ <artifactId>onos-app-igmpproxy</artifactId>
+ <groupId>org.opencord</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>onos-app-igmpproxy-api</artifactId>
+
+ <packaging>bundle</packaging>
+ <description>IGMPProxy application API</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-api</artifactId>
+ <version>${onos.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/src/main/java/org/opencord/igmpproxy/IgmpStatistics.java b/api/src/main/java/org/opencord/igmpproxy/IgmpStatistics.java
similarity index 100%
rename from src/main/java/org/opencord/igmpproxy/IgmpStatistics.java
rename to api/src/main/java/org/opencord/igmpproxy/IgmpStatistics.java
diff --git a/src/main/java/org/opencord/igmpproxy/IgmpStatisticsEvent.java b/api/src/main/java/org/opencord/igmpproxy/IgmpStatisticsEvent.java
similarity index 100%
rename from src/main/java/org/opencord/igmpproxy/IgmpStatisticsEvent.java
rename to api/src/main/java/org/opencord/igmpproxy/IgmpStatisticsEvent.java
diff --git a/src/main/java/org/opencord/igmpproxy/IgmpStatisticsEventListener.java b/api/src/main/java/org/opencord/igmpproxy/IgmpStatisticsEventListener.java
similarity index 100%
rename from src/main/java/org/opencord/igmpproxy/IgmpStatisticsEventListener.java
rename to api/src/main/java/org/opencord/igmpproxy/IgmpStatisticsEventListener.java
diff --git a/src/main/java/org/opencord/igmpproxy/IgmpStatisticsService.java b/api/src/main/java/org/opencord/igmpproxy/IgmpStatisticsService.java
similarity index 100%
rename from src/main/java/org/opencord/igmpproxy/IgmpStatisticsService.java
rename to api/src/main/java/org/opencord/igmpproxy/IgmpStatisticsService.java
diff --git a/src/main/java/org/opencord/igmpproxy/package-info.java b/api/src/main/java/org/opencord/igmpproxy/package-info.java
similarity index 100%
rename from src/main/java/org/opencord/igmpproxy/package-info.java
rename to api/src/main/java/org/opencord/igmpproxy/package-info.java
diff --git a/app.xml b/app/app.xml
similarity index 69%
rename from app.xml
rename to app/app.xml
index a7b8e52..33b0ef8 100644
--- a/app.xml
+++ b/app/app.xml
@@ -15,8 +15,10 @@
~ limitations under the License.
-->
<app name="org.opencord.igmpproxy" origin="Nokia" version="${project.version}"
- featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
- features="${project.artifactId}">
+ category="Traffic Steering" url="http://onosproject.org" title="IGMPProxy application for CORD"
+ featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
+ features="${project.artifactId}" apps="org.onosproject.mcast,org.opencord.sadis">
<description>IGMP PROXY APP</description>
<artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
+ <artifact>mvn:${project.groupId}/onos-app-igmpproxy-api/${project.version}</artifact>
</app>
diff --git a/app/features.xml b/app/features.xml
new file mode 100644
index 0000000..412164e
--- /dev/null
+++ b/app/features.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ ~ Copyright 2018-present Open Networking Foundation
+ ~
+ ~ 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.
+ -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
+ <feature name="${project.artifactId}" version="${project.version}"
+ description="${project.description}">
+ <feature>onos-api</feature>
+ <bundle>mvn:${project.groupId}/onos-app-igmpproxy-api/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
+ </feature>
+</features>
diff --git a/app/pom.xml b/app/pom.xml
new file mode 100644
index 0000000..0d1c075
--- /dev/null
+++ b/app/pom.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2015-present Open Networking Foundation
+ ~
+ ~ 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">
+ <parent>
+ <artifactId>onos-app-igmpproxy</artifactId>
+ <groupId>org.opencord</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>onos-app-igmpproxy-app</artifactId>
+
+ <packaging>bundle</packaging>
+ <description>IGMPProxy application for CORD</description>
+
+ <properties>
+ <onos.app.name>org.opencord.igmpproxy</onos.app.name>
+ <onos.app.category>Traffic Steering</onos.app.category>
+ <onos.app.title>IGMP proxy app</onos.app.title>
+ <onos.app.url>http://opencord.org</onos.app.url>
+ <onos.app.readme>IGMP implementation.</onos.app.readme>
+ <onos.app.requires>
+ org.onosproject.mcast
+ org.opencord.sadis
+ </onos.app.requires>
+ <sadis.api.version>5.0.0</sadis.api.version>
+ </properties>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-api</artifactId>
+ <version>${onos.version}</version>
+ <scope>provided</scope>
+ <classifier>tests</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-cli</artifactId>
+ <version>${onos.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onlab-osgi</artifactId>
+ <version>${onos.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onlab-junit</artifactId>
+ <version>${onos.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onlab-misc</artifactId>
+ <version>${onos.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.opencord</groupId>
+ <artifactId>sadis-api</artifactId>
+ <version>${sadis.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.opencord</groupId>
+ <artifactId>onos-app-igmpproxy-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-apps-mcast-api</artifactId>
+ <version>${onos.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/src/main/java/org/opencord/igmpproxy/GroupMember.java b/app/src/main/java/org/opencord/igmpproxy/impl/GroupMember.java
similarity index 99%
rename from src/main/java/org/opencord/igmpproxy/GroupMember.java
rename to app/src/main/java/org/opencord/igmpproxy/impl/GroupMember.java
index 5101167..a05b962 100644
--- a/src/main/java/org/opencord/igmpproxy/GroupMember.java
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/GroupMember.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.opencord.igmpproxy;
+package org.opencord.igmpproxy.impl;
import org.onlab.packet.IGMPMembership;
import org.onlab.packet.Ip4Address;
diff --git a/src/main/java/org/opencord/igmpproxy/IgmpManager.java b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java
similarity index 99%
rename from src/main/java/org/opencord/igmpproxy/IgmpManager.java
rename to app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java
index d5677f0..11e28e5 100644
--- a/src/main/java/org/opencord/igmpproxy/IgmpManager.java
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java
@@ -13,11 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.opencord.igmpproxy;
+package org.opencord.igmpproxy.impl;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.onosproject.net.Device;
+import org.opencord.igmpproxy.IgmpStatisticsService;
import org.opencord.sadis.BaseInformationService;
import org.opencord.sadis.SadisService;
import org.opencord.sadis.SubscriberAndDeviceInformation;
diff --git a/src/main/java/org/opencord/igmpproxy/IgmpSender.java b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpSender.java
similarity index 98%
rename from src/main/java/org/opencord/igmpproxy/IgmpSender.java
rename to app/src/main/java/org/opencord/igmpproxy/impl/IgmpSender.java
index 02cc4ee..a4cbaa5 100644
--- a/src/main/java/org/opencord/igmpproxy/IgmpSender.java
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpSender.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.opencord.igmpproxy;
+package org.opencord.igmpproxy.impl;
import org.onlab.packet.Ethernet;
import org.onlab.packet.IGMP;
@@ -32,6 +32,7 @@
import org.onosproject.net.packet.DefaultOutboundPacket;
import org.onosproject.net.packet.OutboundPacket;
import org.onosproject.net.packet.PacketService;
+import org.opencord.igmpproxy.IgmpStatisticsService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/opencord/igmpproxy/IgmpStatisticsManager.java b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpStatisticsManager.java
similarity index 93%
rename from src/main/java/org/opencord/igmpproxy/IgmpStatisticsManager.java
rename to app/src/main/java/org/opencord/igmpproxy/impl/IgmpStatisticsManager.java
index af834ef..21d0011 100644
--- a/src/main/java/org/opencord/igmpproxy/IgmpStatisticsManager.java
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpStatisticsManager.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.opencord.igmpproxy;
+package org.opencord.igmpproxy.impl;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.ComponentContext;
@@ -28,6 +28,13 @@
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.opencord.igmpproxy.IgmpStatistics;
+import org.opencord.igmpproxy.IgmpStatisticsService;
+import org.opencord.igmpproxy.IgmpStatisticsEvent;
+import org.opencord.igmpproxy.IgmpStatisticsEventListener;
+
+import static org.opencord.igmpproxy.impl.OsgiPropertyConstants.STATISTICS_GENERATION_PERIOD;
+import static org.opencord.igmpproxy.impl.OsgiPropertyConstants.STATISTICS_GENERATION_PERIOD_DEFAULT;
import static org.slf4j.LoggerFactory.getLogger;
import java.util.Dictionary;
@@ -40,8 +47,6 @@
import com.google.common.base.Strings;
-import static org.opencord.igmpproxy.OsgiPropertyConstants.STATISTICS_GENERATION_PERIOD;
-import static org.opencord.igmpproxy.OsgiPropertyConstants.STATISTICS_GENERATION_PERIOD_DEFAULT;
/**
diff --git a/src/main/java/org/opencord/igmpproxy/IgmpTimer.java b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpTimer.java
similarity index 97%
rename from src/main/java/org/opencord/igmpproxy/IgmpTimer.java
rename to app/src/main/java/org/opencord/igmpproxy/impl/IgmpTimer.java
index 4d5e5d8..c4a17c9 100644
--- a/src/main/java/org/opencord/igmpproxy/IgmpTimer.java
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpTimer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.opencord.igmpproxy;
+package org.opencord.igmpproxy.impl;
import com.google.common.collect.Maps;
diff --git a/src/main/java/org/opencord/igmpproxy/IgmpproxyConfig.java b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpproxyConfig.java
similarity index 99%
rename from src/main/java/org/opencord/igmpproxy/IgmpproxyConfig.java
rename to app/src/main/java/org/opencord/igmpproxy/impl/IgmpproxyConfig.java
index b59c2c1..e8297c1 100644
--- a/src/main/java/org/opencord/igmpproxy/IgmpproxyConfig.java
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpproxyConfig.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.opencord.igmpproxy;
+package org.opencord.igmpproxy.impl;
import org.onosproject.core.ApplicationId;
import org.onosproject.net.ConnectPoint;
diff --git a/src/main/java/org/opencord/igmpproxy/IgmpproxySsmTranslateConfig.java b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpproxySsmTranslateConfig.java
similarity index 93%
rename from src/main/java/org/opencord/igmpproxy/IgmpproxySsmTranslateConfig.java
rename to app/src/main/java/org/opencord/igmpproxy/impl/IgmpproxySsmTranslateConfig.java
index 8565a1b..4c75d47 100644
--- a/src/main/java/org/opencord/igmpproxy/IgmpproxySsmTranslateConfig.java
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpproxySsmTranslateConfig.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.opencord.igmpproxy;
+package org.opencord.igmpproxy.impl;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Lists;
import org.onlab.packet.IpAddress;
import org.onosproject.core.ApplicationId;
import org.onosproject.mcast.api.McastRoute;
import org.onosproject.net.config.Config;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -55,7 +55,7 @@
* @return SSM translations
*/
public List<McastRoute> getSsmTranslations() {
- List<McastRoute> translations = new ArrayList();
+ List<McastRoute> translations = Lists.newArrayList();
for (JsonNode node : array) {
translations.add(
new McastRoute(
diff --git a/src/main/java/org/opencord/igmpproxy/OsgiPropertyConstants.java b/app/src/main/java/org/opencord/igmpproxy/impl/OsgiPropertyConstants.java
similarity index 95%
rename from src/main/java/org/opencord/igmpproxy/OsgiPropertyConstants.java
rename to app/src/main/java/org/opencord/igmpproxy/impl/OsgiPropertyConstants.java
index 80d5cf0..94300b5 100644
--- a/src/main/java/org/opencord/igmpproxy/OsgiPropertyConstants.java
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/OsgiPropertyConstants.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.opencord.igmpproxy;
+package org.opencord.igmpproxy.impl;
/**
* Constants for default values of configurable properties.
diff --git a/src/main/java/org/opencord/igmpproxy/SingleStateMachine.java b/app/src/main/java/org/opencord/igmpproxy/impl/SingleStateMachine.java
similarity index 98%
rename from src/main/java/org/opencord/igmpproxy/SingleStateMachine.java
rename to app/src/main/java/org/opencord/igmpproxy/impl/SingleStateMachine.java
index c2b32a4..c4d73a8 100644
--- a/src/main/java/org/opencord/igmpproxy/SingleStateMachine.java
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/SingleStateMachine.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.opencord.igmpproxy;
+package org.opencord.igmpproxy.impl;
import org.onlab.packet.Ethernet;
import org.onlab.packet.Ip4Address;
diff --git a/src/main/java/org/opencord/igmpproxy/StateMachine.java b/app/src/main/java/org/opencord/igmpproxy/impl/StateMachine.java
similarity index 98%
rename from src/main/java/org/opencord/igmpproxy/StateMachine.java
rename to app/src/main/java/org/opencord/igmpproxy/impl/StateMachine.java
index 1097560..e87756d 100644
--- a/src/main/java/org/opencord/igmpproxy/StateMachine.java
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/StateMachine.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.opencord.igmpproxy;
+package org.opencord.igmpproxy.impl;
import com.google.common.collect.Maps;
import org.onlab.packet.Ip4Address;
diff --git a/app/src/main/java/org/opencord/igmpproxy/impl/package-info.java b/app/src/main/java/org/opencord/igmpproxy/impl/package-info.java
new file mode 100644
index 0000000..92e5a4c
--- /dev/null
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * 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.
+ */
+
+/**
+ * Implementation of IGMPProxy application.
+ */
+package org.opencord.igmpproxy.impl;
diff --git a/src/test/java/org/opencord/igmpproxy/IgmpManagerBase.java b/app/src/test/java/org/opencord/igmpproxy/impl/IgmpManagerBase.java
similarity index 99%
rename from src/test/java/org/opencord/igmpproxy/IgmpManagerBase.java
rename to app/src/test/java/org/opencord/igmpproxy/impl/IgmpManagerBase.java
index 4c68b1b..b301f94 100644
--- a/src/test/java/org/opencord/igmpproxy/IgmpManagerBase.java
+++ b/app/src/test/java/org/opencord/igmpproxy/impl/IgmpManagerBase.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.opencord.igmpproxy;
+package org.opencord.igmpproxy.impl;
import com.google.common.collect.ImmutableSet;
import org.onlab.packet.Ethernet;
@@ -247,7 +247,7 @@
@SuppressWarnings("unchecked")
@Override
public <S, C extends Config<S>> C getConfig(S subject, Class<C> configClass) {
- if (configClass.getName().equalsIgnoreCase("org.opencord.igmpproxy.IgmpproxyConfig")) {
+ if (configClass.getName().equalsIgnoreCase("org.opencord.igmpproxy.impl.IgmpproxyConfig")) {
IgmpproxyConfig igmpproxyConfig = new MockIgmpProxyConfig(igmpOnPodFlag);
return (C) igmpproxyConfig;
} else {
diff --git a/src/test/java/org/opencord/igmpproxy/IgmpManagerTest.java b/app/src/test/java/org/opencord/igmpproxy/impl/IgmpManagerTest.java
similarity index 97%
rename from src/test/java/org/opencord/igmpproxy/IgmpManagerTest.java
rename to app/src/test/java/org/opencord/igmpproxy/impl/IgmpManagerTest.java
index 8159463..dc220f8 100644
--- a/src/test/java/org/opencord/igmpproxy/IgmpManagerTest.java
+++ b/app/src/test/java/org/opencord/igmpproxy/impl/IgmpManagerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.opencord.igmpproxy;
+package org.opencord.igmpproxy.impl;
import org.junit.After;
import org.junit.Before;
@@ -23,7 +23,7 @@
import org.onosproject.core.CoreServiceAdapter;
import org.onosproject.net.flow.FlowRuleServiceAdapter;
import org.onosproject.net.flowobjective.FlowObjectiveServiceAdapter;
-import org.opencord.igmpproxy.IgmpManagerBase.MockComponentContext;
+import org.opencord.igmpproxy.impl.IgmpManagerBase.MockComponentContext;
import static org.junit.Assert.*;
diff --git a/src/test/java/org/opencord/igmpproxy/IgmpStatisticsTest.java b/app/src/test/java/org/opencord/igmpproxy/impl/IgmpStatisticsTest.java
similarity index 97%
rename from src/test/java/org/opencord/igmpproxy/IgmpStatisticsTest.java
rename to app/src/test/java/org/opencord/igmpproxy/impl/IgmpStatisticsTest.java
index 1198d1a..2677511 100644
--- a/src/test/java/org/opencord/igmpproxy/IgmpStatisticsTest.java
+++ b/app/src/test/java/org/opencord/igmpproxy/impl/IgmpStatisticsTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.opencord.igmpproxy;
+package org.opencord.igmpproxy.impl;
import static org.junit.Assert.assertEquals;
import static org.onlab.junit.TestTools.assertAfter;
@@ -31,7 +31,10 @@
import org.onosproject.net.flow.FlowRuleServiceAdapter;
import org.onosproject.net.flowobjective.FlowObjectiveServiceAdapter;
+import org.opencord.igmpproxy.IgmpStatisticsEvent;
+
import com.google.common.collect.Lists;
+import org.opencord.igmpproxy.IgmpStatisticsEventListener;
/**
* Set of tests of the ONOS application component for IGMP Statistics.
diff --git a/pom.xml b/pom.xml
index d5764a1..ebb653f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,88 +22,18 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-dependencies</artifactId>
- <version>2.2.1-b3</version>
+ <version>2.2.1</version>
</parent>
<groupId>org.opencord</groupId>
<artifactId>onos-app-igmpproxy</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <packaging>pom</packaging>
- <description>IGMP proxy app</description>
-
- <properties>
- <onos.app.name>org.opencord.igmpproxy</onos.app.name>
- <onos.app.category>Traffic Steering</onos.app.category>
- <onos.app.title>IGMP proxy app</onos.app.title>
- <onos.app.url>http://opencord.org</onos.app.url>
- <onos.app.readme>IGMP implementation.</onos.app.readme>
- <onos.app.requires>
- org.onosproject.mcast
- </onos.app.requires>
- <sadis.api.version>5.0.0</sadis.api.version>
- </properties>
-
-
- <dependencies>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-api</artifactId>
- <version>${onos.version}</version>
- <scope>provided</scope>
- <classifier>tests</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-cli</artifactId>
- <version>${onos.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-osgi</artifactId>
- <version>${onos.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-junit</artifactId>
- <version>${onos.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-misc</artifactId>
- <version>${onos.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.opencord</groupId>
- <artifactId>sadis-api</artifactId>
- <version>${sadis.api.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-apps-mcast-api</artifactId>
- <version>${onos.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <modules>
+ <module>app</module>
+ <module>api</module>
+ </modules>
<repositories>
<repository>
@@ -130,4 +60,10 @@
</snapshots>
</repository>
</repositories>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
</project>