홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
Committed by Gerrit Code Review
9a2b8296 1 parent 163b5dbc

Enable new resource APIs and re-enable optical intent compilers 

Change-Id: I8fb0b20be342e123a1bfe4cc61577dfddbbf9332
Inline Side-by-side
Showing 4 changed files with 6 additions and 4 deletions
...@@ -17,6 +17,7 @@ package org.onosproject.net.intent.impl.compiler; ...@@ -17,6 +17,7 @@ package org.onosproject.net.intent.impl.compiler;
17 17
18 import org.apache.commons.lang3.tuple.Pair; 18 import org.apache.commons.lang3.tuple.Pair;
19 import org.apache.felix.scr.annotations.Activate; 19 import org.apache.felix.scr.annotations.Activate;
20 +import org.apache.felix.scr.annotations.Component;
20 import org.apache.felix.scr.annotations.Deactivate; 21 import org.apache.felix.scr.annotations.Deactivate;
21 import org.apache.felix.scr.annotations.Modified; 22 import org.apache.felix.scr.annotations.Modified;
22 import org.apache.felix.scr.annotations.Property; 23 import org.apache.felix.scr.annotations.Property;
...@@ -70,7 +71,7 @@ import static com.google.common.base.Preconditions.checkArgument; ...@@ -70,7 +71,7 @@ import static com.google.common.base.Preconditions.checkArgument;
70 * An intent compiler for {@link org.onosproject.net.intent.OpticalCircuitIntent}. 71 * An intent compiler for {@link org.onosproject.net.intent.OpticalCircuitIntent}.
71 */ 72 */
72 // For now, remove component designation until dependency on the new resource manager is available. 73 // For now, remove component designation until dependency on the new resource manager is available.
73 -// @Component(immediate = true) 74 +@Component(immediate = true)
74 public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircuitIntent> { 75 public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircuitIntent> {
75 76
76 private static final Logger log = LoggerFactory.getLogger(OpticalCircuitIntentCompiler.class); 77 private static final Logger log = LoggerFactory.getLogger(OpticalCircuitIntentCompiler.class);
......
...@@ -17,6 +17,7 @@ package org.onosproject.net.intent.impl.compiler; ...@@ -17,6 +17,7 @@ package org.onosproject.net.intent.impl.compiler;
17 17
18 import com.google.common.collect.ImmutableList; 18 import com.google.common.collect.ImmutableList;
19 import org.apache.felix.scr.annotations.Activate; 19 import org.apache.felix.scr.annotations.Activate;
20 +import org.apache.felix.scr.annotations.Component;
20 import org.apache.felix.scr.annotations.Deactivate; 21 import org.apache.felix.scr.annotations.Deactivate;
21 import org.apache.felix.scr.annotations.Reference; 22 import org.apache.felix.scr.annotations.Reference;
22 import org.apache.felix.scr.annotations.ReferenceCardinality; 23 import org.apache.felix.scr.annotations.ReferenceCardinality;
...@@ -63,7 +64,7 @@ import static com.google.common.base.Preconditions.checkArgument; ...@@ -63,7 +64,7 @@ import static com.google.common.base.Preconditions.checkArgument;
63 * An intent compiler for {@link org.onosproject.net.intent.OpticalConnectivityIntent}. 64 * An intent compiler for {@link org.onosproject.net.intent.OpticalConnectivityIntent}.
64 */ 65 */
65 // For now, remove component designation until dependency on the new resource manager is available. 66 // For now, remove component designation until dependency on the new resource manager is available.
66 -// @Component(immediate = true) 67 +@Component(immediate = true)
67 public class OpticalConnectivityIntentCompiler implements IntentCompiler<OpticalConnectivityIntent> { 68 public class OpticalConnectivityIntentCompiler implements IntentCompiler<OpticalConnectivityIntent> {
68 69
69 protected static final Logger log = LoggerFactory.getLogger(OpticalConnectivityIntentCompiler.class); 70 protected static final Logger log = LoggerFactory.getLogger(OpticalConnectivityIntentCompiler.class);
......
...@@ -41,7 +41,7 @@ import static com.google.common.base.Preconditions.checkNotNull; ...@@ -41,7 +41,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
41 /** 41 /**
42 * An implementation of ResourceService. 42 * An implementation of ResourceService.
43 */ 43 */
44 -@Component(immediate = true, enabled = false) 44 +@Component(immediate = true)
45 @Service 45 @Service
46 @Beta 46 @Beta
47 public final class ResourceManager implements ResourceService, ResourceAdminService { 47 public final class ResourceManager implements ResourceService, ResourceAdminService {
......
...@@ -52,7 +52,7 @@ import static com.google.common.base.Preconditions.checkNotNull; ...@@ -52,7 +52,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
52 /** 52 /**
53 * Implementation of ResourceStore using TransactionalMap. 53 * Implementation of ResourceStore using TransactionalMap.
54 */ 54 */
55 -@Component(immediate = true, enabled = false) 55 +@Component(immediate = true)
56 @Service 56 @Service
57 @Beta 57 @Beta
58 public class ConsistentResourceStore implements ResourceStore { 58 public class ConsistentResourceStore implements ResourceStore {
......