Fixed service activation failure
Change-Id: I73fde7feb76b897ab5074b1a8ac6487c7eb885d1
diff --git a/app.xml b/app.xml
deleted file mode 100644
index 2db42ad..0000000
--- a/app.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-<app name="org.opencord.vtn" origin="ON.Lab" version="${project.version}"
- category="Traffic Steering" url="http://onosproject.org" title="CORD Virtual Tenant Network"
- featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
- features="${project.artifactId}"
- apps="org.onosproject.ovsdb-base,org.onosproject.dhcp,org.onosproject.xosclient,org.opencord.config">
- <description>${project.description}</description>
- <artifact>mvn:${project.groupId}/vtn/${project.version}</artifact>
-</app>
diff --git a/pom.xml b/pom.xml
index e148aca..f583fc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,13 @@
<onos.app.title>VTN App</onos.app.title>
<onos.app.category>Traffic Steering</onos.app.category>
<onos.app.url>http://opencord.org</onos.app.url>
+ <onos.app.requires>
+ org.onosproject.ovsdb-base,
+ org.onosproject.drivers.ovsdb,
+ org.onosproject.dhcp,
+ org.onosproject.xosclient,
+ org.opencord.config
+ </onos.app.requires>
<web.context>/onos/cordvtn</web.context>
<api.version>1.0.0</api.version>
<api.title>CORD VTN REST API</api.title>
@@ -137,7 +144,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>provided</scope>
</dependency>
<!-- TODO FIX ONOS ROOT POM to split thirdparty and onos dependencies -->
@@ -181,6 +187,25 @@
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <version>1.21.0</version>
+ <executions>
+ <execution>
+ <id>generate-scr-srcdescriptor</id>
+ <goals>
+ <goal>scr</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>bundle</supportedProjectType>
+ <supportedProjectType>war</supportedProjectType>
+ </supportedProjectTypes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
diff --git a/src/main/java/org/opencord/cordvtn/api/CordVtnService.java b/src/main/java/org/opencord/cordvtn/api/CordVtnService.java
index 6fedc2c..16d26f7 100644
--- a/src/main/java/org/opencord/cordvtn/api/CordVtnService.java
+++ b/src/main/java/org/opencord/cordvtn/api/CordVtnService.java
@@ -22,7 +22,7 @@
*/
public interface CordVtnService {
- String CORDVTN_APP_ID = "org.opencord.cordvtn";
+ String CORDVTN_APP_ID = "org.opencord.vtn";
/**
* Creates dependencies for a given tenant service.