Committed by
Gerrit Code Review
Moving Polling alarm provider into faultamangement application
Change-Id: Ia283ea39d22b727ba90b537c3efa9540fa5dbd99
Showing
7 changed files
with
28 additions
and
37 deletions
| ... | @@ -8,6 +8,7 @@ COMPILE_DEPS = [ | ... | @@ -8,6 +8,7 @@ COMPILE_DEPS = [ |
| 8 | '//cli:onos-cli', | 8 | '//cli:onos-cli', |
| 9 | '//utils/rest:onlab-rest', | 9 | '//utils/rest:onlab-rest', |
| 10 | '//lib:javax.ws.rs-api', | 10 | '//lib:javax.ws.rs-api', |
| 11 | + '//utils/osgi:onlab-osgi', | ||
| 11 | ] | 12 | ] |
| 12 | 13 | ||
| 13 | TEST_DEPS = [ | 14 | TEST_DEPS = [ |
| ... | @@ -16,6 +17,8 @@ TEST_DEPS = [ | ... | @@ -16,6 +17,8 @@ TEST_DEPS = [ |
| 16 | '//lib:jersey-test-framework-grizzly2', | 17 | '//lib:jersey-test-framework-grizzly2', |
| 17 | '//utils/osgi:onlab-osgi-tests', | 18 | '//utils/osgi:onlab-osgi-tests', |
| 18 | '//web/api:onos-rest-tests', | 19 | '//web/api:onos-rest-tests', |
| 20 | + '//utils/osgi:onlab-osgi', | ||
| 21 | + '//incubator/api:onos-incubator-api-tests', | ||
| 19 | ] | 22 | ] |
| 20 | 23 | ||
| 21 | java_library( | 24 | java_library( | ... | ... |
| ... | @@ -47,8 +47,27 @@ | ... | @@ -47,8 +47,27 @@ |
| 47 | <dependency> | 47 | <dependency> |
| 48 | <groupId>org.osgi</groupId> | 48 | <groupId>org.osgi</groupId> |
| 49 | <artifactId>org.osgi.compendium</artifactId> | 49 | <artifactId>org.osgi.compendium</artifactId> |
| 50 | - <version>5.0.0</version> | 50 | + </dependency> |
| 51 | - <type>jar</type> | 51 | + <dependency> |
| 52 | + <groupId>org.onosproject</groupId> | ||
| 53 | + <artifactId>onos-incubator-api</artifactId> | ||
| 54 | + <version>${project.version}</version> | ||
| 55 | + <classifier>tests</classifier> | ||
| 56 | + <scope>test</scope> | ||
| 57 | + </dependency> | ||
| 58 | + <dependency> | ||
| 59 | + <groupId>org.onosproject</groupId> | ||
| 60 | + <artifactId>onlab-osgi</artifactId> | ||
| 61 | + <version>${project.version}</version> | ||
| 62 | + <classifier>tests</classifier> | ||
| 63 | + <scope>test</scope> | ||
| 64 | + </dependency> | ||
| 65 | + <dependency> | ||
| 66 | + <groupId>org.onosproject</groupId> | ||
| 67 | + <artifactId>onos-api</artifactId> | ||
| 68 | + <version>${project.version}</version> | ||
| 69 | + <classifier>tests</classifier> | ||
| 70 | + <scope>test</scope> | ||
| 52 | </dependency> | 71 | </dependency> |
| 53 | </dependencies> | 72 | </dependencies> |
| 54 | </project> | 73 | </project> | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2016 Open Networking Laboratory | 2 | + * Copyright 2016-present Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package org.onosproject.incubator.net.faultmanagement.alarm.impl; | 16 | +package org.onosproject.faultmanagement.impl; |
| 17 | 17 | ||
| 18 | import org.apache.felix.scr.annotations.Activate; | 18 | import org.apache.felix.scr.annotations.Activate; |
| 19 | import org.apache.felix.scr.annotations.Component; | 19 | import org.apache.felix.scr.annotations.Component; | ... | ... |
| 1 | /* | 1 | /* |
| 2 | - * Copyright 2016 Open Networking Laboratory | 2 | + * Copyright 2016-present Open Networking Laboratory |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| ... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package org.onosproject.incubator.net.faultmanagement.alarm.impl; | 17 | +package org.onosproject.faultmanagement.impl; |
| 18 | 18 | ||
| 19 | import com.google.common.collect.ImmutableList; | 19 | import com.google.common.collect.ImmutableList; |
| 20 | import com.google.common.collect.ImmutableSet; | 20 | import com.google.common.collect.ImmutableSet; | ... | ... |
| ... | @@ -14,9 +14,6 @@ TEST_DEPS = [ | ... | @@ -14,9 +14,6 @@ TEST_DEPS = [ |
| 14 | '//core/common:onos-core-common-tests', | 14 | '//core/common:onos-core-common-tests', |
| 15 | '//incubator/store:onos-incubator-store', | 15 | '//incubator/store:onos-incubator-store', |
| 16 | '//core/store/serializers:onos-core-serializers', | 16 | '//core/store/serializers:onos-core-serializers', |
| 17 | - '//utils/osgi:onlab-osgi', | ||
| 18 | - '//utils/osgi:onlab-osgi-tests', | ||
| 19 | - '//incubator/api:onos-incubator-api-tests', | ||
| 20 | ] | 17 | ] |
| 21 | 18 | ||
| 22 | osgi_jar( | 19 | osgi_jar( | ... | ... |
| ... | @@ -96,14 +96,6 @@ | ... | @@ -96,14 +96,6 @@ |
| 96 | <groupId>org.apache.felix</groupId> | 96 | <groupId>org.apache.felix</groupId> |
| 97 | <artifactId>org.apache.felix.scr.annotations</artifactId> | 97 | <artifactId>org.apache.felix.scr.annotations</artifactId> |
| 98 | </dependency> | 98 | </dependency> |
| 99 | - | ||
| 100 | - <dependency> | ||
| 101 | - <groupId>org.onosproject</groupId> | ||
| 102 | - <artifactId>onlab-osgi</artifactId> | ||
| 103 | - <version>${project.version}</version> | ||
| 104 | - <classifier>tests</classifier> | ||
| 105 | - <scope>test</scope> | ||
| 106 | - </dependency> | ||
| 107 | </dependencies> | 99 | </dependencies> |
| 108 | 100 | ||
| 109 | <build> | 101 | <build> | ... | ... |
| 1 | -/* | ||
| 2 | - * Copyright 2015-present Open Networking Laboratory | ||
| 3 | - * | ||
| 4 | - * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| 5 | - * you may not use this file except in compliance with the License. | ||
| 6 | - * You may obtain a copy of the License at | ||
| 7 | - * | ||
| 8 | - * http://www.apache.org/licenses/LICENSE-2.0 | ||
| 9 | - * | ||
| 10 | - * Unless required by applicable law or agreed to in writing, software | ||
| 11 | - * distributed under the License is distributed on an "AS IS" BASIS, | ||
| 12 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| 13 | - * See the License for the specific language governing permissions and | ||
| 14 | - * limitations under the License. | ||
| 15 | - */ | ||
| 16 | -/** | ||
| 17 | - * Abstractions for interacting with alarms. An alarm is a persistent indication | ||
| 18 | - * of a fault that clears only when the triggering condition has been resolved. | ||
| 19 | - */ | ||
| 20 | -package org.onosproject.incubator.net.faultmanagement.alarm.impl; |
-
Please register or login to post a comment