홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Andrea Campanella
Committed by Gerrit Code Review
637c807a 1 parent bee35092

Moving Polling alarm provider into faultamangement application 

Change-Id: Ia283ea39d22b727ba90b537c3efa9540fa5dbd99
Inline Side-by-side
Showing 7 changed files with 28 additions and 37 deletions
......@@ -8,6 +8,7 @@ COMPILE_DEPS = [
'//cli:onos-cli',
'//utils/rest:onlab-rest',
'//lib:javax.ws.rs-api',
'//utils/osgi:onlab-osgi',
]
TEST_DEPS = [
......@@ -16,6 +17,8 @@ TEST_DEPS = [
'//lib:jersey-test-framework-grizzly2',
'//utils/osgi:onlab-osgi-tests',
'//web/api:onos-rest-tests',
'//utils/osgi:onlab-osgi',
'//incubator/api:onos-incubator-api-tests',
]
java_library(
......
......@@ -47,8 +47,27 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>5.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator-api</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies>
</project>
......
/*
* Copyright 2016 Open Networking Laboratory
* 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.
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.incubator.net.faultmanagement.alarm.impl;
package org.onosproject.faultmanagement.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
......
/*
* Copyright 2016 Open Networking Laboratory
* 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.
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.faultmanagement.alarm.impl;
package org.onosproject.faultmanagement.impl;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
......
......@@ -14,9 +14,6 @@ TEST_DEPS = [
'//core/common:onos-core-common-tests',
'//incubator/store:onos-incubator-store',
'//core/store/serializers:onos-core-serializers',
'//utils/osgi:onlab-osgi',
'//utils/osgi:onlab-osgi-tests',
'//incubator/api:onos-incubator-api-tests',
]
osgi_jar(
......
......@@ -96,14 +96,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies>
<build>
......
/*
* 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.
*/
/**
* Abstractions for interacting with alarms. An alarm is a persistent indication
* of a fault that clears only when the triggering condition has been resolved.
*/
package org.onosproject.incubator.net.faultmanagement.alarm.impl;