mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-12-16 14:52:15 +01:00
Code Issues Projects Releases Wiki Activity

[WIP] Upgrade ONOS to karaf version 4.2.1

Browse Source 
Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa
This commit is contained in:
Ray Milkey 2018-08-17 14:54:17 -07:00
parent 10216e4129
commit d84f89ba3d
837 changed files with 9482 additions and 8743 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bazelrc
View File

@ -8,5 +8,7 @@ build --javabase=@local_jdk//:jdk
build --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8 build --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
build --host_javabase=@local_jdk//:jdk build --host_javabase=@local_jdk//:jdk
build --distinct_host_configuration=false build --distinct_host_configuration=false
#FIXME - this is temporary while porting to karaf 4.2.1
build --action_env=HOME
#build --disk_cache=~/bazel-cache #build --disk_cache=~/bazel-cache
#build --remote_http_cache=http://10.1.10.224:80/cache #build --remote_http_cache=http://10.1.10.224:80/cache

24
apps/acl/src/main/java/org/onosproject/acl/impl/AclManager.java
View File

@ -29,12 +29,6 @@ import org.onlab.packet.TpPort;
import org.onosproject.acl.AclRule; import org.onosproject.acl.AclRule;
import org.onosproject.acl.AclService; import org.onosproject.acl.AclService;
import org.onosproject.acl.AclStore; import org.onosproject.acl.AclStore;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.acl.RuleId; import org.onosproject.acl.RuleId;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
@ -56,6 +50,11 @@ import org.onosproject.net.flow.instructions.Instructions;
import org.onosproject.net.host.HostEvent; import org.onosproject.net.host.HostEvent;
import org.onosproject.net.host.HostListener; import org.onosproject.net.host.HostListener;
import org.onosproject.net.host.HostService; import org.onosproject.net.host.HostService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.HashSet; import java.util.HashSet;
@ -67,20 +66,19 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Implementation of the ACL service. * Implementation of the ACL service.
*/ */
@Component(immediate = true) @Component(immediate = true, service = AclService.class)
@Service
public class AclManager implements AclService { public class AclManager implements AclService {
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowRuleService flowRuleService; protected FlowRuleService flowRuleService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hostService; protected HostService hostService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MastershipService mastershipService; protected MastershipService mastershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected AclStore aclStore; protected AclStore aclStore;
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());

20
apps/acl/src/main/java/org/onosproject/acl/impl/DistributedAclStore.java
View File

@ -21,15 +21,9 @@
package org.onosproject.acl.impl; package org.onosproject.acl.impl;
import com.google.common.collect.Collections2; import com.google.common.collect.Collections2;
import org.onlab.util.KryoNamespace;
import org.onosproject.acl.AclRule; import org.onosproject.acl.AclRule;
import org.onosproject.acl.AclStore; import org.onosproject.acl.AclStore;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace;
import org.onosproject.acl.RuleId; import org.onosproject.acl.RuleId;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
@ -41,6 +35,11 @@ import org.onosproject.store.service.ConsistentMap;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.Versioned; import org.onosproject.store.service.Versioned;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.ArrayList; import java.util.ArrayList;
@ -53,8 +52,7 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Implementation of the ACL store service. * Implementation of the ACL store service.
*/ */
@Component(immediate = true) @Component(immediate = true, service = AclStore.class)
@Service
public class DistributedAclStore extends AbstractStore implements AclStore { public class DistributedAclStore extends AbstractStore implements AclStore {
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
@ -66,9 +64,9 @@ public class DistributedAclStore extends AbstractStore implements AclStore {
private ConsistentMap<RuleId, Set<FlowRule>> ruleToFlow; private ConsistentMap<RuleId, Set<FlowRule>> ruleToFlow;
private ConsistentMap<RuleId, List<RuleId>> denyRuleToAllowRule; private ConsistentMap<RuleId, List<RuleId>> denyRuleToAllowRule;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Activate @Activate

22
apps/actn-mdsc/tetunnel-ctl/src/main/java/org/onosproject/actn/mdsc/tetunnelctl/TeTunnelCtl.java
View File

@ -16,11 +16,11 @@
package org.onosproject.actn.mdsc.tetunnelctl; package org.onosproject.actn.mdsc.tetunnelctl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.actn.mdsc.pce.TeTunnelPceService; import org.onosproject.actn.mdsc.pce.TeTunnelPceService;
import org.onosproject.incubator.net.tunnel.Tunnel; import org.onosproject.incubator.net.tunnel.Tunnel;
import org.onosproject.incubator.net.tunnel.TunnelAdminService; import org.onosproject.incubator.net.tunnel.TunnelAdminService;
@ -63,22 +63,22 @@ public class TeTunnelCtl {
private final TunnelListener tunnelListener = new InternalTunnelListener(); private final TunnelListener tunnelListener = new InternalTunnelListener();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected TunnelService tunnelService; protected TunnelService tunnelService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected TunnelAdminService tunnelAdminService; protected TunnelAdminService tunnelAdminService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected TeTunnelService teTunnelService; protected TeTunnelService teTunnelService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected TeTunnelAdminService teTunnelAdminService; protected TeTunnelAdminService teTunnelAdminService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected TeTopologyService teTopologyService; protected TeTopologyService teTopologyService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected TeTunnelPceService teTunnelPceService; protected TeTunnelPceService teTunnelPceService;
@Activate @Activate

10
apps/actn-mdsc/tetunnel-pce/src/main/java/org/onosproject/actn/mdsc/pce/impl/TeTunnelPceManager.java
View File

@ -18,10 +18,9 @@ package org.onosproject.actn.mdsc.pce.impl;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.actn.mdsc.pce.TeTunnelPce; import org.onosproject.actn.mdsc.pce.TeTunnelPce;
import org.onosproject.actn.mdsc.pce.TeTunnelPceService; import org.onosproject.actn.mdsc.pce.TeTunnelPceService;
import org.onosproject.tetunnel.api.tunnel.TeTunnel; import org.onosproject.tetunnel.api.tunnel.TeTunnel;
@ -35,8 +34,7 @@ import java.util.List;
/** /**
* Implementation of Te Tunnel PCE service. * Implementation of Te Tunnel PCE service.
*/ */
@Component(immediate = true) @Component(immediate = true, service = TeTunnelPceService.class)
@Service
public class TeTunnelPceManager implements TeTunnelPceService { public class TeTunnelPceManager implements TeTunnelPceService {
private static final Logger log = getLogger(TeTunnelPceManager.class); private static final Logger log = getLogger(TeTunnelPceManager.class);

30
apps/artemis/src/main/java/org/onosproject/artemis/impl/ArtemisDeaggregatorImpl.java
View File

@ -23,12 +23,6 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.util.CharsetUtil; import io.netty.util.CharsetUtil;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.json.JSONObject; import org.json.JSONObject;
import org.onlab.packet.IpAddress; import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix; import org.onlab.packet.IpPrefix;
@ -65,6 +59,11 @@ import org.onosproject.ovsdb.controller.OvsdbClientService;
import org.onosproject.ovsdb.controller.OvsdbController; import org.onosproject.ovsdb.controller.OvsdbController;
import org.onosproject.ovsdb.controller.OvsdbInterface; import org.onosproject.ovsdb.controller.OvsdbInterface;
import org.onosproject.routing.bgp.BgpInfoService; import org.onosproject.routing.bgp.BgpInfoService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -74,36 +73,35 @@ import java.util.Set;
import static org.onlab.packet.Ethernet.TYPE_IPV4; import static org.onlab.packet.Ethernet.TYPE_IPV4;
@Component(immediate = true) @Component(immediate = true, service = ArtemisDeaggregator.class)
@Service
public class ArtemisDeaggregatorImpl implements ArtemisDeaggregator { public class ArtemisDeaggregatorImpl implements ArtemisDeaggregator {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private static final int PRIORITY = 1000; private static final int PRIORITY = 1000;
/* Services */ /* Services */
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private BgpInfoService bgpInfoService; private BgpInfoService bgpInfoService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private ArtemisService artemisService; private ArtemisService artemisService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private OvsdbController ovsdbController; private OvsdbController ovsdbController;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private DeviceService deviceService; private DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private InterfaceService interfaceService; private InterfaceService interfaceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private FlowObjectiveService flowObjectiveService; private FlowObjectiveService flowObjectiveService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private FlowRuleService flowRuleService; private FlowRuleService flowRuleService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private CoreService coreService; private CoreService coreService;
/* Variables */ /* Variables */

20
apps/artemis/src/main/java/org/onosproject/artemis/impl/ArtemisDetectorImpl.java
View File

@ -17,12 +17,6 @@
package org.onosproject.artemis.impl; package org.onosproject.artemis.impl;
import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
@ -32,22 +26,26 @@ import org.onosproject.artemis.ArtemisEventListener;
import org.onosproject.artemis.ArtemisService; import org.onosproject.artemis.ArtemisService;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.event.EventDeliveryService; import org.onosproject.event.EventDeliveryService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@Component(immediate = true) @Component(immediate = true, service = ArtemisDetector.class)
@Service
public class ArtemisDetectorImpl implements ArtemisDetector { public class ArtemisDetectorImpl implements ArtemisDetector {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
/* Services */ /* Services */
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private CoreService coreService; private CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private ArtemisService artemisService; private ArtemisService artemisService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected EventDeliveryService eventDispatcher; protected EventDeliveryService eventDispatcher;
private final ArtemisEventListener artemisEventListener = this::handleArtemisEvent; private final ArtemisEventListener artemisEventListener = this::handleArtemisEvent;

20
apps/artemis/src/main/java/org/onosproject/artemis/impl/ArtemisManager.java
View File

@ -16,12 +16,6 @@
package org.onosproject.artemis.impl; package org.onosproject.artemis.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.artemis.ArtemisEventListener; import org.onosproject.artemis.ArtemisEventListener;
import org.onosproject.artemis.ArtemisService; import org.onosproject.artemis.ArtemisService;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
@ -33,13 +27,17 @@ import org.onosproject.net.config.NetworkConfigListener;
import org.onosproject.net.config.NetworkConfigRegistry; import org.onosproject.net.config.NetworkConfigRegistry;
import org.onosproject.net.config.NetworkConfigService; import org.onosproject.net.config.NetworkConfigService;
import org.onosproject.net.config.basics.SubjectFactories; import org.onosproject.net.config.basics.SubjectFactories;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.Optional; import java.util.Optional;
@Component(immediate = true) @Component(immediate = true, service = ArtemisService.class)
@Service
public class ArtemisManager public class ArtemisManager
extends AbstractListenerManager<ArtemisEvent, ArtemisEventListener> extends AbstractListenerManager<ArtemisEvent, ArtemisEventListener>
implements ArtemisService { implements ArtemisService {
@ -51,13 +49,13 @@ public class ArtemisManager
private final InternalNetworkConfigListener configListener = private final InternalNetworkConfigListener configListener =
new InternalNetworkConfigListener(); new InternalNetworkConfigListener();
/* Services */ /* Services */
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private NetworkConfigRegistry registry; private NetworkConfigRegistry registry;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private NetworkConfigService configService; private NetworkConfigService configService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private CoreService coreService; private CoreService coreService;
/* Variables */ /* Variables */

18
apps/artemis/src/main/java/org/onosproject/artemis/impl/ArtemisMonitorImpl.java
View File

@ -17,12 +17,6 @@ package org.onosproject.artemis.impl;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.json.JSONObject; import org.json.JSONObject;
import org.onlab.packet.IpPrefix; import org.onlab.packet.IpPrefix;
import org.onosproject.artemis.ArtemisMonitor; import org.onosproject.artemis.ArtemisMonitor;
@ -32,6 +26,11 @@ import org.onosproject.event.EventDeliveryService;
import org.onosproject.net.config.NetworkConfigEvent; import org.onosproject.net.config.NetworkConfigEvent;
import org.onosproject.net.config.NetworkConfigListener; import org.onosproject.net.config.NetworkConfigListener;
import org.onosproject.net.config.NetworkConfigService; import org.onosproject.net.config.NetworkConfigService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -39,16 +38,15 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Component(immediate = true) @Component(immediate = true, service = ArtemisMonitor.class)
@Service
public class ArtemisMonitorImpl implements ArtemisMonitor { public class ArtemisMonitorImpl implements ArtemisMonitor {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private static final Class<ArtemisConfig> CONFIG_CLASS = ArtemisConfig.class; private static final Class<ArtemisConfig> CONFIG_CLASS = ArtemisConfig.class;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected EventDeliveryService eventDispatcher; protected EventDeliveryService eventDispatcher;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private NetworkConfigService configService; private NetworkConfigService configService;
/* Variables */ /* Variables */

24
apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.bgprouter; package org.onosproject.bgprouter;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.component.ComponentService; import org.onosproject.component.ComponentService;
@ -51,25 +51,25 @@ public class BgpRouter {
public static final String BGP_ROUTER_APP = "org.onosproject.bgprouter"; public static final String BGP_ROUTER_APP = "org.onosproject.bgprouter";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected InterfaceService interfaceService; protected InterfaceService interfaceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetworkConfigRegistry networkConfigService; protected NetworkConfigRegistry networkConfigService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected PacketService packetService; protected PacketService packetService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowObjectiveService flowObjectiveService; protected FlowObjectiveService flowObjectiveService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentService componentService; protected ComponentService componentService;
private ApplicationId appId; private ApplicationId appId;

16
apps/castor/src/main/java/org/onosproject/castor/Castor.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.castor; package org.onosproject.castor;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.app.ApplicationService; import org.onosproject.app.ApplicationService;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
@ -38,13 +38,13 @@ public class Castor {
public static final String CASTOR_APP = "org.onosproject.castor"; public static final String CASTOR_APP = "org.onosproject.castor";
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ApplicationService applicationService; protected ApplicationService applicationService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected IntentSynchronizationService intentSynchronizer; protected IntentSynchronizationService intentSynchronizer;
private ApplicationId appId; private ApplicationId appId;

22
apps/castor/src/main/java/org/onosproject/castor/CastorArpManager.java
View File

@ -15,12 +15,6 @@
*/ */
package org.onosproject.castor; package org.onosproject.castor;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.ARP; import org.onlab.packet.ARP;
import org.onlab.packet.Ethernet; import org.onlab.packet.Ethernet;
import org.onlab.packet.Ip4Address; import org.onlab.packet.Ip4Address;
@ -40,6 +34,11 @@ import org.onosproject.net.packet.InboundPacket;
import org.onosproject.net.packet.PacketContext; import org.onosproject.net.packet.PacketContext;
import org.onosproject.net.packet.PacketProcessor; import org.onosproject.net.packet.PacketProcessor;
import org.onosproject.net.packet.PacketService; import org.onosproject.net.packet.PacketService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -54,20 +53,19 @@ import static org.slf4j.LoggerFactory.getLogger;
* Component for managing the ARPs. * Component for managing the ARPs.
*/ */
@Component(immediate = true, enabled = true) @Component(immediate = true, service = ArpService.class)
@Service
public class CastorArpManager implements ArpService { public class CastorArpManager implements ArpService {
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ConnectivityManagerService connectivityManager; protected ConnectivityManagerService connectivityManager;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected PacketService packetService; protected PacketService packetService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CastorStore castorStore; protected CastorStore castorStore;
private ProxyArpProcessor processor = new ProxyArpProcessor(); private ProxyArpProcessor processor = new ProxyArpProcessor();

23
apps/castor/src/main/java/org/onosproject/castor/ConnectivityManager.java
View File

@ -14,12 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.onosproject.castor; package org.onosproject.castor;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.Ethernet; import org.onlab.packet.Ethernet;
import org.onlab.packet.IPv4; import org.onlab.packet.IPv4;
import org.onlab.packet.IPv6; import org.onlab.packet.IPv6;
@ -29,6 +24,7 @@ import org.onlab.packet.MacAddress;
import org.onlab.packet.TpPort; import org.onlab.packet.TpPort;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.intentsync.IntentSynchronizationService;
import org.onosproject.net.ConnectPoint; import org.onosproject.net.ConnectPoint;
import org.onosproject.net.FilteredConnectPoint; import org.onosproject.net.FilteredConnectPoint;
import org.onosproject.net.flow.DefaultTrafficSelector; import org.onosproject.net.flow.DefaultTrafficSelector;
@ -38,7 +34,11 @@ import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.intent.Key; import org.onosproject.net.intent.Key;
import org.onosproject.net.intent.MultiPointToSinglePointIntent; import org.onosproject.net.intent.MultiPointToSinglePointIntent;
import org.onosproject.net.intent.PointToPointIntent; import org.onosproject.net.intent.PointToPointIntent;
import org.onosproject.intentsync.IntentSynchronizationService; import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -56,17 +56,16 @@ import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Manages the connectivity requirements between peers. * Manages the connectivity requirements between peers.
*/ */
@Component(immediate = true, enabled = true) @Component(immediate = true, service = ConnectivityManagerService.class)
@Service
public class ConnectivityManager implements ConnectivityManagerService { public class ConnectivityManager implements ConnectivityManagerService {
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected IntentSynchronizationService intentSynchronizer; protected IntentSynchronizationService intentSynchronizer;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CastorStore castorStore; protected CastorStore castorStore;
private static final int PRIORITY_OFFSET = 1000; private static final int PRIORITY_OFFSET = 1000;

18
apps/castor/src/main/java/org/onosproject/castor/DistributedCastorStore.java
View File

@ -16,24 +16,23 @@
package org.onosproject.castor; package org.onosproject.castor;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.IpAddress; import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress; import org.onlab.packet.MacAddress;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.onosproject.net.intent.Key; import org.onosproject.net.intent.Key;
import org.onosproject.net.intent.MultiPointToSinglePointIntent; import org.onosproject.net.intent.MultiPointToSinglePointIntent;
import org.onosproject.net.intent.PointToPointIntent; import org.onosproject.net.intent.PointToPointIntent;
import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.ConsistentMap; import org.onosproject.store.service.ConsistentMap;
import org.onosproject.store.service.DistributedSet; import org.onosproject.store.service.DistributedSet;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.Versioned; import org.onosproject.store.service.Versioned;
import org.onosproject.store.serializers.KryoNamespaces; import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -45,13 +44,12 @@ import java.util.Set;
* Distributed Store for Castor. * Distributed Store for Castor.
*/ */
@Component(immediate = true) @Component(immediate = true, service = CastorStore.class)
@Service
public class DistributedCastorStore implements CastorStore { public class DistributedCastorStore implements CastorStore {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
private ConsistentMap<IpAddress, MacAddress> addressMap; private ConsistentMap<IpAddress, MacAddress> addressMap;

24
apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/cfm/impl/CfmMdManager.java
View File

@ -15,15 +15,6 @@
*/ */
package org.onosproject.incubator.net.l2monitoring.cfm.impl; package org.onosproject.incubator.net.l2monitoring.cfm.impl;
import java.util.Collection;
import java.util.Optional;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.event.AbstractListenerManager; import org.onosproject.event.AbstractListenerManager;
@ -38,14 +29,21 @@ import org.onosproject.incubator.net.l2monitoring.cfm.service.MdEvent;
import org.onosproject.incubator.net.l2monitoring.cfm.service.MdListener; import org.onosproject.incubator.net.l2monitoring.cfm.service.MdListener;
import org.onosproject.incubator.net.l2monitoring.cfm.service.MdStore; import org.onosproject.incubator.net.l2monitoring.cfm.service.MdStore;
import org.onosproject.incubator.net.l2monitoring.cfm.service.MdStoreDelegate; import org.onosproject.incubator.net.l2monitoring.cfm.service.MdStoreDelegate;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.Collection;
import java.util.Optional;
/** /**
* Manager of Cfm Md Service - persists Maintenance Domain in distributed store. * Manager of Cfm Md Service - persists Maintenance Domain in distributed store.
*/ */
@Component(immediate = true) @Component(immediate = true, service = CfmMdService.class)
@Service
public class CfmMdManager extends AbstractListenerManager<MdEvent, MdListener> public class CfmMdManager extends AbstractListenerManager<MdEvent, MdListener>
implements CfmMdService { implements CfmMdService {
@ -54,10 +52,10 @@ public class CfmMdManager extends AbstractListenerManager<MdEvent, MdListener>
protected ApplicationId appId; protected ApplicationId appId;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MdStore store; protected MdStore store;
protected final MdStoreDelegate delegate = new InternalStoreDelegate(); protected final MdStoreDelegate delegate = new InternalStoreDelegate();

56
apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/cfm/impl/CfmMepManager.java
View File

@ -15,28 +15,6 @@
*/ */
package org.onosproject.incubator.net.l2monitoring.cfm.impl; package org.onosproject.incubator.net.l2monitoring.cfm.impl;
import static org.onlab.util.Tools.groupedThreads;
import static org.slf4j.LoggerFactory.getLogger;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.core.IdGenerator; import org.onosproject.core.IdGenerator;
import org.onosproject.event.AbstractListenerManager; import org.onosproject.event.AbstractListenerManager;
@ -66,13 +44,33 @@ import org.onosproject.net.DeviceId;
import org.onosproject.net.device.DeviceEvent; import org.onosproject.net.device.DeviceEvent;
import org.onosproject.net.device.DeviceListener; import org.onosproject.net.device.DeviceListener;
import org.onosproject.net.device.DeviceService; import org.onosproject.net.device.DeviceService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import static org.onlab.util.Tools.groupedThreads;
import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Provides implementation of the CFM North and South Bound Interfaces. * Provides implementation of the CFM North and South Bound Interfaces.
*/ */
@Component(immediate = true) @Component(immediate = true, service = CfmMepService.class)
@Service
public class CfmMepManager public class CfmMepManager
extends AbstractListenerManager<CfmMepEvent, CfmMepListener> extends AbstractListenerManager<CfmMepEvent, CfmMepListener>
implements CfmMepService { implements CfmMepService {
@ -82,16 +80,16 @@ public class CfmMepManager
private InternalDeviceListener deviceListener = null; private InternalDeviceListener deviceListener = null;
private InternalMdListener mdListener = null; private InternalMdListener mdListener = null;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MastershipService mastershipService; protected MastershipService mastershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CfmMdService cfmMdService; protected CfmMdService cfmMdService;
private static final int DEFAULT_POLL_FREQUENCY = 30; private static final int DEFAULT_POLL_FREQUENCY = 30;
@ -116,7 +114,7 @@ public class CfmMepManager
private IdGenerator idGenerator; private IdGenerator idGenerator;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MepStore mepStore; protected MepStore mepStore;
protected final MepStoreDelegate delegate = new InternalStoreDelegate(); protected final MepStoreDelegate delegate = new InternalStoreDelegate();

18
apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/cfm/impl/DistributedMdStore.java
View File

@ -17,12 +17,6 @@ package org.onosproject.incubator.net.l2monitoring.cfm.impl;
import com.google.common.net.InternetDomainName; import com.google.common.net.InternetDomainName;
import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.MacAddress; import org.onlab.packet.MacAddress;
import org.onlab.util.Identifier; import org.onlab.util.Identifier;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
@ -47,13 +41,18 @@ import org.onosproject.incubator.net.l2monitoring.cfm.service.CfmConfigException
import org.onosproject.incubator.net.l2monitoring.cfm.service.MdEvent; import org.onosproject.incubator.net.l2monitoring.cfm.service.MdEvent;
import org.onosproject.incubator.net.l2monitoring.cfm.service.MdStore; import org.onosproject.incubator.net.l2monitoring.cfm.service.MdStore;
import org.onosproject.incubator.net.l2monitoring.cfm.service.MdStoreDelegate; import org.onosproject.incubator.net.l2monitoring.cfm.service.MdStoreDelegate;
import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.AbstractStore; import org.onosproject.store.AbstractStore;
import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.ConsistentMap; import org.onosproject.store.service.ConsistentMap;
import org.onosproject.store.service.MapEvent; import org.onosproject.store.service.MapEvent;
import org.onosproject.store.service.MapEventListener; import org.onosproject.store.service.MapEventListener;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -66,14 +65,13 @@ import java.util.stream.Collectors;
/** /**
* Maintenance Domain Store implementation backed by consistent map. * Maintenance Domain Store implementation backed by consistent map.
*/ */
@Component(immediate = true) @Component(immediate = true, service = MdStore.class)
@Service
public class DistributedMdStore extends AbstractStore<MdEvent, MdStoreDelegate> public class DistributedMdStore extends AbstractStore<MdEvent, MdStoreDelegate>
implements MdStore { implements MdStore {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
private ConsistentMap<MdId, MaintenanceDomain> maintenanceDomainConsistentMap; private ConsistentMap<MdId, MaintenanceDomain> maintenanceDomainConsistentMap;

16
apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/cfm/impl/DistributedMepStore.java
View File

@ -15,12 +15,6 @@
*/ */
package org.onosproject.incubator.net.l2monitoring.cfm.impl; package org.onosproject.incubator.net.l2monitoring.cfm.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.IpAddress; import org.onlab.packet.IpAddress;
import org.onlab.packet.VlanId; import org.onlab.packet.VlanId;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
@ -52,6 +46,11 @@ import org.onosproject.store.service.MapEvent;
import org.onosproject.store.service.MapEventListener; import org.onosproject.store.service.MapEventListener;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -64,14 +63,13 @@ import java.util.stream.Collectors;
/** /**
* MEP Store implementation backed by consistent map. * MEP Store implementation backed by consistent map.
*/ */
@Component(immediate = true) @Component(immediate = true, service = MepStore.class)
@Service
public class DistributedMepStore extends AbstractStore<CfmMepEvent, MepStoreDelegate> public class DistributedMepStore extends AbstractStore<CfmMepEvent, MepStoreDelegate>
implements MepStore { implements MepStore {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
private ConsistentMap<MepKeyId, Mep> mepConsistentMap; private ConsistentMap<MepKeyId, Mep> mepConsistentMap;

26
apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/soam/impl/SoamManager.java
View File

@ -15,15 +15,6 @@
*/ */
package org.onosproject.incubator.net.l2monitoring.soam.impl; package org.onosproject.incubator.net.l2monitoring.soam.impl;
import java.util.Collection;
import java.util.Optional;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.incubator.net.l2monitoring.cfm.MepEntry; import org.onosproject.incubator.net.l2monitoring.cfm.MepEntry;
@ -46,14 +37,21 @@ import org.onosproject.incubator.net.l2monitoring.soam.loss.LossMeasurementEntry
import org.onosproject.incubator.net.l2monitoring.soam.loss.LossMeasurementStatCurrent; import org.onosproject.incubator.net.l2monitoring.soam.loss.LossMeasurementStatCurrent;
import org.onosproject.net.DeviceId; import org.onosproject.net.DeviceId;
import org.onosproject.net.device.DeviceService; import org.onosproject.net.device.DeviceService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.Collection;
import java.util.Optional;
/** /**
* ONOS application component. * ONOS application component.
*/ */
@Component(immediate = true) @Component(immediate = true, service = SoamService.class)
@Service
public class SoamManager implements SoamService { public class SoamManager implements SoamService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@ -61,13 +59,13 @@ public class SoamManager implements SoamService {
private ApplicationId appId; private ApplicationId appId;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CfmMepService cfmMepService; protected CfmMepService cfmMepService;
@Activate @Activate

12
apps/cfm/nbi/src/main/java/org/onosproject/cfm/CfmWebComponent.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.cfm; package org.onosproject.cfm;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onlab.packet.VlanId; import org.onlab.packet.VlanId;
import org.onosproject.cfm.web.ComponentCodec; import org.onosproject.cfm.web.ComponentCodec;
import org.onosproject.cfm.web.FngAddressCodec; import org.onosproject.cfm.web.FngAddressCodec;
@ -90,7 +90,7 @@ import org.slf4j.LoggerFactory;
public class CfmWebComponent { public class CfmWebComponent {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CodecService codecService; protected CodecService codecService;
/** /**

26
apps/cip/src/main/java/org/onosproject/cip/ClusterIpManager.java
View File

@ -16,14 +16,6 @@
package org.onosproject.cip; package org.onosproject.cip;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onosproject.cfg.ComponentConfigService; import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.cluster.ClusterService; import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.LeadershipEvent; import org.onosproject.cluster.LeadershipEvent;
@ -31,6 +23,12 @@ import org.onosproject.cluster.LeadershipEventListener;
import org.onosproject.cluster.LeadershipService; import org.onosproject.cluster.LeadershipService;
import org.onosproject.cluster.NodeId; import org.onosproject.cluster.NodeId;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -63,13 +61,13 @@ public class ClusterIpManager {
private static final String CLUSTER_IP = "cluster/ip"; private static final String CLUSTER_IP = "cluster/ip";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ClusterService clusterService; protected ClusterService clusterService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LeadershipService leadershipService; protected LeadershipService leadershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService cfgService; protected ComponentConfigService cfgService;
private final LeadershipEventListener listener = new InternalLeadershipListener(); private final LeadershipEventListener listener = new InternalLeadershipListener();
@ -78,15 +76,15 @@ public class ClusterIpManager {
private boolean wasLeader = false; private boolean wasLeader = false;
// By default there is no IP; this has to be configured // By default there is no IP; this has to be configured
@Property(name = "aliasIp", value = "", label = "Alias IP address") //@Property(name = "aliasIp", value = "", label = "Alias IP address")
private String aliasIp = ""; private String aliasIp = "";
public static final String DEFAULT_MASK = "255.255.0.0"; public static final String DEFAULT_MASK = "255.255.0.0";
@Property(name = "aliasMask", value = DEFAULT_MASK, label = "Alias IP mask") //@Property(name = "aliasMask", value = DEFAULT_MASK, label = "Alias IP mask")
private String aliasMask = DEFAULT_MASK; private String aliasMask = DEFAULT_MASK;
public static final String ETH_0 = "eth0:0"; public static final String ETH_0 = "eth0:0";
@Property(name = "aliasAdapter", value = ETH_0, label = "Alias IP adapter") //@Property(name = "aliasAdapter", value = ETH_0, label = "Alias IP adapter")
private String aliasAdapter = ETH_0; private String aliasAdapter = ETH_0;
@Activate @Activate

17
apps/config/src/main/java/org/onosproject/config/impl/DistributedDynamicConfigStore.java
View File

@ -16,12 +16,6 @@
package org.onosproject.config.impl; package org.onosproject.config.impl;
import com.google.common.annotations.Beta; import com.google.common.annotations.Beta;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.onosproject.config.DynamicConfigEvent; import org.onosproject.config.DynamicConfigEvent;
import org.onosproject.config.DynamicConfigStore; import org.onosproject.config.DynamicConfigStore;
@ -56,6 +50,11 @@ import org.onosproject.yang.model.ListKey;
import org.onosproject.yang.model.NodeKey; import org.onosproject.yang.model.NodeKey;
import org.onosproject.yang.model.ResourceId; import org.onosproject.yang.model.ResourceId;
import org.onosproject.yang.model.SchemaId; import org.onosproject.yang.model.SchemaId;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -66,6 +65,7 @@ import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import static org.onosproject.config.DynamicConfigEvent.Type.NODE_ADDED; import static org.onosproject.config.DynamicConfigEvent.Type.NODE_ADDED;
import static org.onosproject.config.DynamicConfigEvent.Type.NODE_DELETED; import static org.onosproject.config.DynamicConfigEvent.Type.NODE_DELETED;
import static org.onosproject.config.DynamicConfigEvent.Type.NODE_UPDATED; import static org.onosproject.config.DynamicConfigEvent.Type.NODE_UPDATED;
@ -76,15 +76,14 @@ import static org.onosproject.d.config.DeviceResourceIds.DCS_NAMESPACE;
* Implementation of the dynamic config store. * Implementation of the dynamic config store.
*/ */
@Beta @Beta
@Component(immediate = true) @Component(immediate = true, service = DynamicConfigStore.class)
@Service
public class DistributedDynamicConfigStore public class DistributedDynamicConfigStore
extends AbstractStore<DynamicConfigEvent, DynamicConfigStoreDelegate> extends AbstractStore<DynamicConfigEvent, DynamicConfigStoreDelegate>
implements DynamicConfigStore { implements DynamicConfigStore {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
// FIXME transactionally mutate the 2 or consolidate into 1 AsyncDocTree // FIXME transactionally mutate the 2 or consolidate into 1 AsyncDocTree

34
apps/config/src/main/java/org/onosproject/config/impl/DynamicConfigManager.java
View File

@ -15,17 +15,6 @@
*/ */
package org.onosproject.config.impl; package org.onosproject.config.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.config.RpcExecutor;
import org.onosproject.config.RpcMessageId;
import org.onosproject.d.config.DeviceResourceIds;
import org.onosproject.d.config.ResourceIds;
import org.onosproject.event.AbstractListenerManager;
import org.onosproject.config.DynamicConfigEvent; import org.onosproject.config.DynamicConfigEvent;
import org.onosproject.config.DynamicConfigListener; import org.onosproject.config.DynamicConfigListener;
import org.onosproject.config.DynamicConfigService; import org.onosproject.config.DynamicConfigService;
@ -33,23 +22,33 @@ import org.onosproject.config.DynamicConfigStore;
import org.onosproject.config.DynamicConfigStoreDelegate; import org.onosproject.config.DynamicConfigStoreDelegate;
import org.onosproject.config.FailedException; import org.onosproject.config.FailedException;
import org.onosproject.config.Filter; import org.onosproject.config.Filter;
import org.onosproject.yang.model.RpcInput; import org.onosproject.config.RpcExecutor;
import org.onosproject.yang.model.RpcOutput; import org.onosproject.config.RpcMessageId;
import org.onosproject.d.config.DeviceResourceIds;
import org.onosproject.d.config.ResourceIds;
import org.onosproject.event.AbstractListenerManager;
import org.onosproject.yang.model.DataNode; import org.onosproject.yang.model.DataNode;
import org.onosproject.yang.model.DataNode.Type; import org.onosproject.yang.model.DataNode.Type;
import org.onosproject.yang.model.InnerNode; import org.onosproject.yang.model.InnerNode;
import org.onosproject.yang.model.ResourceId; import org.onosproject.yang.model.ResourceId;
import org.onosproject.yang.model.RpcContext; import org.onosproject.yang.model.RpcContext;
import org.onosproject.yang.model.RpcInput;
import org.onosproject.yang.model.RpcOutput;
import org.onosproject.yang.model.RpcRegistry; import org.onosproject.yang.model.RpcRegistry;
import org.onosproject.yang.model.RpcService; import org.onosproject.yang.model.RpcService;
import org.onosproject.yang.model.SchemaContextProvider; import org.onosproject.yang.model.SchemaContextProvider;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static org.onosproject.d.config.DeviceResourceIds.DCS_NAMESPACE; import static org.onosproject.d.config.DeviceResourceIds.DCS_NAMESPACE;
@ -59,8 +58,7 @@ import static org.slf4j.LoggerFactory.getLogger;
* Implementation of the Dynamic Config Service. * Implementation of the Dynamic Config Service.
* *
*/ */
@Component(immediate = true) @Component(immediate = true, service = { DynamicConfigService.class, RpcRegistry.class })
@Service
public class DynamicConfigManager public class DynamicConfigManager
extends AbstractListenerManager<DynamicConfigEvent, DynamicConfigListener> extends AbstractListenerManager<DynamicConfigEvent, DynamicConfigListener>
implements DynamicConfigService, RpcRegistry { implements DynamicConfigService, RpcRegistry {
@ -68,10 +66,10 @@ public class DynamicConfigManager
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
private final DynamicConfigStoreDelegate storeDelegate = new InternalStoreDelegate(); private final DynamicConfigStoreDelegate storeDelegate = new InternalStoreDelegate();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DynamicConfigStore store; protected DynamicConfigStore store;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected SchemaContextProvider contextProvider; protected SchemaContextProvider contextProvider;
// FIXME is it OK this is not using the Store? // FIXME is it OK this is not using the Store?

20
apps/configsync-netconf/src/main/java/org/onosproject/d/config/sync/impl/netconf/NetconfDeviceConfigSynchronizerComponent.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.d.config.sync.impl.netconf; package org.onosproject.d.config.sync.impl.netconf;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.d.config.sync.DeviceConfigSynchronizationProviderRegistry; import org.onosproject.d.config.sync.DeviceConfigSynchronizationProviderRegistry;
import org.onosproject.d.config.sync.DeviceConfigSynchronizationProviderService; import org.onosproject.d.config.sync.DeviceConfigSynchronizationProviderService;
import org.onosproject.net.device.DeviceService; import org.onosproject.net.device.DeviceService;
@ -51,19 +51,19 @@ public class NetconfDeviceConfigSynchronizerComponent {
public static final ProviderId PID = public static final ProviderId PID =
new ProviderId("netconf", "org.onosproject.d.config.sync.netconf"); new ProviderId("netconf", "org.onosproject.d.config.sync.netconf");
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceConfigSynchronizationProviderRegistry registry; protected DeviceConfigSynchronizationProviderRegistry registry;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetconfController netconfController; protected NetconfController netconfController;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected YangRuntimeService yangRuntimeService; protected YangRuntimeService yangRuntimeService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected SchemaContextProvider schemaContextProvider; protected SchemaContextProvider schemaContextProvider;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
private NetconfDeviceConfigSynchronizerProvider provider; private NetconfDeviceConfigSynchronizerProvider provider;

53
apps/configsync/src/main/java/org/onosproject/d/config/sync/impl/DynamicDeviceConfigSynchronizer.java
View File

@ -15,27 +15,9 @@
*/ */
package org.onosproject.d.config.sync.impl; package org.onosproject.d.config.sync.impl;
import static java.util.concurrent.CompletableFuture.completedFuture; import com.google.common.annotations.Beta;
import static org.onosproject.d.config.DeviceResourceIds.isUnderDeviceRootNode; import com.google.common.collect.ImmutableList;
import static org.onosproject.d.config.DeviceResourceIds.toDeviceId; import com.google.common.collect.ImmutableMap;
import static org.onosproject.d.config.DeviceResourceIds.toResourceId;
import static org.onosproject.d.config.sync.operation.SetResponse.response;
import static org.slf4j.LoggerFactory.getLogger;
import java.time.Duration;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.Tools; import org.onlab.util.Tools;
import org.onosproject.config.DynamicConfigEvent; import org.onosproject.config.DynamicConfigEvent;
import org.onosproject.config.DynamicConfigEvent.Type; import org.onosproject.config.DynamicConfigEvent.Type;
@ -58,11 +40,27 @@ import org.onosproject.net.provider.AbstractProviderService;
import org.onosproject.store.primitives.TransactionId; import org.onosproject.store.primitives.TransactionId;
import org.onosproject.yang.model.DataNode; import org.onosproject.yang.model.DataNode;
import org.onosproject.yang.model.ResourceId; import org.onosproject.yang.model.ResourceId;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import com.google.common.annotations.Beta; import java.time.Duration;
import com.google.common.collect.ImmutableList; import java.util.Collection;
import com.google.common.collect.ImmutableMap; import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import static java.util.concurrent.CompletableFuture.completedFuture;
import static org.onosproject.d.config.DeviceResourceIds.isUnderDeviceRootNode;
import static org.onosproject.d.config.DeviceResourceIds.toDeviceId;
import static org.onosproject.d.config.DeviceResourceIds.toResourceId;
import static org.onosproject.d.config.sync.operation.SetResponse.response;
import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Component to bridge Dynamic Config store and the Device configuration state. * Component to bridge Dynamic Config store and the Device configuration state.
@ -73,8 +71,7 @@ import com.google.common.collect.ImmutableMap;
* </ul> * </ul>
*/ */
@Beta @Beta
@Component(immediate = true) @Component(immediate = true, service = DeviceConfigSynchronizationProviderRegistry.class)
@Service
public class DynamicDeviceConfigSynchronizer public class DynamicDeviceConfigSynchronizer
extends AbstractProviderRegistry<DeviceConfigSynchronizationProvider, extends AbstractProviderRegistry<DeviceConfigSynchronizationProvider,
DeviceConfigSynchronizationProviderService> DeviceConfigSynchronizationProviderService>
@ -82,10 +79,10 @@ public class DynamicDeviceConfigSynchronizer
private static final Logger log = getLogger(DynamicDeviceConfigSynchronizer.class); private static final Logger log = getLogger(DynamicDeviceConfigSynchronizer.class);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DynamicConfigService dynConfigService; protected DynamicConfigService dynConfigService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetworkConfigService netcfgService; protected NetworkConfigService netcfgService;
private DynamicConfigListener listener = new InnerDyConListener(); private DynamicConfigListener listener = new InnerDyConListener();

16
apps/cpman/app/src/main/java/org/onosproject/cpman/gui/CpmanUI.java
View File

@ -16,16 +16,15 @@
package org.onosproject.cpman.gui; package org.onosproject.cpman.gui;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.ui.UiExtension; import org.onosproject.ui.UiExtension;
import org.onosproject.ui.UiExtensionService; import org.onosproject.ui.UiExtensionService;
import org.onosproject.ui.UiMessageHandlerFactory; import org.onosproject.ui.UiMessageHandlerFactory;
import org.onosproject.ui.UiView; import org.onosproject.ui.UiView;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -36,8 +35,7 @@ import static org.onosproject.ui.UiView.Category.NETWORK;
/** /**
* Mechanism to stream data to the GUI. * Mechanism to stream data to the GUI.
*/ */
@Component(immediate = true, enabled = true) @Component(immediate = true, service = CpmanUI.class)
@Service(value = CpmanUI.class)
public class CpmanUI { public class CpmanUI {
private static final String CPMAN_ID = "cpman"; private static final String CPMAN_ID = "cpman";
private static final String CPMAN_TEXT = "Control Plane Manager"; private static final String CPMAN_TEXT = "Control Plane Manager";
@ -46,7 +44,7 @@ public class CpmanUI {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected UiExtensionService uiExtensionService; protected UiExtensionService uiExtensionService;
// Factory for UI message handlers // Factory for UI message handlers

16
apps/cpman/app/src/main/java/org/onosproject/cpman/impl/ControlPlaneManager.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.cpman.impl; package org.onosproject.cpman.impl;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.cpman.ControlMessage; import org.onosproject.cpman.ControlMessage;
@ -45,13 +45,13 @@ public class ControlPlaneManager {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ControlMessageService messageService; protected ControlMessageService messageService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ControlPlaneMonitorService monitorService; protected ControlPlaneMonitorService monitorService;
private final ControlMessageListener messageListener = private final ControlMessageListener messageListener =

18
apps/cpman/app/src/main/java/org/onosproject/cpman/impl/ControlPlaneMonitor.java
View File

@ -19,12 +19,6 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.onosproject.cluster.ClusterService; import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.NodeId; import org.onosproject.cluster.NodeId;
@ -42,6 +36,11 @@ import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
import org.onosproject.store.cluster.messaging.MessageSubject; import org.onosproject.store.cluster.messaging.MessageSubject;
import org.onosproject.store.serializers.KryoNamespaces; import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -63,8 +62,7 @@ import static org.onosproject.cpman.ControlResource.Type;
/** /**
* Control plane monitoring service class. * Control plane monitoring service class.
*/ */
@Component(immediate = true) @Component(immediate = true, service = ControlPlaneMonitorService.class)
@Service
public class ControlPlaneMonitor implements ControlPlaneMonitorService { public class ControlPlaneMonitor implements ControlPlaneMonitorService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@ -74,10 +72,10 @@ public class ControlPlaneMonitor implements ControlPlaneMonitorService {
private Map<String, MetricsDatabase> diskMetricsMap; private Map<String, MetricsDatabase> diskMetricsMap;
private Map<String, MetricsDatabase> networkMetricsMap; private Map<String, MetricsDatabase> networkMetricsMap;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ClusterService clusterService; protected ClusterService clusterService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ClusterCommunicationService communicationService; protected ClusterCommunicationService communicationService;
private static final String DEFAULT_RESOURCE = "default"; private static final String DEFAULT_RESOURCE = "default";

17
apps/cpman/app/src/main/java/org/onosproject/cpman/impl/message/ControlMessageManager.java
View File

@ -15,12 +15,6 @@
*/ */
package org.onosproject.cpman.impl.message; package org.onosproject.cpman.impl.message;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.cpman.ControlMessage; import org.onosproject.cpman.ControlMessage;
import org.onosproject.cpman.message.ControlMessageAdminService; import org.onosproject.cpman.message.ControlMessageAdminService;
import org.onosproject.cpman.message.ControlMessageEvent; import org.onosproject.cpman.message.ControlMessageEvent;
@ -34,6 +28,11 @@ import org.onosproject.cpman.message.ControlMessageStoreDelegate;
import org.onosproject.net.DeviceId; import org.onosproject.net.DeviceId;
import org.onosproject.net.provider.AbstractListenerProviderRegistry; import org.onosproject.net.provider.AbstractListenerProviderRegistry;
import org.onosproject.net.provider.AbstractProviderService; import org.onosproject.net.provider.AbstractProviderService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Set; import java.util.Set;
@ -44,8 +43,8 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Provides implementation of the control message SB &amp; NB APIs. * Provides implementation of the control message SB &amp; NB APIs.
*/ */
@Component(immediate = true) @Component(immediate = true, service = { ControlMessageService.class, ControlMessageAdminService.class,
@Service ControlMessageProviderRegistry.class })
public class ControlMessageManager public class ControlMessageManager
extends AbstractListenerProviderRegistry<ControlMessageEvent, ControlMessageListener, extends AbstractListenerProviderRegistry<ControlMessageEvent, ControlMessageListener,
ControlMessageProvider, ControlMessageProviderService> ControlMessageProvider, ControlMessageProviderService>
@ -58,7 +57,7 @@ public class ControlMessageManager
private final ControlMessageStoreDelegate delegate = new InternalStoreDelegate(); private final ControlMessageStoreDelegate delegate = new InternalStoreDelegate();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ControlMessageStore store; protected ControlMessageStore store;
@Activate @Activate

10
apps/cpman/app/src/main/java/org/onosproject/cpman/impl/message/DefaultControlMessageStore.java
View File

@ -15,10 +15,6 @@
*/ */
package org.onosproject.cpman.impl.message; package org.onosproject.cpman.impl.message;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.cpman.ControlMessage; import org.onosproject.cpman.ControlMessage;
import org.onosproject.cpman.message.ControlMessageEvent; import org.onosproject.cpman.message.ControlMessageEvent;
import org.onosproject.cpman.message.ControlMessageStore; import org.onosproject.cpman.message.ControlMessageStore;
@ -26,6 +22,9 @@ import org.onosproject.cpman.message.ControlMessageStoreDelegate;
import org.onosproject.net.DeviceId; import org.onosproject.net.DeviceId;
import org.onosproject.net.provider.ProviderId; import org.onosproject.net.provider.ProviderId;
import org.onosproject.store.AbstractStore; import org.onosproject.store.AbstractStore;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Set; import java.util.Set;
@ -36,8 +35,7 @@ import static org.slf4j.LoggerFactory.getLogger;
* Manages inventory of control message using trivial in-memory structures * Manages inventory of control message using trivial in-memory structures
* implementation. * implementation.
*/ */
@Component(immediate = true) @Component(immediate = true, service = ControlMessageStore.class)
@Service
public class DefaultControlMessageStore public class DefaultControlMessageStore
extends AbstractStore<ControlMessageEvent, ControlMessageStoreDelegate> extends AbstractStore<ControlMessageEvent, ControlMessageStoreDelegate>
implements ControlMessageStore { implements ControlMessageStore {

12
apps/cpman/app/src/main/java/org/onosproject/cpman/rest/CPManCodecRegistrator.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.cpman.rest; package org.onosproject.cpman.rest;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.codec.CodecService; import org.onosproject.codec.CodecService;
import org.onosproject.cpman.ControlLoadSnapshot; import org.onosproject.cpman.ControlLoadSnapshot;
import org.onosproject.cpman.codec.ControlLoadSnapshotCodec; import org.onosproject.cpman.codec.ControlLoadSnapshotCodec;
@ -35,7 +35,7 @@ public class CPManCodecRegistrator {
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CodecService codecService; protected CodecService codecService;
@Activate @Activate

35
apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
View File

@ -17,15 +17,6 @@ package org.onosproject.dhcp.impl;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.ARP; import org.onlab.packet.ARP;
import org.onlab.packet.DHCP; import org.onlab.packet.DHCP;
import org.onlab.packet.Ethernet; import org.onlab.packet.Ethernet;
@ -69,6 +60,12 @@ import org.onosproject.net.packet.PacketService;
import org.onosproject.net.provider.AbstractProvider; import org.onosproject.net.provider.AbstractProvider;
import org.onosproject.net.provider.ProviderId; import org.onosproject.net.provider.ProviderId;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -77,7 +74,6 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.Dictionary; import java.util.Dictionary;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@ -97,8 +93,7 @@ import static org.onosproject.net.config.basics.SubjectFactories.APP_SUBJECT_FAC
/** /**
* Skeletal ONOS DHCP Server application. * Skeletal ONOS DHCP Server application.
*/ */
@Component(immediate = true) @Component(immediate = true, service = DhcpService.class)
@Service
public class DhcpManager implements DhcpService { public class DhcpManager implements DhcpService {
private static final ProviderId PID = new ProviderId("of", "org.onosproject.dhcp", true); private static final ProviderId PID = new ProviderId("of", "org.onosproject.dhcp", true);
@ -119,28 +114,28 @@ public class DhcpManager implements DhcpService {
} }
} }
); );
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetworkConfigRegistry cfgService; protected NetworkConfigRegistry cfgService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected PacketService packetService; protected PacketService packetService;
private DhcpPacketProcessor processor = new DhcpPacketProcessor(); private DhcpPacketProcessor processor = new DhcpPacketProcessor();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DhcpStore dhcpStore; protected DhcpStore dhcpStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostProviderRegistry hostProviderRegistry; protected HostProviderRegistry hostProviderRegistry;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService componentConfigService; protected ComponentConfigService componentConfigService;
@Property(name = ALLOW_HOST_DISCOVERY, boolValue = DEFAULT_ALLOW_HOST_DISCOVERY, //@Property(name = ALLOW_HOST_DISCOVERY, boolValue = DEFAULT_ALLOW_HOST_DISCOVERY,
label = "Allow host discovery from DHCP request") // label = "Allow host discovery from DHCP request")
private boolean allowHostDiscovery = DEFAULT_ALLOW_HOST_DISCOVERY; private boolean allowHostDiscovery = DEFAULT_ALLOW_HOST_DISCOVERY;
protected HostProviderService hostProviderService; protected HostProviderService hostProviderService;

16
apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpUi.java
View File

@ -16,16 +16,15 @@
package org.onosproject.dhcp.impl; package org.onosproject.dhcp.impl;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.ui.UiExtension; import org.onosproject.ui.UiExtension;
import org.onosproject.ui.UiExtensionService; import org.onosproject.ui.UiExtensionService;
import org.onosproject.ui.UiMessageHandlerFactory; import org.onosproject.ui.UiMessageHandlerFactory;
import org.onosproject.ui.UiView; import org.onosproject.ui.UiView;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -36,14 +35,13 @@ import static org.onosproject.ui.UiView.Category.NETWORK;
/** /**
* Mechanism to stream data to the GUI. * Mechanism to stream data to the GUI.
*/ */
@Component(immediate = true, enabled = true) @Component(immediate = true, service = DhcpUi.class)
@Service(value = DhcpUi.class)
public class DhcpUi { public class DhcpUi {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private static final ClassLoader CL = DhcpUi.class.getClassLoader(); private static final ClassLoader CL = DhcpUi.class.getClassLoader();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected UiExtensionService uiExtensionService; protected UiExtensionService uiExtensionService;
private final UiMessageHandlerFactory messageHandlerFactory = private final UiMessageHandlerFactory messageHandlerFactory =

18
apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java
View File

@ -16,12 +16,6 @@
package org.onosproject.dhcp.impl; package org.onosproject.dhcp.impl;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.Ip4Address; import org.onlab.packet.Ip4Address;
import org.onlab.packet.MacAddress; import org.onlab.packet.MacAddress;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
@ -34,12 +28,17 @@ import org.onosproject.store.service.DistributedSet;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.Versioned; import org.onosproject.store.service.Versioned;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.Date; import java.util.Date;
import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map;
import static org.onosproject.dhcp.IpAssignment.AssignmentStatus.Option_Assigned; import static org.onosproject.dhcp.IpAssignment.AssignmentStatus.Option_Assigned;
import static org.onosproject.dhcp.IpAssignment.AssignmentStatus.Option_RangeNotEnforced; import static org.onosproject.dhcp.IpAssignment.AssignmentStatus.Option_RangeNotEnforced;
@ -49,13 +48,12 @@ import static org.onosproject.dhcp.IpAssignment.AssignmentStatus.Option_RangeNot
* Remembers the mapping between MAC ID and IP Addresses assigned. * Remembers the mapping between MAC ID and IP Addresses assigned.
*/ */
@Component(immediate = true) @Component(immediate = true, service = DhcpStore.class)
@Service
public class DistributedDhcpStore implements DhcpStore { public class DistributedDhcpStore implements DhcpStore {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
private ConsistentMap<HostId, IpAssignment> allocationMap; private ConsistentMap<HostId, IpAssignment> allocationMap;

71
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
View File

@ -23,14 +23,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps; import com.google.common.collect.Multimaps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.BasePacket; import org.onlab.packet.BasePacket;
import org.onlab.packet.DHCP; import org.onlab.packet.DHCP;
import org.onlab.packet.Ethernet; import org.onlab.packet.Ethernet;
@ -54,44 +46,50 @@ import org.onosproject.dhcprelay.config.DhcpServerConfig;
import org.onosproject.dhcprelay.config.IgnoreDhcpConfig; import org.onosproject.dhcprelay.config.IgnoreDhcpConfig;
import org.onosproject.dhcprelay.store.DhcpRecord; import org.onosproject.dhcprelay.store.DhcpRecord;
import org.onosproject.dhcprelay.store.DhcpRelayStore; import org.onosproject.dhcprelay.store.DhcpRelayStore;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Device; import org.onosproject.net.Device;
import org.onosproject.net.DeviceId; import org.onosproject.net.DeviceId;
import org.onosproject.net.Host;
import org.onosproject.net.HostId;
import org.onosproject.net.HostLocation;
import org.onosproject.net.behaviour.Pipeliner; import org.onosproject.net.behaviour.Pipeliner;
import org.onosproject.net.device.DeviceService; import org.onosproject.net.device.DeviceService;
import org.onosproject.net.flow.DefaultTrafficSelector; import org.onosproject.net.flow.DefaultTrafficSelector;
import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.TrafficSelector; import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.flowobjective.DefaultForwardingObjective; import org.onosproject.net.flowobjective.DefaultForwardingObjective;
import org.onosproject.net.flowobjective.FlowObjectiveService; import org.onosproject.net.flowobjective.FlowObjectiveService;
import org.onosproject.net.flowobjective.ForwardingObjective; import org.onosproject.net.flowobjective.ForwardingObjective;
import org.onosproject.net.flowobjective.Objective; import org.onosproject.net.flowobjective.Objective;
import org.onosproject.net.flowobjective.ObjectiveContext; import org.onosproject.net.flowobjective.ObjectiveContext;
import org.onosproject.net.flowobjective.ObjectiveError; import org.onosproject.net.flowobjective.ObjectiveError;
import org.onosproject.net.host.DefaultHostDescription;
import org.onosproject.net.host.HostDescription;
import org.onosproject.net.host.HostEvent; import org.onosproject.net.host.HostEvent;
import org.onosproject.net.host.HostListener; import org.onosproject.net.host.HostListener;
import org.onosproject.net.host.HostProvider; import org.onosproject.net.host.HostProvider;
import org.onosproject.net.host.HostProviderRegistry; import org.onosproject.net.host.HostProviderRegistry;
import org.onosproject.net.host.HostProviderService; import org.onosproject.net.host.HostProviderService;
import org.onosproject.net.intf.Interface;
import org.onosproject.net.intf.InterfaceService;
import org.onosproject.net.packet.PacketPriority;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteStore;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Host;
import org.onosproject.net.HostId;
import org.onosproject.net.HostLocation;
import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.host.DefaultHostDescription;
import org.onosproject.net.host.HostDescription;
import org.onosproject.net.host.HostService; import org.onosproject.net.host.HostService;
import org.onosproject.net.host.InterfaceIpAddress; import org.onosproject.net.host.InterfaceIpAddress;
import org.onosproject.net.intf.Interface;
import org.onosproject.net.intf.InterfaceService;
import org.onosproject.net.packet.DefaultOutboundPacket; import org.onosproject.net.packet.DefaultOutboundPacket;
import org.onosproject.net.packet.OutboundPacket; import org.onosproject.net.packet.OutboundPacket;
import org.onosproject.net.packet.PacketContext; import org.onosproject.net.packet.PacketContext;
import org.onosproject.net.packet.PacketPriority;
import org.onosproject.net.packet.PacketService; import org.onosproject.net.packet.PacketService;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteStore;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -121,9 +119,8 @@ import static org.onosproject.net.flowobjective.Objective.Operation.ADD;
import static org.onosproject.net.flowobjective.Objective.Operation.REMOVE; import static org.onosproject.net.flowobjective.Objective.Operation.REMOVE;
@Component @Component(service = { DhcpHandler.class, HostProvider.class })
@Service //@Property(name = "version", value = "4")
@Property(name = "version", value = "4")
public class Dhcp4HandlerImpl implements DhcpHandler, HostProvider { public class Dhcp4HandlerImpl implements DhcpHandler, HostProvider {
public static final String DHCP_V4_RELAY_APP = "org.onosproject.Dhcp4HandlerImpl"; public static final String DHCP_V4_RELAY_APP = "org.onosproject.Dhcp4HandlerImpl";
public static final ProviderId PROVIDER_ID = new ProviderId("dhcp4", DHCP_V4_RELAY_APP); public static final ProviderId PROVIDER_ID = new ProviderId("dhcp4", DHCP_V4_RELAY_APP);
@ -152,34 +149,34 @@ public class Dhcp4HandlerImpl implements DhcpHandler, HostProvider {
); );
private static Logger log = LoggerFactory.getLogger(Dhcp4HandlerImpl.class); private static Logger log = LoggerFactory.getLogger(Dhcp4HandlerImpl.class);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DhcpRelayStore dhcpRelayStore; protected DhcpRelayStore dhcpRelayStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected PacketService packetService; protected PacketService packetService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected RouteStore routeStore; protected RouteStore routeStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected InterfaceService interfaceService; protected InterfaceService interfaceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hostService; protected HostService hostService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostProviderRegistry providerRegistry; protected HostProviderRegistry providerRegistry;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowObjectiveService flowObjectiveService; protected FlowObjectiveService flowObjectiveService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService cfgService; protected ComponentConfigService cfgService;
protected HostProviderService providerService; protected HostProviderService providerService;
@ -190,8 +187,8 @@ public class Dhcp4HandlerImpl implements DhcpHandler, HostProvider {
private List<DhcpServerInfo> defaultServerInfoList = new CopyOnWriteArrayList<>(); private List<DhcpServerInfo> defaultServerInfoList = new CopyOnWriteArrayList<>();
private List<DhcpServerInfo> indirectServerInfoList = new CopyOnWriteArrayList<>(); private List<DhcpServerInfo> indirectServerInfoList = new CopyOnWriteArrayList<>();
@Property(name = Dhcp4HandlerImpl.LQ_ROUTE_PROPERTY_NAME, boolValue = false, //@Property(name = Dhcp4HandlerImpl.LQ_ROUTE_PROPERTY_NAME, boolValue = false,
label = "Enable learning routing information from LQ") // label = "Enable learning routing information from LQ")
private Boolean learnRouteFromLeasequery = Boolean.TRUE; private Boolean learnRouteFromLeasequery = Boolean.TRUE;
private Executor hostEventExecutor = newSingleThreadExecutor( private Executor hostEventExecutor = newSingleThreadExecutor(

47
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
View File

@ -22,14 +22,12 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps; import com.google.common.collect.Multimaps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified; import org.osgi.service.component.annotations.Modified;
import org.apache.felix.scr.annotations.Property; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.BasePacket; import org.onlab.packet.BasePacket;
import org.onlab.packet.DHCP6; import org.onlab.packet.DHCP6;
import org.onlab.packet.IPv6; import org.onlab.packet.IPv6;
@ -126,9 +124,8 @@ import static org.onosproject.net.flowobjective.Objective.Operation.ADD;
import static org.onosproject.net.flowobjective.Objective.Operation.REMOVE; import static org.onosproject.net.flowobjective.Objective.Operation.REMOVE;
import java.util.concurrent.Semaphore; import java.util.concurrent.Semaphore;
@Component @Component(service = { DhcpHandler.class, HostProvider.class })
@Service //@Property(name = "version", value = "6")
@Property(name = "version", value = "6")
public class Dhcp6HandlerImpl implements DhcpHandler, HostProvider { public class Dhcp6HandlerImpl implements DhcpHandler, HostProvider {
public static final String DHCP_V6_RELAY_APP = "org.onosproject.Dhcp6HandlerImpl"; public static final String DHCP_V6_RELAY_APP = "org.onosproject.Dhcp6HandlerImpl";
public static final ProviderId PROVIDER_ID = new ProviderId("dhcp6", DHCP_V6_RELAY_APP); public static final ProviderId PROVIDER_ID = new ProviderId("dhcp6", DHCP_V6_RELAY_APP);
@ -164,44 +161,44 @@ public class Dhcp6HandlerImpl implements DhcpHandler, HostProvider {
); );
private static Logger log = LoggerFactory.getLogger(Dhcp6HandlerImpl.class); private static Logger log = LoggerFactory.getLogger(Dhcp6HandlerImpl.class);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DhcpRelayStore dhcpRelayStore; protected DhcpRelayStore dhcpRelayStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DhcpRelayCountersStore dhcpRelayCountersStore; protected DhcpRelayCountersStore dhcpRelayCountersStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected PacketService packetService; protected PacketService packetService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected RouteStore routeStore; protected RouteStore routeStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected InterfaceService interfaceService; protected InterfaceService interfaceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hostService; protected HostService hostService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostProviderRegistry providerRegistry; protected HostProviderRegistry providerRegistry;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DhcpFpmPrefixStore dhcpFpmPrefixStore; protected DhcpFpmPrefixStore dhcpFpmPrefixStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowObjectiveService flowObjectiveService; protected FlowObjectiveService flowObjectiveService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService cfgService; protected ComponentConfigService cfgService;
@Property(name = Dhcp6HandlerImpl.LQ_ROUTE_PROPERTY_NAME, boolValue = false, //@Property(name = Dhcp6HandlerImpl.LQ_ROUTE_PROPERTY_NAME, boolValue = false,
label = "Enable learning routing information from LQ") // label = "Enable learning routing information from LQ")
private Boolean learnRouteFromLeasequery = Boolean.TRUE; private Boolean learnRouteFromLeasequery = Boolean.TRUE;
protected HostProviderService providerService; protected HostProviderService providerService;

106
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java
View File

@ -15,37 +15,19 @@
*/ */
package org.onosproject.dhcprelay; package org.onosproject.dhcprelay;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Collections;
import java.util.Dictionary;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Streams; import com.google.common.collect.Streams;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.ARP; import org.onlab.packet.ARP;
import org.onlab.packet.DHCP; import org.onlab.packet.DHCP;
import org.onlab.packet.DHCP6; import org.onlab.packet.DHCP6;
import org.onlab.packet.IPacket;
import org.onlab.packet.IPv6;
import org.onlab.packet.Ethernet; import org.onlab.packet.Ethernet;
import org.onlab.packet.IPacket;
import org.onlab.packet.IPv4; import org.onlab.packet.IPv4;
import org.onlab.packet.IPv6;
import org.onlab.packet.Ip4Address; import org.onlab.packet.Ip4Address;
import org.onlab.packet.MacAddress;
import org.onlab.packet.IpPrefix; import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.UDP; import org.onlab.packet.UDP;
import org.onlab.packet.VlanId; import org.onlab.packet.VlanId;
import org.onlab.util.Tools; import org.onlab.util.Tools;
@ -58,56 +40,68 @@ import org.onosproject.dhcprelay.api.DhcpServerInfo;
import org.onosproject.dhcprelay.config.DefaultDhcpRelayConfig; import org.onosproject.dhcprelay.config.DefaultDhcpRelayConfig;
import org.onosproject.dhcprelay.config.DhcpServerConfig; import org.onosproject.dhcprelay.config.DhcpServerConfig;
import org.onosproject.dhcprelay.config.EnableDhcpFpmConfig; import org.onosproject.dhcprelay.config.EnableDhcpFpmConfig;
import org.onosproject.dhcprelay.config.IndirectDhcpRelayConfig;
import org.onosproject.dhcprelay.config.IgnoreDhcpConfig; import org.onosproject.dhcprelay.config.IgnoreDhcpConfig;
import org.onosproject.dhcprelay.config.IndirectDhcpRelayConfig;
import org.onosproject.dhcprelay.store.DhcpFpmPrefixStore;
import org.onosproject.dhcprelay.store.DhcpRecord; import org.onosproject.dhcprelay.store.DhcpRecord;
import org.onosproject.dhcprelay.store.DhcpRelayStore; import org.onosproject.dhcprelay.store.DhcpRelayStore;
import org.onosproject.dhcprelay.store.DhcpFpmPrefixStore; import org.onosproject.net.ConnectPoint;
import org.onosproject.routing.fpm.api.FpmRecord;
import org.onosproject.net.Device; import org.onosproject.net.Device;
import org.onosproject.net.Host; import org.onosproject.net.Host;
import org.onosproject.net.config.Config;
import org.onosproject.net.device.DeviceEvent;
import org.onosproject.net.device.DeviceListener;
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.intf.Interface;
import org.onosproject.net.intf.InterfaceService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.HostId; import org.onosproject.net.HostId;
import org.onosproject.net.config.Config;
import org.onosproject.net.config.ConfigFactory; import org.onosproject.net.config.ConfigFactory;
import org.onosproject.net.config.NetworkConfigEvent; import org.onosproject.net.config.NetworkConfigEvent;
import org.onosproject.net.config.NetworkConfigListener; import org.onosproject.net.config.NetworkConfigListener;
import org.onosproject.net.config.NetworkConfigRegistry; import org.onosproject.net.config.NetworkConfigRegistry;
import org.onosproject.net.device.DeviceEvent;
import org.onosproject.net.device.DeviceListener;
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.flow.DefaultTrafficSelector; import org.onosproject.net.flow.DefaultTrafficSelector;
import org.onosproject.net.flow.DefaultTrafficTreatment; import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.TrafficSelector; import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flow.TrafficTreatment; import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.host.HostService; import org.onosproject.net.host.HostService;
import org.onosproject.net.intf.Interface;
import org.onosproject.net.intf.InterfaceService;
import org.onosproject.net.packet.DefaultOutboundPacket; import org.onosproject.net.packet.DefaultOutboundPacket;
import org.onosproject.net.packet.OutboundPacket; import org.onosproject.net.packet.OutboundPacket;
import org.onosproject.net.packet.PacketContext; import org.onosproject.net.packet.PacketContext;
import org.onosproject.net.packet.PacketPriority; import org.onosproject.net.packet.PacketPriority;
import org.onosproject.net.packet.PacketProcessor; import org.onosproject.net.packet.PacketProcessor;
import org.onosproject.net.packet.PacketService; import org.onosproject.net.packet.PacketService;
import org.onosproject.routing.fpm.api.FpmRecord;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Collections;
import java.util.Dictionary;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.onlab.util.Tools.groupedThreads; import static org.onlab.util.Tools.groupedThreads;
import com.google.common.collect.ImmutableSet;
import static org.onosproject.net.config.basics.SubjectFactories.APP_SUBJECT_FACTORY; import static org.onosproject.net.config.basics.SubjectFactories.APP_SUBJECT_FACTORY;
/** /**
* DHCP Relay Agent Application Component. * DHCP Relay Agent Application Component.
*/ */
@Component(immediate = true) @Component(immediate = true, service = DhcpRelayService.class)
@Service
public class DhcpRelayManager implements DhcpRelayService { public class DhcpRelayManager implements DhcpRelayService {
public static final String DHCP_RELAY_APP = "org.onosproject.dhcprelay"; public static final String DHCP_RELAY_APP = "org.onosproject.dhcprelay";
public static final String ROUTE_STORE_IMPL = public static final String ROUTE_STORE_IMPL =
@ -159,51 +153,51 @@ public class DhcpRelayManager implements DhcpRelayService {
); );
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetworkConfigRegistry cfgService; protected NetworkConfigRegistry cfgService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected PacketService packetService; protected PacketService packetService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hostService; protected HostService hostService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected InterfaceService interfaceService; protected InterfaceService interfaceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DhcpRelayStore dhcpRelayStore; protected DhcpRelayStore dhcpRelayStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService compCfgService; protected ComponentConfigService compCfgService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DhcpFpmPrefixStore dhcpFpmPrefixStore; protected DhcpFpmPrefixStore dhcpFpmPrefixStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY, @Reference(cardinality = ReferenceCardinality.MANDATORY,
target = "(version=4)") target = "(version=4)")
protected DhcpHandler v4Handler; protected DhcpHandler v4Handler;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY, @Reference(cardinality = ReferenceCardinality.MANDATORY,
target = "(version=6)") target = "(version=6)")
protected DhcpHandler v6Handler; protected DhcpHandler v6Handler;
@Property(name = "arpEnabled", boolValue = true, //@Property(name = "arpEnabled", boolValue = true,
label = "Enable Address resolution protocol") // label = "Enable Address resolution protocol")
protected boolean arpEnabled = true; protected boolean arpEnabled = true;
@Property(name = "dhcpPollInterval", intValue = 24 * 3600, //@Property(name = "dhcpPollInterval", intValue = 24 * 3600,
label = "dhcp relay poll interval") // label = "dhcp relay poll interval")
protected int dhcpPollInterval = 24 * 3600; protected int dhcpPollInterval = 24 * 3600;
@Property(name = "dhcpFpmEnabled", boolValue = false, //@Property(name = "dhcpFpmEnabled", boolValue = false,
label = "Enable DhcpRelay Fpm") // label = "Enable DhcpRelay Fpm")
protected boolean dhcpFpmEnabled = false; protected boolean dhcpFpmEnabled = false;
private ScheduledExecutorService timerExecutor; private ScheduledExecutorService timerExecutor;

23
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayCountersStore.java
View File

@ -15,34 +15,31 @@
*/ */
package org.onosproject.dhcprelay.store; package org.onosproject.dhcprelay.store;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.ConsistentMap; import org.onosproject.store.service.ConsistentMap;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.Versioned;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.onosproject.store.serializers.KryoNamespaces;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.onosproject.store.service.Versioned;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@Component(immediate = true) @Component(immediate = true, service = DhcpRelayCountersStore.class)
@Service
public class DistributedDhcpRelayCountersStore implements DhcpRelayCountersStore { public class DistributedDhcpRelayCountersStore implements DhcpRelayCountersStore {
private static final KryoNamespace.Builder APP_KYRO = KryoNamespace.newBuilder() private static final KryoNamespace.Builder APP_KYRO = KryoNamespace.newBuilder()
.register(KryoNamespaces.API) .register(KryoNamespaces.API)
@ -51,10 +48,10 @@ public class DistributedDhcpRelayCountersStore implements DhcpRelayCountersStore
private Logger log = LoggerFactory.getLogger(getClass()); private Logger log = LoggerFactory.getLogger(getClass());
private ConsistentMap<String, DhcpRelayCounters> counters; private ConsistentMap<String, DhcpRelayCounters> counters;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;

16
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStore.java
View File

@ -16,12 +16,6 @@
package org.onosproject.dhcprelay.store; package org.onosproject.dhcprelay.store;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.DHCP; import org.onlab.packet.DHCP;
import org.onlab.packet.DHCP6; import org.onlab.packet.DHCP6;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
@ -33,6 +27,11 @@ import org.onosproject.store.service.EventuallyConsistentMapEvent;
import org.onosproject.store.service.EventuallyConsistentMapListener; import org.onosproject.store.service.EventuallyConsistentMapListener;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.WallClockTimestamp; import org.onosproject.store.service.WallClockTimestamp;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Collection; import java.util.Collection;
@ -44,8 +43,7 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Distributed DHCP relay store. * Distributed DHCP relay store.
*/ */
@Component(immediate = true) @Component(immediate = true, service = DhcpRelayStore.class)
@Service
public class DistributedDhcpRelayStore implements DhcpRelayStore { public class DistributedDhcpRelayStore implements DhcpRelayStore {
private static final KryoNamespace APP_KRYO = KryoNamespace.newBuilder() private static final KryoNamespace APP_KRYO = KryoNamespace.newBuilder()
.register(KryoNamespaces.API) .register(KryoNamespaces.API)
@ -60,7 +58,7 @@ public class DistributedDhcpRelayStore implements DhcpRelayStore {
private EventuallyConsistentMap<HostId, DhcpRecord> dhcpRecords; private EventuallyConsistentMap<HostId, DhcpRecord> dhcpRecords;
private EventuallyConsistentMapListener<HostId, DhcpRecord> listener; private EventuallyConsistentMapListener<HostId, DhcpRecord> listener;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
@Activate @Activate

34
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedFpmPrefixStore.java
View File

@ -16,45 +16,35 @@
package org.onosproject.dhcprelay.store; package org.onosproject.dhcprelay.store;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.apache.felix.scr.annotations.Property;
import org.onlab.util.KryoNamespace;
import org.onosproject.store.StoreDelegate;
import org.onlab.packet.IpPrefix; import org.onlab.packet.IpPrefix;
import org.onlab.util.KryoNamespace;
import org.onosproject.routing.fpm.api.FpmPrefixStoreEvent;
import org.onosproject.routing.fpm.api.FpmRecord;
import org.onosproject.store.StoreDelegate;
import org.onosproject.store.serializers.KryoNamespaces; import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.EventuallyConsistentMap; import org.onosproject.store.service.EventuallyConsistentMap;
import org.onosproject.store.service.EventuallyConsistentMapEvent; import org.onosproject.store.service.EventuallyConsistentMapEvent;
import org.onosproject.store.service.EventuallyConsistentMapListener; import org.onosproject.store.service.EventuallyConsistentMapListener;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.WallClockTimestamp; import org.onosproject.store.service.WallClockTimestamp;
import org.onosproject.routing.fpm.api.FpmRecord; import org.osgi.service.component.annotations.Activate;
import org.onosproject.routing.fpm.api.FpmPrefixStoreEvent; import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Collection; import java.util.Collection;
import java.util.Optional; import java.util.Optional;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static org.slf4j.LoggerFactory.getLogger; import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Persistent Fpm Prefix Store with Listener. * Persistent Fpm Prefix Store with Listener.
*/ */
@Component(immediate = true) @Component(immediate = true, service = DhcpFpmPrefixStore.class)
@Property(name = "fpm_type", value = "DHCP") //@Property(name = "fpm_type", value = "DHCP")
@Service
public class DistributedFpmPrefixStore implements DhcpFpmPrefixStore { public class DistributedFpmPrefixStore implements DhcpFpmPrefixStore {
private static final KryoNamespace APP_KRYO = KryoNamespace.newBuilder() private static final KryoNamespace APP_KRYO = KryoNamespace.newBuilder()
@ -68,7 +58,7 @@ public class DistributedFpmPrefixStore implements DhcpFpmPrefixStore {
private EventuallyConsistentMap<IpPrefix, FpmRecord> dhcpFpmRecords; private EventuallyConsistentMap<IpPrefix, FpmRecord> dhcpFpmRecords;
private EventuallyConsistentMapListener<IpPrefix, FpmRecord> listener; private EventuallyConsistentMapListener<IpPrefix, FpmRecord> listener;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
@Activate @Activate

12
apps/drivermatrix/src/main/java/org/onosproject/drivermatrix/DriverViewComponent.java
View File

@ -16,11 +16,11 @@
package org.onosproject.drivermatrix; package org.onosproject.drivermatrix;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.ui.UiExtension; import org.onosproject.ui.UiExtension;
import org.onosproject.ui.UiExtensionService; import org.onosproject.ui.UiExtensionService;
import org.onosproject.ui.UiMessageHandlerFactory; import org.onosproject.ui.UiMessageHandlerFactory;
@ -42,7 +42,7 @@ public class DriverViewComponent {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected UiExtensionService uiExtensionService; protected UiExtensionService uiExtensionService;
// List of application views // List of application views

61
apps/events/src/main/java/org/onosproject/events/EventHistoryManager.java
View File

@ -15,22 +15,6 @@
*/ */
package org.onosproject.events; package org.onosproject.events;
import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
import static org.onlab.util.Tools.groupedThreads;
import static org.onlab.util.Tools.minPriority;
import java.util.Deque;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.UnmodifiableDeque; import org.onlab.util.UnmodifiableDeque;
import org.onosproject.cluster.ClusterService; import org.onosproject.cluster.ClusterService;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
@ -47,55 +31,68 @@ import org.onosproject.net.host.HostService;
import org.onosproject.net.intent.IntentService; import org.onosproject.net.intent.IntentService;
import org.onosproject.net.link.LinkService; import org.onosproject.net.link.LinkService;
import org.onosproject.net.topology.TopologyService; import org.onosproject.net.topology.TopologyService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.Deque;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
import static org.onlab.util.Tools.groupedThreads;
import static org.onlab.util.Tools.minPriority;
/** /**
* Application to store history of instance local ONOS Events. * Application to store history of instance local ONOS Events.
*/ */
@Component(immediate = true) @Component(immediate = true, service = EventHistoryManager.class)
@Service
public class EventHistoryManager public class EventHistoryManager
implements EventHistoryService { implements EventHistoryService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MastershipService mastershipService; protected MastershipService mastershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LinkService linkService; protected LinkService linkService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected TopologyService topologyService; protected TopologyService topologyService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hostService; protected HostService hostService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ClusterService clusterService; protected ClusterService clusterService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected EdgePortService edgeService; protected EdgePortService edgeService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected IntentService intentService; protected IntentService intentService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetworkConfigService netcfgService; protected NetworkConfigService netcfgService;
@Property(name = "excludeStatsEvent", boolValue = true, //@Property(name = "excludeStatsEvent", boolValue = true,
label = "Exclude stats related events") // label = "Exclude stats related events")
private boolean excludeStatsEvent = true; private boolean excludeStatsEvent = true;
@Property(name = "sizeLimit", intValue = 10_000, //@Property(name = "sizeLimit", intValue = 10_000,
label = "Number of event history to store") // label = "Number of event history to store")
private int sizeLimit = 10_000; private int sizeLimit = 10_000;
private ApplicationId appId; private ApplicationId appId;

36
apps/evpn-route-service/app/src/main/java/org/onosproject/evpnrouteservice/impl/EvpnRouteManager.java
View File

@ -16,23 +16,6 @@
package org.onosproject.evpnrouteservice.impl; package org.onosproject.evpnrouteservice.impl;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadFactory;
import javax.annotation.concurrent.GuardedBy;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.evpnrouteservice.EvpnInternalRouteEvent; import org.onosproject.evpnrouteservice.EvpnInternalRouteEvent;
import org.onosproject.evpnrouteservice.EvpnRoute; import org.onosproject.evpnrouteservice.EvpnRoute;
import org.onosproject.evpnrouteservice.EvpnRouteAdminService; import org.onosproject.evpnrouteservice.EvpnRouteAdminService;
@ -43,23 +26,36 @@ import org.onosproject.evpnrouteservice.EvpnRouteSet;
import org.onosproject.evpnrouteservice.EvpnRouteStore; import org.onosproject.evpnrouteservice.EvpnRouteStore;
import org.onosproject.evpnrouteservice.EvpnRouteStoreDelegate; import org.onosproject.evpnrouteservice.EvpnRouteStoreDelegate;
import org.onosproject.evpnrouteservice.EvpnRouteTableId; import org.onosproject.evpnrouteservice.EvpnRouteTableId;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.annotation.concurrent.GuardedBy;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadFactory;
import static java.util.concurrent.Executors.newSingleThreadExecutor; import static java.util.concurrent.Executors.newSingleThreadExecutor;
import static org.onlab.util.Tools.groupedThreads; import static org.onlab.util.Tools.groupedThreads;
/** /**
* Implementation of the EVPN route service. * Implementation of the EVPN route service.
*/ */
@Service @Component(service = { EvpnRouteService.class, EvpnRouteAdminService.class })
@Component
public class EvpnRouteManager implements EvpnRouteService, public class EvpnRouteManager implements EvpnRouteService,
EvpnRouteAdminService { EvpnRouteAdminService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected EvpnRouteStore evpnRouteStore; protected EvpnRouteStore evpnRouteStore;
@GuardedBy(value = "this") @GuardedBy(value = "this")

16
apps/evpn-route-service/app/src/main/java/org/onosproject/evpnrouteservice/store/DistributedEvpnRouteStore.java
View File

@ -17,12 +17,6 @@
package org.onosproject.evpnrouteservice.store; package org.onosproject.evpnrouteservice.store;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.IpAddress; import org.onlab.packet.IpAddress;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.onosproject.evpnrouteservice.EvpnInternalRouteEvent; import org.onosproject.evpnrouteservice.EvpnInternalRouteEvent;
@ -38,6 +32,11 @@ import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.SetEvent; import org.onosproject.store.service.SetEvent;
import org.onosproject.store.service.SetEventListener; import org.onosproject.store.service.SetEventListener;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -54,8 +53,7 @@ import static org.onlab.util.Tools.groupedThreads;
/** /**
* Route store based on distributed storage. * Route store based on distributed storage.
*/ */
@Service @Component(service = EvpnRouteStore.class)
@Component
public class DistributedEvpnRouteStore extends public class DistributedEvpnRouteStore extends
AbstractStore<EvpnInternalRouteEvent, AbstractStore<EvpnInternalRouteEvent,
EvpnRouteStoreDelegate> EvpnRouteStoreDelegate>
@ -64,7 +62,7 @@ public class DistributedEvpnRouteStore extends
private static final Logger log = LoggerFactory private static final Logger log = LoggerFactory
.getLogger(DistributedEvpnRouteStore.class); .getLogger(DistributedEvpnRouteStore.class);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
public StorageService storageService; public StorageService storageService;
private static final EvpnRouteTableId EVPN_IPV4 = new EvpnRouteTableId("evpn_ipv4"); private static final EvpnRouteTableId EVPN_IPV4 = new EvpnRouteTableId("evpn_ipv4");

54
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/manager/impl/EvpnManager.java
View File

@ -18,12 +18,6 @@ package org.onosproject.evpnopenflow.manager.impl;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.osgi.DefaultServiceDirectory; import org.onlab.osgi.DefaultServiceDirectory;
import org.onlab.packet.EthType; import org.onlab.packet.EthType;
import org.onlab.packet.IpAddress; import org.onlab.packet.IpAddress;
@ -45,11 +39,6 @@ import org.onosproject.evpnopenflow.rsc.vpninstance.VpnInstanceService;
import org.onosproject.evpnopenflow.rsc.vpnport.VpnPortEvent; import org.onosproject.evpnopenflow.rsc.vpnport.VpnPortEvent;
import org.onosproject.evpnopenflow.rsc.vpnport.VpnPortListener; import org.onosproject.evpnopenflow.rsc.vpnport.VpnPortListener;
import org.onosproject.evpnopenflow.rsc.vpnport.VpnPortService; import org.onosproject.evpnopenflow.rsc.vpnport.VpnPortService;
import org.onosproject.gluon.rsc.GluonConfig;
import org.onosproject.incubator.net.resource.label.LabelResource;
import org.onosproject.incubator.net.resource.label.LabelResourceAdminService;
import org.onosproject.incubator.net.resource.label.LabelResourceId;
import org.onosproject.incubator.net.resource.label.LabelResourceService;
import org.onosproject.evpnrouteservice.EvpnInstanceName; import org.onosproject.evpnrouteservice.EvpnInstanceName;
import org.onosproject.evpnrouteservice.EvpnInstanceNextHop; import org.onosproject.evpnrouteservice.EvpnInstanceNextHop;
import org.onosproject.evpnrouteservice.EvpnInstancePrefix; import org.onosproject.evpnrouteservice.EvpnInstancePrefix;
@ -66,6 +55,11 @@ import org.onosproject.evpnrouteservice.EvpnRouteStore;
import org.onosproject.evpnrouteservice.Label; import org.onosproject.evpnrouteservice.Label;
import org.onosproject.evpnrouteservice.RouteDistinguisher; import org.onosproject.evpnrouteservice.RouteDistinguisher;
import org.onosproject.evpnrouteservice.VpnRouteTarget; import org.onosproject.evpnrouteservice.VpnRouteTarget;
import org.onosproject.gluon.rsc.GluonConfig;
import org.onosproject.incubator.net.resource.label.LabelResource;
import org.onosproject.incubator.net.resource.label.LabelResourceAdminService;
import org.onosproject.incubator.net.resource.label.LabelResourceId;
import org.onosproject.incubator.net.resource.label.LabelResourceService;
import org.onosproject.mastership.MastershipService; import org.onosproject.mastership.MastershipService;
import org.onosproject.net.AnnotationKeys; import org.onosproject.net.AnnotationKeys;
import org.onosproject.net.Device; import org.onosproject.net.Device;
@ -94,6 +88,11 @@ import org.onosproject.net.flowobjective.Objective.Operation;
import org.onosproject.net.host.HostEvent; import org.onosproject.net.host.HostEvent;
import org.onosproject.net.host.HostListener; import org.onosproject.net.host.HostListener;
import org.onosproject.net.host.HostService; import org.onosproject.net.host.HostService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.ArrayList; import java.util.ArrayList;
@ -151,56 +150,55 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Implementation of the EVPN service. * Implementation of the EVPN service.
*/ */
@Component(immediate = true) @Component(immediate = true, service = EvpnService.class)
@Service
public class EvpnManager implements EvpnService { public class EvpnManager implements EvpnService {
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
private static final EthType.EtherType ARP_TYPE = EthType.EtherType.ARP; private static final EthType.EtherType ARP_TYPE = EthType.EtherType.ARP;
protected ApplicationId appId; protected ApplicationId appId;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hostService; protected HostService hostService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected EvpnRouteService evpnRouteService; protected EvpnRouteService evpnRouteService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected EvpnRouteStore evpnRouteStore; protected EvpnRouteStore evpnRouteStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected EvpnRouteAdminService evpnRouteAdminService; protected EvpnRouteAdminService evpnRouteAdminService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MastershipService mastershipService; protected MastershipService mastershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LabelResourceAdminService labelAdminService; protected LabelResourceAdminService labelAdminService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LabelResourceService labelService; protected LabelResourceService labelService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected VpnInstanceService vpnInstanceService; protected VpnInstanceService vpnInstanceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowObjectiveService flowObjectiveService; protected FlowObjectiveService flowObjectiveService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DriverService driverService; protected DriverService driverService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected VpnPortService vpnPortService; protected VpnPortService vpnPortService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected VpnAfConfigService vpnAfConfigService; protected VpnAfConfigService vpnAfConfigService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetworkConfigService configService; protected NetworkConfigService configService;
public Set<EvpnInstanceRoute> evpnInstanceRoutes = new HashSet<>(); public Set<EvpnInstanceRoute> evpnInstanceRoutes = new HashSet<>();

18
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/baseport/impl/BasePortManager.java
View File

@ -18,12 +18,6 @@ package org.onosproject.evpnopenflow.rsc.baseport.impl;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.IpAddress; import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress; import org.onlab.packet.MacAddress;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
@ -55,6 +49,11 @@ import org.onosproject.vtnrsc.TenantId;
import org.onosproject.vtnrsc.TenantNetwork; import org.onosproject.vtnrsc.TenantNetwork;
import org.onosproject.vtnrsc.TenantNetworkId; import org.onosproject.vtnrsc.TenantNetworkId;
import org.onosproject.vtnrsc.TenantRouter; import org.onosproject.vtnrsc.TenantRouter;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -77,8 +76,7 @@ import static org.onosproject.evpnopenflow.rsc.EvpnConstants.RESPONSE_NOT_NULL;
/** /**
* Provides implementation of the BasePort APIs. * Provides implementation of the BasePort APIs.
*/ */
@Component(immediate = true) @Component(immediate = true, service = BasePortService.class)
@Service
public class BasePortManager implements BasePortService { public class BasePortManager implements BasePortService {
private final Set<BasePortListener> listeners = Sets private final Set<BasePortListener> listeners = Sets
@ -105,10 +103,10 @@ public class BasePortManager implements BasePortService {
protected EventuallyConsistentMap<BasePortId, BasePort> vPortStore; protected EventuallyConsistentMap<BasePortId, BasePort> vPortStore;
protected ApplicationId appId; protected ApplicationId appId;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Activate @Activate

18
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/vpnafconfig/impl/VpnAfConfigManager.java
View File

@ -18,12 +18,6 @@ package org.onosproject.evpnopenflow.rsc.vpnafconfig.impl;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.evpnopenflow.rsc.DefaultVpnAfConfig; import org.onosproject.evpnopenflow.rsc.DefaultVpnAfConfig;
@ -36,6 +30,11 @@ import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.EventuallyConsistentMap; import org.onosproject.store.service.EventuallyConsistentMap;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.WallClockTimestamp; import org.onosproject.store.service.WallClockTimestamp;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -75,8 +74,7 @@ import static org.onosproject.evpnopenflow.rsc.EvpnConstants.VRF_RT_VALUE;
/** /**
* Provides implementation of the VPN af config APIs. * Provides implementation of the VPN af config APIs.
*/ */
@Component(immediate = true) @Component(immediate = true, service = VpnAfConfigService.class)
@Service
public class VpnAfConfigManager implements VpnAfConfigService { public class VpnAfConfigManager implements VpnAfConfigService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private final Set<VpnAfConfigListener> listeners = Sets private final Set<VpnAfConfigListener> listeners = Sets
@ -84,10 +82,10 @@ public class VpnAfConfigManager implements VpnAfConfigService {
protected EventuallyConsistentMap<VpnRouteTarget, VpnAfConfig> protected EventuallyConsistentMap<VpnRouteTarget, VpnAfConfig>
vpnAfConfigStore; vpnAfConfigStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Activate @Activate

24
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/vpninstance/impl/VpnInstanceManager.java
View File

@ -18,12 +18,6 @@ package org.onosproject.evpnopenflow.rsc.vpninstance.impl;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
@ -34,13 +28,18 @@ import org.onosproject.evpnopenflow.rsc.VpnInstanceId;
import org.onosproject.evpnopenflow.rsc.vpnafconfig.VpnAfConfigService; import org.onosproject.evpnopenflow.rsc.vpnafconfig.VpnAfConfigService;
import org.onosproject.evpnopenflow.rsc.vpninstance.VpnInstanceService; import org.onosproject.evpnopenflow.rsc.vpninstance.VpnInstanceService;
import org.onosproject.evpnrouteservice.EvpnInstanceName; import org.onosproject.evpnrouteservice.EvpnInstanceName;
import org.onosproject.routeservice.RouteAdminService;
import org.onosproject.evpnrouteservice.RouteDistinguisher; import org.onosproject.evpnrouteservice.RouteDistinguisher;
import org.onosproject.evpnrouteservice.VpnRouteTarget; import org.onosproject.evpnrouteservice.VpnRouteTarget;
import org.onosproject.routeservice.RouteAdminService;
import org.onosproject.store.serializers.KryoNamespaces; import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.EventuallyConsistentMap; import org.onosproject.store.service.EventuallyConsistentMap;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.WallClockTimestamp; import org.onosproject.store.service.WallClockTimestamp;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -80,8 +79,7 @@ import static org.onosproject.evpnopenflow.rsc.EvpnConstants.VPN_INSTANCE_UPDATE
/** /**
* Provides implementation of the VpnInstance APIs. * Provides implementation of the VpnInstance APIs.
*/ */
@Component(immediate = true) @Component(immediate = true, service = VpnInstanceService.class)
@Service
public class VpnInstanceManager implements VpnInstanceService { public class VpnInstanceManager implements VpnInstanceService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@ -89,16 +87,16 @@ public class VpnInstanceManager implements VpnInstanceService {
protected EventuallyConsistentMap<VpnInstanceId, VpnInstance> vpnInstanceStore; protected EventuallyConsistentMap<VpnInstanceId, VpnInstance> vpnInstanceStore;
protected ApplicationId appId; protected ApplicationId appId;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected RouteAdminService routeService; protected RouteAdminService routeService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected VpnAfConfigService vpnAfConfigService; protected VpnAfConfigService vpnAfConfigService;
@Activate @Activate

26
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/vpnport/impl/VpnPortManager.java
View File

@ -18,12 +18,6 @@ package org.onosproject.evpnopenflow.rsc.vpnport.impl;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.IpAddress; import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix; import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress; import org.onlab.packet.MacAddress;
@ -64,6 +58,11 @@ import org.onosproject.vtnrsc.VirtualPortId;
import org.onosproject.vtnrsc.subnet.SubnetService; import org.onosproject.vtnrsc.subnet.SubnetService;
import org.onosproject.vtnrsc.tenantnetwork.TenantNetworkService; import org.onosproject.vtnrsc.tenantnetwork.TenantNetworkService;
import org.onosproject.vtnrsc.virtualport.VirtualPortService; import org.onosproject.vtnrsc.virtualport.VirtualPortService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -100,8 +99,7 @@ import static org.onosproject.evpnopenflow.rsc.EvpnConstants.VPN_PORT_UPDATE_FAI
/** /**
* Provides implementation of the VpnPort service. * Provides implementation of the VpnPort service.
*/ */
@Component(immediate = true) @Component(immediate = true, service = VpnPortService.class)
@Service
public class VpnPortManager implements VpnPortService { public class VpnPortManager implements VpnPortService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@ -111,22 +109,22 @@ public class VpnPortManager implements VpnPortService {
protected EventuallyConsistentMap<VpnPortId, VpnPort> vpnPortStore; protected EventuallyConsistentMap<VpnPortId, VpnPort> vpnPortStore;
protected ApplicationId appId; protected ApplicationId appId;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected BasePortService basePortService; protected BasePortService basePortService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected VirtualPortService virtualPortService; protected VirtualPortService virtualPortService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected TenantNetworkService tenantNetworkService; protected TenantNetworkService tenantNetworkService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected SubnetService subnetService; protected SubnetService subnetService;
@Activate @Activate

12
apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTableComponent.java
View File

@ -16,11 +16,11 @@
package org.onosproject.faultmanagement.alarms.gui; package org.onosproject.faultmanagement.alarms.gui;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.ui.UiExtension; import org.onosproject.ui.UiExtension;
import org.onosproject.ui.UiExtensionService; import org.onosproject.ui.UiExtensionService;
import org.onosproject.ui.UiMessageHandlerFactory; import org.onosproject.ui.UiMessageHandlerFactory;
@ -43,7 +43,7 @@ public class AlarmTableComponent {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected UiExtensionService uiExtensionService; protected UiExtensionService uiExtensionService;
// List of application views // List of application views

12
apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTopovComponent.java
View File

@ -16,11 +16,11 @@
package org.onosproject.faultmanagement.alarms.gui; package org.onosproject.faultmanagement.alarms.gui;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.ui.UiExtension; import org.onosproject.ui.UiExtension;
import org.onosproject.ui.UiExtensionService; import org.onosproject.ui.UiExtensionService;
import org.onosproject.ui.UiMessageHandlerFactory; import org.onosproject.ui.UiMessageHandlerFactory;
@ -43,7 +43,7 @@ public class AlarmTopovComponent {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected UiExtensionService uiExtensionService; protected UiExtensionService uiExtensionService;
// List of application views // List of application views

22
apps/faultmanagement/fmmgr/src/main/java/org/onosproject/faultmanagement/impl/AlarmManager.java
View File

@ -16,13 +16,6 @@
package org.onosproject.faultmanagement.impl; package org.onosproject.faultmanagement.impl;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.ItemNotFoundException; import org.onlab.util.ItemNotFoundException;
import org.onosproject.faultmanagement.api.AlarmStore; import org.onosproject.faultmanagement.api.AlarmStore;
import org.onosproject.faultmanagement.api.AlarmStoreDelegate; import org.onosproject.faultmanagement.api.AlarmStoreDelegate;
@ -44,6 +37,12 @@ import org.onosproject.net.device.DeviceListener;
import org.onosproject.net.device.DeviceService; import org.onosproject.net.device.DeviceService;
import org.onosproject.net.provider.AbstractListenerProviderRegistry; import org.onosproject.net.provider.AbstractListenerProviderRegistry;
import org.onosproject.net.provider.AbstractProviderService; import org.onosproject.net.provider.AbstractProviderService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Collection; import java.util.Collection;
@ -59,21 +58,20 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Implementation of the Alarm service. * Implementation of the Alarm service.
*/ */
@Component(immediate = true) @Component(immediate = true, service = { AlarmService.class, AlarmProviderRegistry.class })
@Service
public class AlarmManager public class AlarmManager
extends AbstractListenerProviderRegistry<AlarmEvent, AlarmListener, AlarmProvider, AlarmProviderService> extends AbstractListenerProviderRegistry<AlarmEvent, AlarmListener, AlarmProvider, AlarmProviderService>
implements AlarmService, AlarmProviderRegistry { implements AlarmService, AlarmProviderRegistry {
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MastershipService mastershipService; protected MastershipService mastershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected AlarmStore store; protected AlarmStore store;
protected AlarmStoreDelegate delegate = this::post; protected AlarmStoreDelegate delegate = this::post;

18
apps/faultmanagement/fmmgr/src/main/java/org/onosproject/faultmanagement/impl/DistributedAlarmStore.java
View File

@ -17,13 +17,6 @@
package org.onosproject.faultmanagement.impl; package org.onosproject.faultmanagement.impl;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.faultmanagement.api.AlarmStore; import org.onosproject.faultmanagement.api.AlarmStore;
import org.onosproject.faultmanagement.api.AlarmStoreDelegate; import org.onosproject.faultmanagement.api.AlarmStoreDelegate;
import org.onosproject.incubator.net.faultmanagement.alarm.Alarm; import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
@ -39,6 +32,12 @@ import org.onosproject.store.service.MapEvent;
import org.onosproject.store.service.MapEventListener; import org.onosproject.store.service.MapEventListener;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Collection; import java.util.Collection;
@ -52,8 +51,7 @@ import static org.slf4j.LoggerFactory.getLogger;
* Manages information of alarms using gossip protocol to distribute * Manages information of alarms using gossip protocol to distribute
* information. * information.
*/ */
@Component(immediate = true) @Component(immediate = true, service = AlarmStore.class)
@Service
public class DistributedAlarmStore public class DistributedAlarmStore
extends AbstractStore<AlarmEvent, AlarmStoreDelegate> extends AbstractStore<AlarmEvent, AlarmStoreDelegate>
implements AlarmStore { implements AlarmStore {
@ -62,7 +60,7 @@ public class DistributedAlarmStore
private ConsistentMap<AlarmId, Alarm> alarms; private ConsistentMap<AlarmId, Alarm> alarms;
private Map<AlarmId, Alarm> alarmsMap; private Map<AlarmId, Alarm> alarmsMap;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
private final MapEventListener<AlarmId, Alarm> listener = new InternalListener(); private final MapEventListener<AlarmId, Alarm> listener = new InternalListener();

29
apps/faultmanagement/fmmgr/src/main/java/org/onosproject/faultmanagement/impl/PollingAlarmProvider.java
View File

@ -15,13 +15,6 @@
*/ */
package org.onosproject.faultmanagement.impl; package org.onosproject.faultmanagement.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onosproject.cfg.ComponentConfigService; import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer; import org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer;
import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProvider; import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProvider;
@ -38,6 +31,12 @@ import org.onosproject.net.device.DeviceService;
import org.onosproject.net.provider.AbstractProvider; import org.onosproject.net.provider.AbstractProvider;
import org.onosproject.net.provider.ProviderId; import org.onosproject.net.provider.ProviderId;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Dictionary; import java.util.Dictionary;
@ -62,16 +61,16 @@ public class PollingAlarmProvider extends AbstractProvider implements AlarmProvi
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MastershipService mastershipService; protected MastershipService mastershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected AlarmProviderRegistry providerRegistry; protected AlarmProviderRegistry providerRegistry;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService cfgService; protected ComponentConfigService cfgService;
protected AlarmProviderService providerService; protected AlarmProviderService providerService;
@ -89,14 +88,14 @@ public class PollingAlarmProvider extends AbstractProvider implements AlarmProvi
private static final int CORE_POOL_SIZE = 10; private static final int CORE_POOL_SIZE = 10;
private static final int DEFAULT_POLL_FREQUENCY_SECONDS = 60; private static final int DEFAULT_POLL_FREQUENCY_SECONDS = 60;
@Property(name = "alarmPollFrequencySeconds", intValue = DEFAULT_POLL_FREQUENCY_SECONDS, //@Property(name = "alarmPollFrequencySeconds", intValue = DEFAULT_POLL_FREQUENCY_SECONDS,
label = "Frequency (in seconds) for polling alarm from devices") // label = "Frequency (in seconds) for polling alarm from devices")
protected int alarmPollFrequencySeconds = DEFAULT_POLL_FREQUENCY_SECONDS; protected int alarmPollFrequencySeconds = DEFAULT_POLL_FREQUENCY_SECONDS;
// TODO implement purging of old alarms. // TODO implement purging of old alarms.
private static final int DEFAULT_CLEAR_FREQUENCY_SECONDS = 500; private static final int DEFAULT_CLEAR_FREQUENCY_SECONDS = 500;
@Property(name = "clearedAlarmPurgeSeconds", intValue = DEFAULT_CLEAR_FREQUENCY_SECONDS, //@Property(name = "clearedAlarmPurgeSeconds", intValue = DEFAULT_CLEAR_FREQUENCY_SECONDS,
label = "Frequency (in seconds) for deleting cleared alarms") // label = "Frequency (in seconds) for deleting cleared alarms")
private int clearedAlarmPurgeFrequencySeconds = DEFAULT_CLEAR_FREQUENCY_SECONDS; private int clearedAlarmPurgeFrequencySeconds = DEFAULT_CLEAR_FREQUENCY_SECONDS;
public PollingAlarmProvider() { public PollingAlarmProvider() {

12
apps/faultmanagement/fmweb/src/main/java/org/onosproject/faultmanagement/web/AlarmCodecRegistrator.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.faultmanagement.web; package org.onosproject.faultmanagement.web;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.codec.CodecService; import org.onosproject.codec.CodecService;
import org.onosproject.incubator.net.faultmanagement.alarm.Alarm; import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
@ -34,7 +34,7 @@ public class AlarmCodecRegistrator {
private static final Logger log = LoggerFactory.getLogger(AlarmCodecRegistrator.class); private static final Logger log = LoggerFactory.getLogger(AlarmCodecRegistrator.class);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CodecService codecService; protected CodecService codecService;
@Activate @Activate

32
apps/flowanalyzer/src/main/java/org/onosproject/flowanalyzer/FlowAnalyzer.java
View File

@ -15,34 +15,33 @@
*/ */
package org.onosproject.flowanalyzer; package org.onosproject.flowanalyzer;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.net.ConnectPoint; import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.HostId;
import org.onosproject.net.Link;
import org.onosproject.net.PortNumber; import org.onosproject.net.PortNumber;
import org.onosproject.net.flow.FlowEntry; import org.onosproject.net.flow.FlowEntry;
import org.onosproject.net.flow.FlowRuleService; import org.onosproject.net.flow.FlowRuleService;
import org.onosproject.net.DeviceId;
import org.onosproject.net.HostId;
import org.onosproject.net.flow.criteria.Criteria; import org.onosproject.net.flow.criteria.Criteria;
import org.onosproject.net.flow.criteria.Criterion; import org.onosproject.net.flow.criteria.Criterion;
import org.onosproject.net.flow.criteria.PortCriterion; import org.onosproject.net.flow.criteria.PortCriterion;
import org.onosproject.net.flow.instructions.Instruction; import org.onosproject.net.flow.instructions.Instruction;
import org.onosproject.net.flow.instructions.Instructions; import org.onosproject.net.flow.instructions.Instructions;
import org.onosproject.net.topology.TopologyService;
import org.onosproject.net.topology.TopologyGraph;
import org.onosproject.net.link.LinkService; import org.onosproject.net.link.LinkService;
import org.onosproject.net.Link; import org.onosproject.net.topology.TopologyGraph;
import org.onosproject.net.topology.TopologyService;
import org.onosproject.net.topology.TopologyVertex; import org.onosproject.net.topology.TopologyVertex;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -51,19 +50,18 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Simple flow space analyzer app. * Simple flow space analyzer app.
*/ */
@Component(immediate = true) @Component(immediate = true, service = FlowAnalyzer.class)
@Service(value = FlowAnalyzer.class)
public class FlowAnalyzer { public class FlowAnalyzer {
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowRuleService flowRuleService; protected FlowRuleService flowRuleService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected TopologyService topologyService; protected TopologyService topologyService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LinkService linkService; protected LinkService linkService;
@Activate @Activate

101
apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
View File

@ -16,14 +16,6 @@
package org.onosproject.fwd; package org.onosproject.fwd;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.Ethernet; import org.onlab.packet.Ethernet;
import org.onlab.packet.ICMP; import org.onlab.packet.ICMP;
import org.onlab.packet.ICMP6; import org.onlab.packet.ICMP6;
@ -79,6 +71,12 @@ import org.onosproject.store.service.MultiValuedTimestamp;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.WallClockTimestamp; import org.onosproject.store.service.WallClockTimestamp;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Dictionary; import java.util.Dictionary;
@ -96,8 +94,7 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Sample reactive forwarding application. * Sample reactive forwarding application.
*/ */
@Component(immediate = true) @Component(immediate = true, service = ReactiveForwarding.class)
@Service(value = ReactiveForwarding.class)
public class ReactiveForwarding { public class ReactiveForwarding {
private static final int DEFAULT_TIMEOUT = 10; private static final int DEFAULT_TIMEOUT = 10;
@ -105,28 +102,28 @@ public class ReactiveForwarding {
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected TopologyService topologyService; protected TopologyService topologyService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected PacketService packetService; protected PacketService packetService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hostService; protected HostService hostService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowRuleService flowRuleService; protected FlowRuleService flowRuleService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowObjectiveService flowObjectiveService; protected FlowObjectiveService flowObjectiveService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService cfgService; protected ComponentConfigService cfgService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
private ReactivePacketProcessor processor = new ReactivePacketProcessor(); private ReactivePacketProcessor processor = new ReactivePacketProcessor();
@ -135,69 +132,69 @@ public class ReactiveForwarding {
private ApplicationId appId; private ApplicationId appId;
@Property(name = "packetOutOnly", boolValue = false, //@Property(name = "packetOutOnly", boolValue = false,
label = "Enable packet-out only forwarding; default is false") // label = "Enable packet-out only forwarding; default is false")
private boolean packetOutOnly = false; private boolean packetOutOnly = false;
@Property(name = "packetOutOfppTable", boolValue = false, //@Property(name = "packetOutOfppTable", boolValue = false,
label = "Enable first packet forwarding using OFPP_TABLE port " + // label = "Enable first packet forwarding using OFPP_TABLE port " +
"instead of PacketOut with actual port; default is false") // "instead of PacketOut with actual port; default is false")
private boolean packetOutOfppTable = false; private boolean packetOutOfppTable = false;
@Property(name = "flowTimeout", intValue = DEFAULT_TIMEOUT, //@Property(name = "flowTimeout", intValue = DEFAULT_TIMEOUT,
label = "Configure Flow Timeout for installed flow rules; " + // label = "Configure Flow Timeout for installed flow rules; " +
"default is 10 sec") // "default is 10 sec")
private int flowTimeout = DEFAULT_TIMEOUT; private int flowTimeout = DEFAULT_TIMEOUT;
@Property(name = "flowPriority", intValue = DEFAULT_PRIORITY, //@Property(name = "flowPriority", intValue = DEFAULT_PRIORITY,
label = "Configure Flow Priority for installed flow rules; " + // label = "Configure Flow Priority for installed flow rules; " +
"default is 10") // "default is 10")
private int flowPriority = DEFAULT_PRIORITY; private int flowPriority = DEFAULT_PRIORITY;
@Property(name = "ipv6Forwarding", boolValue = false, //@Property(name = "ipv6Forwarding", boolValue = false,
label = "Enable IPv6 forwarding; default is false") // label = "Enable IPv6 forwarding; default is false")
private boolean ipv6Forwarding = false; private boolean ipv6Forwarding = false;
@Property(name = "matchDstMacOnly", boolValue = false, //@Property(name = "matchDstMacOnly", boolValue = false,
label = "Enable matching Dst Mac Only; default is false") // label = "Enable matching Dst Mac Only; default is false")
private boolean matchDstMacOnly = false; private boolean matchDstMacOnly = false;
@Property(name = "matchVlanId", boolValue = false, //@Property(name = "matchVlanId", boolValue = false,
label = "Enable matching Vlan ID; default is false") // label = "Enable matching Vlan ID; default is false")
private boolean matchVlanId = false; private boolean matchVlanId = false;
@Property(name = "matchIpv4Address", boolValue = false, //@Property(name = "matchIpv4Address", boolValue = false,
label = "Enable matching IPv4 Addresses; default is false") // label = "Enable matching IPv4 Addresses; default is false")
private boolean matchIpv4Address = false; private boolean matchIpv4Address = false;
@Property(name = "matchIpv4Dscp", boolValue = false, //@Property(name = "matchIpv4Dscp", boolValue = false,
label = "Enable matching IPv4 DSCP and ECN; default is false") // label = "Enable matching IPv4 DSCP and ECN; default is false")
private boolean matchIpv4Dscp = false; private boolean matchIpv4Dscp = false;
@Property(name = "matchIpv6Address", boolValue = false, //@Property(name = "matchIpv6Address", boolValue = false,
label = "Enable matching IPv6 Addresses; default is false") // label = "Enable matching IPv6 Addresses; default is false")
private boolean matchIpv6Address = false; private boolean matchIpv6Address = false;
@Property(name = "matchIpv6FlowLabel", boolValue = false, //@Property(name = "matchIpv6FlowLabel", boolValue = false,
label = "Enable matching IPv6 FlowLabel; default is false") // label = "Enable matching IPv6 FlowLabel; default is false")
private boolean matchIpv6FlowLabel = false; private boolean matchIpv6FlowLabel = false;
@Property(name = "matchTcpUdpPorts", boolValue = false, //@Property(name = "matchTcpUdpPorts", boolValue = false,
label = "Enable matching TCP/UDP ports; default is false") // label = "Enable matching TCP/UDP ports; default is false")
private boolean matchTcpUdpPorts = false; private boolean matchTcpUdpPorts = false;
@Property(name = "matchIcmpFields", boolValue = false, //@Property(name = "matchIcmpFields", boolValue = false,
label = "Enable matching ICMPv4 and ICMPv6 fields; " + // label = "Enable matching ICMPv4 and ICMPv6 fields; " +
"default is false") // "default is false")
private boolean matchIcmpFields = false; private boolean matchIcmpFields = false;
@Property(name = "ignoreIPv4Multicast", boolValue = false, //@Property(name = "ignoreIPv4Multicast", boolValue = false,
label = "Ignore (do not forward) IPv4 multicast packets; default is false") // label = "Ignore (do not forward) IPv4 multicast packets; default is false")
private boolean ignoreIpv4McastPackets = false; private boolean ignoreIpv4McastPackets = false;
@Property(name = "recordMetrics", boolValue = false, //@Property(name = "recordMetrics", boolValue = false,
label = "Enable record metrics for reactive forwarding") // label = "Enable record metrics for reactive forwarding")
private boolean recordMetrics = false; private boolean recordMetrics = false;
private final TopologyListener topologyListener = new InternalTopologyListener(); private final TopologyListener topologyListener = new InternalTopologyListener();

39
apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/DefaultGangliaMetricsReporter.java
View File

@ -19,18 +19,17 @@ import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.ganglia.GangliaReporter; import com.codahale.metrics.ganglia.GangliaReporter;
import info.ganglia.gmetric4j.gmetric.GMetric; import info.ganglia.gmetric4j.gmetric.GMetric;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onlab.metrics.MetricsService; import org.onlab.metrics.MetricsService;
import org.onlab.util.Tools; import org.onlab.util.Tools;
import org.onosproject.cfg.ComponentConfigService; import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.io.IOException; import java.io.IOException;
@ -57,33 +56,33 @@ public class DefaultGangliaMetricsReporter implements GangliaMetricsReporter {
private static final int DEFAULT_TTL = 1; private static final int DEFAULT_TTL = 1;
private static final String DEFAULT_METRIC_NAMES = "default"; private static final String DEFAULT_METRIC_NAMES = "default";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MetricsService metricsService; protected MetricsService metricsService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService cfgService; protected ComponentConfigService cfgService;
@Property(name = "monitorAll", boolValue = true, //@Property(name = "monitorAll", boolValue = true,
label = "Enable to monitor all of metrics stored in metric registry default is true") // label = "Enable to monitor all of metrics stored in metric registry default is true")
protected boolean monitorAll = true; protected boolean monitorAll = true;
@Property(name = "metricNames", value = DEFAULT_METRIC_NAMES, //@Property(name = "metricNames", value = DEFAULT_METRIC_NAMES,
label = "Names of metric to be monitored; default metric names are 'default'") // label = "Names of metric to be monitored; default metric names are 'default'")
protected String metricNames = DEFAULT_METRIC_NAMES; protected String metricNames = DEFAULT_METRIC_NAMES;
@Property(name = "address", value = DEFAULT_ADDRESS, //@Property(name = "address", value = DEFAULT_ADDRESS,
label = "IP address of ganglia monitoring server; default is localhost") // label = "IP address of ganglia monitoring server; default is localhost")
protected String address = DEFAULT_ADDRESS; protected String address = DEFAULT_ADDRESS;
@Property(name = "port", intValue = DEFAULT_PORT, //@Property(name = "port", intValue = DEFAULT_PORT,
label = "Port number of ganglia monitoring server; default is 8649") // label = "Port number of ganglia monitoring server; default is 8649")
protected int port = DEFAULT_PORT; protected int port = DEFAULT_PORT;
@Property(name = "ttl", intValue = DEFAULT_TTL, //@Property(name = "ttl", intValue = DEFAULT_TTL,
label = "TTL value of ganglia monitoring server; default is 1") // label = "TTL value of ganglia monitoring server; default is 1")
protected int ttl = DEFAULT_TTL; protected int ttl = DEFAULT_TTL;
private GMetric ganglia; private GMetric ganglia;

14
apps/gluon/src/main/java/org/onosproject/gluon/manager/GluonManager.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.gluon.manager; package org.onosproject.gluon.manager;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.gluon.rsc.GluonConfig; import org.onosproject.gluon.rsc.GluonConfig;
import org.onosproject.gluon.rsc.GluonServer; import org.onosproject.gluon.rsc.GluonServer;
@ -41,10 +41,10 @@ public class GluonManager {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private static final String APP_ID = "org.onosproject.gluon"; private static final String APP_ID = "org.onosproject.gluon";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetworkConfigRegistry configRegistry; protected NetworkConfigRegistry configRegistry;

43
apps/graphitemetrics/src/main/java/org/onosproject/graphitemetrics/DefaultGraphiteMetricsReporter.java
View File

@ -20,18 +20,17 @@ import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.graphite.Graphite; import com.codahale.metrics.graphite.Graphite;
import com.codahale.metrics.graphite.GraphiteReporter; import com.codahale.metrics.graphite.GraphiteReporter;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onlab.metrics.MetricsService; import org.onlab.metrics.MetricsService;
import org.onlab.util.Tools; import org.onlab.util.Tools;
import org.onosproject.cfg.ComponentConfigService; import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
@ -57,37 +56,37 @@ public class DefaultGraphiteMetricsReporter implements GraphiteMetricsReporter {
private static final String DEFAULT_METRIC_NAME_PREFIX = "onos"; private static final String DEFAULT_METRIC_NAME_PREFIX = "onos";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MetricsService metricsService; protected MetricsService metricsService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService cfgService; protected ComponentConfigService cfgService;
@Property(name = "monitorAll", boolValue = true, //@Property(name = "monitorAll", boolValue = true,
label = "Enable to monitor all of metrics stored in metric registry default is true") // label = "Enable to monitor all of metrics stored in metric registry default is true")
protected boolean monitorAll = true; protected boolean monitorAll = true;
@Property(name = "metricNames", value = DEFAULT_METRIC_NAMES, //@Property(name = "metricNames", value = DEFAULT_METRIC_NAMES,
label = "Names of metric to be monitored; default metric names are 'default'") // label = "Names of metric to be monitored; default metric names are 'default'")
protected String metricNames = DEFAULT_METRIC_NAMES; protected String metricNames = DEFAULT_METRIC_NAMES;
@Property(name = "address", value = DEFAULT_ADDRESS, //@Property(name = "address", value = DEFAULT_ADDRESS,
label = "IP address of graphite monitoring server; default is localhost") // label = "IP address of graphite monitoring server; default is localhost")
protected String address = DEFAULT_ADDRESS; protected String address = DEFAULT_ADDRESS;
@Property(name = "port", intValue = DEFAULT_PORT, //@Property(name = "port", intValue = DEFAULT_PORT,
label = "Port number of graphite monitoring server; default is 2003") // label = "Port number of graphite monitoring server; default is 2003")
protected int port = DEFAULT_PORT; protected int port = DEFAULT_PORT;
@Property(name = "reportPeriod", intValue = DEFAULT_REPORT_PERIOD, //@Property(name = "reportPeriod", intValue = DEFAULT_REPORT_PERIOD,
label = "Reporting period of graphite monitoring server; default is 1") // label = "Reporting period of graphite monitoring server; default is 1")
protected int reportPeriod = DEFAULT_REPORT_PERIOD; protected int reportPeriod = DEFAULT_REPORT_PERIOD;
@Property(name = "metricNamePrefix", value = DEFAULT_METRIC_NAME_PREFIX, //@Property(name = "metricNamePrefix", value = DEFAULT_METRIC_NAME_PREFIX,
label = "Prefix of metric name for graphite back-end server; default is 'onos'") // label = "Prefix of metric name for graphite back-end server; default is 'onos'")
protected String metricNamePrefix = DEFAULT_METRIC_NAME_PREFIX; protected String metricNamePrefix = DEFAULT_METRIC_NAME_PREFIX;
private Graphite graphite; private Graphite graphite;

26
apps/imr/app/src/main/java/org/onosproject/imr/IntentMonitorAndRerouteManager.java
View File

@ -18,12 +18,6 @@ package org.onosproject.imr;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.imr.data.Path; import org.onosproject.imr.data.Path;
@ -61,6 +55,11 @@ import org.onosproject.store.service.ConsistentMap;
import org.onosproject.store.service.DistributedSet; import org.onosproject.store.service.DistributedSet;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -82,8 +81,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Manager of Intent Monitor and Reroute. * Manager of Intent Monitor and Reroute.
*/ */
@Component(immediate = true) @Component(immediate = true, service = IntentMonitorAndRerouteService.class)
@Service
public class IntentMonitorAndRerouteManager implements IntentMonitorAndRerouteService { public class IntentMonitorAndRerouteManager implements IntentMonitorAndRerouteService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@ -93,22 +91,22 @@ public class IntentMonitorAndRerouteManager implements IntentMonitorAndRerouteSe
private DistributedSet<Key> toBeMonitoredIntents; private DistributedSet<Key> toBeMonitoredIntents;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected IntentService intentService; protected IntentService intentService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowRuleService flowRuleService; protected FlowRuleService flowRuleService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LinkService linkService; protected LinkService linkService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hostService; protected HostService hostService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowStatisticStore statsStore; protected FlowStatisticStore statsStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
private InternalIntentListener intentListener = new InternalIntentListener(); private InternalIntentListener intentListener = new InternalIntentListener();

16
apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/IntControl.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.inbandtelemetry.app; package org.onosproject.inbandtelemetry.app;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.inbandtelemetry.api.IntService; import org.onosproject.inbandtelemetry.api.IntService;
import org.onosproject.net.host.HostService; import org.onosproject.net.host.HostService;
@ -33,13 +33,13 @@ public class IntControl {
// private static final int collectorPort = 1234; // private static final int collectorPort = 1234;
// private static final IpAddress collectorIp = IpAddress.valueOf("10.0.0.3"); // private static final IpAddress collectorIp = IpAddress.valueOf("10.0.0.3");
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected IntService intService; protected IntService intService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hostService; protected HostService hostService;
@Activate @Activate

12
apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/ui/IntAppUiComponent.java
View File

@ -16,11 +16,11 @@
package org.onosproject.inbandtelemetry.app.ui; package org.onosproject.inbandtelemetry.app.ui;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.ui.UiExtension; import org.onosproject.ui.UiExtension;
import org.onosproject.ui.UiExtensionService; import org.onosproject.ui.UiExtensionService;
import org.onosproject.ui.UiMessageHandlerFactory; import org.onosproject.ui.UiMessageHandlerFactory;
@ -41,7 +41,7 @@ public class IntAppUiComponent {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected UiExtensionService uiExtensionService; protected UiExtensionService uiExtensionService;
// List of application views // List of application views

24
apps/inbandtelemetry/impl/src/main/java/org/onosproject/inbandtelemetry/impl/IntManager.java
View File

@ -15,12 +15,6 @@
*/ */
package org.onosproject.inbandtelemetry.impl; package org.onosproject.inbandtelemetry.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
@ -42,6 +36,11 @@ import org.onosproject.store.service.AtomicIdGenerator;
import org.onosproject.store.service.ConsistentMap; import org.onosproject.store.service.ConsistentMap;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Map; import java.util.Map;
@ -53,8 +52,7 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Implementation of IntService, for controlling INT-capable pipelines. * Implementation of IntService, for controlling INT-capable pipelines.
*/ */
@Component(immediate = true) @Component(immediate = true, service = IntService.class)
@Service
public class IntManager implements IntService { public class IntManager implements IntService {
private final String appName = "org.onosproject.inbandtelemetry"; private final String appName = "org.onosproject.inbandtelemetry";
private ApplicationId appId; private ApplicationId appId;
@ -66,19 +64,19 @@ public class IntManager implements IntService {
private InternalHostListener hostListener = new InternalHostListener(); private InternalHostListener hostListener = new InternalHostListener();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private CoreService coreService; private CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private DeviceService deviceService; private DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private StorageService storageService; private StorageService storageService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private HostService hostService; private HostService hostService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private FlowRuleService flowRuleService; private FlowRuleService flowRuleService;
@Activate @Activate

37
apps/influxdbmetrics/src/main/java/org/onosproject/influxdbmetrics/DefaultInfluxDbMetricsReporter.java
View File

@ -19,14 +19,6 @@ import com.codahale.metrics.MetricRegistry;
import com.izettle.metrics.influxdb.InfluxDbHttpSender; import com.izettle.metrics.influxdb.InfluxDbHttpSender;
import com.izettle.metrics.influxdb.InfluxDbReporter; import com.izettle.metrics.influxdb.InfluxDbReporter;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.metrics.MetricsService; import org.onlab.metrics.MetricsService;
import org.onlab.util.Tools; import org.onlab.util.Tools;
import org.onosproject.cfg.ComponentConfigService; import org.onosproject.cfg.ComponentConfigService;
@ -34,6 +26,12 @@ import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.ControllerNode; import org.onosproject.cluster.ControllerNode;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Dictionary; import java.util.Dictionary;
@ -44,8 +42,7 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* A Metric reporter that reports all metrics value to influxDB server. * A Metric reporter that reports all metrics value to influxDB server.
*/ */
@Component(immediate = true) @Component(immediate = true, service = InfluxDbMetricsReporter.class)
@Service
public class DefaultInfluxDbMetricsReporter implements InfluxDbMetricsReporter { public class DefaultInfluxDbMetricsReporter implements InfluxDbMetricsReporter {
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
@ -58,26 +55,26 @@ public class DefaultInfluxDbMetricsReporter implements InfluxDbMetricsReporter {
private static final int DEFAULT_CONN_TIMEOUT = 1000; private static final int DEFAULT_CONN_TIMEOUT = 1000;
private static final int DEFAULT_READ_TIMEOUT = 1000; private static final int DEFAULT_READ_TIMEOUT = 1000;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MetricsService metricsService; protected MetricsService metricsService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService cfgService; protected ComponentConfigService cfgService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ClusterService clusterService; protected ClusterService clusterService;
@Property(name = "monitorAll", boolValue = true, //@Property(name = "monitorAll", boolValue = true,
label = "Enable to monitor all of metrics stored in metric registry " + // label = "Enable to monitor all of metrics stored in metric registry " +
"default is true") // "default is true")
protected boolean monitorAll = true; protected boolean monitorAll = true;
@Property(name = "metricNames", value = DEFAULT_METRIC_NAMES, //@Property(name = "metricNames", value = DEFAULT_METRIC_NAMES,
label = "Names of metric to be monitored in third party monitoring " + // label = "Names of metric to be monitored in third party monitoring " +
"server; default metric names are 'default'") // "server; default metric names are 'default'")
protected String metricNames = DEFAULT_METRIC_NAMES; protected String metricNames = DEFAULT_METRIC_NAMES;
protected String address; protected String address;

16
apps/influxdbmetrics/src/main/java/org/onosproject/influxdbmetrics/DefaultInfluxDbMetricsRetriever.java
View File

@ -21,18 +21,17 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.influxdb.InfluxDB; import org.influxdb.InfluxDB;
import org.influxdb.InfluxDBFactory; import org.influxdb.InfluxDBFactory;
import org.influxdb.dto.Query; import org.influxdb.dto.Query;
import org.influxdb.dto.QueryResult; import org.influxdb.dto.QueryResult;
import org.onosproject.cluster.NodeId; import org.onosproject.cluster.NodeId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.List; import java.util.List;
@ -45,8 +44,7 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* A Metric retriever implementation for querying metrics from influxDB server. * A Metric retriever implementation for querying metrics from influxDB server.
*/ */
@Component(immediate = true) @Component(immediate = true, service = InfluxDbMetricsRetriever.class)
@Service
public class DefaultInfluxDbMetricsRetriever implements InfluxDbMetricsRetriever { public class DefaultInfluxDbMetricsRetriever implements InfluxDbMetricsRetriever {
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
@ -72,7 +70,7 @@ public class DefaultInfluxDbMetricsRetriever implements InfluxDbMetricsRetriever
TIME_UNIT_MAP.put(TimeUnit.SECONDS, "s"); TIME_UNIT_MAP.put(TimeUnit.SECONDS, "s");
} }
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
protected String database; protected String database;

41
apps/influxdbmetrics/src/main/java/org/onosproject/influxdbmetrics/InfluxDbMetricsConfig.java
View File

@ -15,17 +15,16 @@
*/ */
package org.onosproject.influxdbmetrics; package org.onosproject.influxdbmetrics;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onlab.util.Tools; import org.onlab.util.Tools;
import org.onosproject.cfg.ComponentConfigService; import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Dictionary; import java.util.Dictionary;
@ -47,36 +46,36 @@ public class InfluxDbMetricsConfig {
private static final String DEFAULT_USERNAME = "onos"; private static final String DEFAULT_USERNAME = "onos";
private static final String DEFAULT_PASSWORD = "onos.password"; private static final String DEFAULT_PASSWORD = "onos.password";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected InfluxDbMetricsReporter influxDbMetricsReporter; protected InfluxDbMetricsReporter influxDbMetricsReporter;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected InfluxDbMetricsRetriever influxDbMetricsRetriever; protected InfluxDbMetricsRetriever influxDbMetricsRetriever;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService cfgService; protected ComponentConfigService cfgService;
@Property(name = "address", value = DEFAULT_ADDRESS, //@Property(name = "address", value = DEFAULT_ADDRESS,
label = "IP address of influxDB server; default is localhost") // label = "IP address of influxDB server; default is localhost")
protected String address = DEFAULT_ADDRESS; protected String address = DEFAULT_ADDRESS;
@Property(name = "port", intValue = DEFAULT_PORT, //@Property(name = "port", intValue = DEFAULT_PORT,
label = "Port number of influxDB server; default is 8086") // label = "Port number of influxDB server; default is 8086")
protected int port = DEFAULT_PORT; protected int port = DEFAULT_PORT;
@Property(name = "database", value = DEFAULT_DATABASE, //@Property(name = "database", value = DEFAULT_DATABASE,
label = "Database name of influxDB server; default is onos") // label = "Database name of influxDB server; default is onos")
protected String database = DEFAULT_DATABASE; protected String database = DEFAULT_DATABASE;
@Property(name = "username", value = DEFAULT_USERNAME, //@Property(name = "username", value = DEFAULT_USERNAME,
label = "Username of influxDB server; default is onos") // label = "Username of influxDB server; default is onos")
protected String username = DEFAULT_USERNAME; protected String username = DEFAULT_USERNAME;
@Property(name = "password", value = DEFAULT_PASSWORD, //@Property(name = "password", value = DEFAULT_PASSWORD,
label = "Password of influxDB server; default is onos.password") // label = "Password of influxDB server; default is onos.password")
protected String password = DEFAULT_PASSWORD; protected String password = DEFAULT_PASSWORD;
@Activate @Activate

23
apps/intentsync/src/main/java/org/onosproject/intentsync/IntentSynchronizer.java
View File

@ -16,12 +16,6 @@
package org.onosproject.intentsync; package org.onosproject.intentsync;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.cluster.ClusterService; import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.LeadershipEvent; import org.onosproject.cluster.LeadershipEvent;
import org.onosproject.cluster.LeadershipEventListener; import org.onosproject.cluster.LeadershipEventListener;
@ -34,6 +28,11 @@ import org.onosproject.net.intent.IntentService;
import org.onosproject.net.intent.IntentState; import org.onosproject.net.intent.IntentState;
import org.onosproject.net.intent.IntentUtils; import org.onosproject.net.intent.IntentUtils;
import org.onosproject.net.intent.Key; import org.onosproject.net.intent.Key;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -51,8 +50,8 @@ import static org.onlab.util.Tools.groupedThreads;
/** /**
* Synchronizes intents between an in-memory intent store and the IntentService. * Synchronizes intents between an in-memory intent store and the IntentService.
*/ */
@Service @Component(immediate = true, service = { IntentSynchronizationService.class,
@Component(immediate = true) IntentSynchronizationAdminService.class })
public class IntentSynchronizer implements IntentSynchronizationService, public class IntentSynchronizer implements IntentSynchronizationService,
IntentSynchronizationAdminService { IntentSynchronizationAdminService {
@ -60,16 +59,16 @@ public class IntentSynchronizer implements IntentSynchronizationService,
private static final String APP_NAME = "org.onosproject.intentsynchronizer"; private static final String APP_NAME = "org.onosproject.intentsynchronizer";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LeadershipService leadershipService; protected LeadershipService leadershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ClusterService clusterService; protected ClusterService clusterService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected IntentService intentService; protected IntentService intentService;
private NodeId localNodeId; private NodeId localNodeId;

10
apps/kafka-integration/app/src/main/java/org/onosproject/kafkaintegration/impl/EventConversionManager.java
View File

@ -16,10 +16,9 @@
package org.onosproject.kafkaintegration.impl; package org.onosproject.kafkaintegration.impl;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.event.Event; import org.onosproject.event.Event;
import org.onosproject.kafkaintegration.api.EventConversionService; import org.onosproject.kafkaintegration.api.EventConversionService;
import org.onosproject.kafkaintegration.api.dto.OnosEvent; import org.onosproject.kafkaintegration.api.dto.OnosEvent;
@ -38,8 +37,7 @@ import static org.onosproject.kafkaintegration.api.dto.OnosEvent.Type.LINK;
* Implementation of Event Conversion Service. * Implementation of Event Conversion Service.
* *
*/ */
@Component(immediate = true) @Component(immediate = true, service = EventConversionService.class)
@Service
public class EventConversionManager implements EventConversionService { public class EventConversionManager implements EventConversionService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());

37
apps/kafka-integration/app/src/main/java/org/onosproject/kafkaintegration/impl/EventSubscriptionManager.java
View File

@ -15,19 +15,7 @@
*/ */
package org.onosproject.kafkaintegration.impl; package org.onosproject.kafkaintegration.impl;
import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.collect.ImmutableList;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.kafkaintegration.api.EventSubscriptionService; import org.onosproject.kafkaintegration.api.EventSubscriptionService;
@ -35,25 +23,34 @@ import org.onosproject.kafkaintegration.api.KafkaConfigService;
import org.onosproject.kafkaintegration.api.dto.DefaultEventSubscriber; import org.onosproject.kafkaintegration.api.dto.DefaultEventSubscriber;
import org.onosproject.kafkaintegration.api.dto.EventSubscriber; import org.onosproject.kafkaintegration.api.dto.EventSubscriber;
import org.onosproject.kafkaintegration.api.dto.EventSubscriberGroupId; import org.onosproject.kafkaintegration.api.dto.EventSubscriberGroupId;
import org.onosproject.kafkaintegration.api.dto.RegistrationResponse;
import org.onosproject.kafkaintegration.api.dto.OnosEvent; import org.onosproject.kafkaintegration.api.dto.OnosEvent;
import org.onosproject.kafkaintegration.api.dto.OnosEvent.Type; import org.onosproject.kafkaintegration.api.dto.OnosEvent.Type;
import org.onosproject.kafkaintegration.api.dto.RegistrationResponse;
import org.onosproject.kafkaintegration.errors.InvalidApplicationException; import org.onosproject.kafkaintegration.errors.InvalidApplicationException;
import org.onosproject.kafkaintegration.errors.InvalidGroupIdException; import org.onosproject.kafkaintegration.errors.InvalidGroupIdException;
import org.onosproject.store.serializers.KryoNamespaces; import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList; import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Implementation of Event Subscription Manager. * Implementation of Event Subscription Manager.
* *
*/ */
@Component(immediate = true) @Component(immediate = true, service = EventSubscriptionService.class)
@Service
public class EventSubscriptionManager implements EventSubscriptionService { public class EventSubscriptionManager implements EventSubscriptionService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@ -67,13 +64,13 @@ public class EventSubscriptionManager implements EventSubscriptionService {
private static final String SUBSCRIBED_APPS = "event-subscriptions"; private static final String SUBSCRIBED_APPS = "event-subscriptions";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected KafkaConfigService kafkaConfigService; protected KafkaConfigService kafkaConfigService;
private ApplicationId appId; private ApplicationId appId;

12
apps/kafka-integration/app/src/main/java/org/onosproject/kafkaintegration/impl/KafkaCodecRegistrator.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.kafkaintegration.impl; package org.onosproject.kafkaintegration.impl;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.codec.CodecService; import org.onosproject.codec.CodecService;
import org.onosproject.kafkaintegration.api.dto.EventSubscriber; import org.onosproject.kafkaintegration.api.dto.EventSubscriber;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
public class KafkaCodecRegistrator { public class KafkaCodecRegistrator {
private static Logger log = LoggerFactory.getLogger(KafkaCodecRegistrator private static Logger log = LoggerFactory.getLogger(KafkaCodecRegistrator
.class); .class);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CodecService codecService; protected CodecService codecService;
@Activate @Activate

16
apps/kafka-integration/app/src/main/java/org/onosproject/kafkaintegration/impl/KafkaStorageManager.java
View File

@ -15,12 +15,6 @@
*/ */
package org.onosproject.kafkaintegration.impl; package org.onosproject.kafkaintegration.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onosproject.kafkaintegration.api.KafkaEventStorageService; import org.onosproject.kafkaintegration.api.KafkaEventStorageService;
import org.onosproject.kafkaintegration.api.dto.OnosEvent; import org.onosproject.kafkaintegration.api.dto.OnosEvent;
import org.onosproject.store.serializers.KryoNamespaces; import org.onosproject.store.serializers.KryoNamespaces;
@ -28,17 +22,21 @@ import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.Task; import org.onosproject.store.service.Task;
import org.onosproject.store.service.WorkQueue; import org.onosproject.store.service.WorkQueue;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@Component(immediate = false) @Component(service = KafkaEventStorageService.class)
@Service
public class KafkaStorageManager implements KafkaEventStorageService { public class KafkaStorageManager implements KafkaEventStorageService {
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());

24
apps/kafka-integration/app/src/main/java/org/onosproject/kafkaintegration/kafka/EventListener.java
View File

@ -16,13 +16,13 @@
package org.onosproject.kafkaintegration.kafka; package org.onosproject.kafkaintegration.kafka;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.onosproject.cluster.ClusterService; import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.NodeId; import org.onosproject.cluster.NodeId;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.cluster.LeadershipService; import org.onosproject.cluster.LeadershipService;
import org.onosproject.kafkaintegration.api.EventConversionService; import org.onosproject.kafkaintegration.api.EventConversionService;
import org.onosproject.kafkaintegration.api.EventSubscriptionService; import org.onosproject.kafkaintegration.api.EventSubscriptionService;
@ -53,25 +53,25 @@ import static org.onosproject.kafkaintegration.api.dto.OnosEvent.Type.LINK;
public class EventListener { public class EventListener {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected EventSubscriptionService eventSubscriptionService; protected EventSubscriptionService eventSubscriptionService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected EventConversionService eventConversionService; protected EventConversionService eventConversionService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LinkService linkService; protected LinkService linkService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected KafkaEventStorageService kafkaStoreService; protected KafkaEventStorageService kafkaStoreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LeadershipService leadershipService; protected LeadershipService leadershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ClusterService clusterService; protected ClusterService clusterService;
private final DeviceListener deviceListener = new InternalDeviceListener(); private final DeviceListener deviceListener = new InternalDeviceListener();

20
apps/kafka-integration/app/src/main/java/org/onosproject/kafkaintegration/kafka/EventPublisher.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.kafkaintegration.kafka; package org.onosproject.kafkaintegration.kafka;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.ProducerRecord;
import org.onosproject.cluster.ClusterService; import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.LeadershipService; import org.onosproject.cluster.LeadershipService;
@ -42,19 +42,19 @@ public class EventPublisher {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LeadershipService leadershipService; protected LeadershipService leadershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ClusterService clusterService; protected ClusterService clusterService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected KafkaConfigService kafkaConfigService; protected KafkaConfigService kafkaConfigService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected KafkaEventStorageService kafkaStore; protected KafkaEventStorageService kafkaStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected KafkaPublisherService kafkaPublisher; protected KafkaPublisherService kafkaPublisher;
protected ScheduledExecutorService exService; protected ScheduledExecutorService exService;

32
apps/kafka-integration/app/src/main/java/org/onosproject/kafkaintegration/kafka/KafkaConfigManager.java
View File

@ -15,37 +15,35 @@
*/ */
package org.onosproject.kafkaintegration.kafka; package org.onosproject.kafkaintegration.kafka;
import static com.google.common.base.Strings.isNullOrEmpty;
import static org.onlab.util.Tools.get;
import java.util.Dictionary;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.cfg.ComponentConfigService; import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.kafkaintegration.api.KafkaConfigService; import org.onosproject.kafkaintegration.api.KafkaConfigService;
import org.onosproject.kafkaintegration.api.KafkaPublisherAdminService; import org.onosproject.kafkaintegration.api.KafkaPublisherAdminService;
import org.onosproject.kafkaintegration.api.dto.KafkaServerConfig; import org.onosproject.kafkaintegration.api.dto.KafkaServerConfig;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Property;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@Component(immediate = true) import java.util.Dictionary;
@Service
import static com.google.common.base.Strings.isNullOrEmpty;
import static org.onlab.util.Tools.get;
@Component(immediate = true, service = KafkaConfigService.class)
public class KafkaConfigManager implements KafkaConfigService { public class KafkaConfigManager implements KafkaConfigService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService componentConfigService; protected ComponentConfigService componentConfigService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected KafkaPublisherAdminService kafkaPublisherAdminService; protected KafkaPublisherAdminService kafkaPublisherAdminService;
public static final String BOOTSTRAP_SERVERS = "localhost:9092"; public static final String BOOTSTRAP_SERVERS = "localhost:9092";

18
apps/kafka-integration/app/src/main/java/org/onosproject/kafkaintegration/kafka/PublishManager.java
View File

@ -16,27 +16,25 @@
package org.onosproject.kafkaintegration.kafka; package org.onosproject.kafkaintegration.kafka;
import java.util.Properties;
import java.util.concurrent.Future;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.clients.producer.RecordMetadata;
import org.onosproject.kafkaintegration.api.KafkaPublisherService;
import org.onosproject.kafkaintegration.api.KafkaPublisherAdminService; import org.onosproject.kafkaintegration.api.KafkaPublisherAdminService;
import org.onosproject.kafkaintegration.api.KafkaPublisherService;
import org.onosproject.kafkaintegration.api.dto.KafkaServerConfig; import org.onosproject.kafkaintegration.api.dto.KafkaServerConfig;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.Properties;
import java.util.concurrent.Future;
/** /**
* Implementation of a Kafka Producer. * Implementation of a Kafka Producer.
*/ */
@Component @Component(service = { KafkaPublisherService.class, KafkaPublisherAdminService.class })
@Service
public class PublishManager implements KafkaPublisherService, KafkaPublisherAdminService { public class PublishManager implements KafkaPublisherService, KafkaPublisherAdminService {
private KafkaProducer<String, byte[]> kafkaProducer = null; private KafkaProducer<String, byte[]> kafkaProducer = null;

16
apps/l3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/DistributedNetL3VpnStore.java
View File

@ -16,12 +16,6 @@
package org.onosproject.l3vpn.netl3vpn.impl; package org.onosproject.l3vpn.netl3vpn.impl;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.onosproject.l3vpn.netl3vpn.AccessInfo; import org.onosproject.l3vpn.netl3vpn.AccessInfo;
import org.onosproject.l3vpn.netl3vpn.BgpInfo; import org.onosproject.l3vpn.netl3vpn.BgpInfo;
@ -47,6 +41,11 @@ import org.onosproject.yang.model.ListKey;
import org.onosproject.yang.model.NodeKey; import org.onosproject.yang.model.NodeKey;
import org.onosproject.yang.model.ResourceId; import org.onosproject.yang.model.ResourceId;
import org.onosproject.yang.model.SchemaId; import org.onosproject.yang.model.SchemaId;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Map; import java.util.Map;
@ -59,8 +58,7 @@ import static org.slf4j.LoggerFactory.getLogger;
* Manages the pool of available VPN instances and its associated devices * Manages the pool of available VPN instances and its associated devices
* and interface information. * and interface information.
*/ */
@Component(immediate = true) @Component(immediate = true, service = NetL3VpnStore.class)
@Service
public class DistributedNetL3VpnStore implements NetL3VpnStore { public class DistributedNetL3VpnStore implements NetL3VpnStore {
private static final Serializer L3VPN_SERIALIZER = Serializer private static final Serializer L3VPN_SERIALIZER = Serializer
@ -95,7 +93,7 @@ public class DistributedNetL3VpnStore implements NetL3VpnStore {
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
/** /**

28
apps/l3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3VpnManager.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.l3vpn.netl3vpn.impl; package org.onosproject.l3vpn.netl3vpn.impl;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onlab.util.AbstractAccumulator; import org.onlab.util.AbstractAccumulator;
import org.onlab.util.Accumulator; import org.onlab.util.Accumulator;
import org.onosproject.cluster.ClusterService; import org.onosproject.cluster.ClusterService;
@ -154,31 +154,31 @@ public class NetL3VpnManager {
private final InternalLeadershipListener leadershipEventListener = private final InternalLeadershipListener leadershipEventListener =
new InternalLeadershipListener(); new InternalLeadershipListener();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DriverService driverService; protected DriverService driverService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ModelConverter modelConverter; protected ModelConverter modelConverter;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DynamicConfigService configService; protected DynamicConfigService configService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetL3VpnStore l3VpnStore; protected NetL3VpnStore l3VpnStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LeadershipService leadershipService; protected LeadershipService leadershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ClusterService clusterService; protected ClusterService clusterService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected PceService pceService; protected PceService pceService;
protected IdGenerator l3VpnIdGen; protected IdGenerator l3VpnIdGen;

24
apps/layout/src/main/java/org/onosproject/layout/RoleBasedLayoutManager.java
View File

@ -17,12 +17,6 @@
package org.onosproject.layout; package org.onosproject.layout;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.net.config.NetworkConfigService; import org.onosproject.net.config.NetworkConfigService;
import org.onosproject.net.device.DeviceService; import org.onosproject.net.device.DeviceService;
import org.onosproject.net.host.HostService; import org.onosproject.net.host.HostService;
@ -34,6 +28,11 @@ import org.onosproject.ui.UiTopoOverlay;
import org.onosproject.ui.UiTopoOverlayFactory; import org.onosproject.ui.UiTopoOverlayFactory;
import org.onosproject.ui.UiView; import org.onosproject.ui.UiView;
import org.onosproject.ui.UiViewHidden; import org.onosproject.ui.UiViewHidden;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -44,8 +43,7 @@ import java.util.List;
* supported layout variants using roles assigned to network elements using * supported layout variants using roles assigned to network elements using
* network configuration. * network configuration.
*/ */
@Component(immediate = true) @Component(immediate = true, service = RoleBasedLayoutManager.class)
@Service(value = RoleBasedLayoutManager.class)
public class RoleBasedLayoutManager { public class RoleBasedLayoutManager {
private Logger log = LoggerFactory.getLogger(getClass()); private Logger log = LoggerFactory.getLogger(getClass());
@ -74,19 +72,19 @@ public class RoleBasedLayoutManager {
.topoOverlayFactory(topoOverlayFactory) .topoOverlayFactory(topoOverlayFactory)
.build(); .build();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetworkConfigService networkConfigService; protected NetworkConfigService networkConfigService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hostService; protected HostService hostService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LinkService linkService; protected LinkService linkService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected UiExtensionService uiExtensionService; protected UiExtensionService uiExtensionService;
@Activate @Activate

16
apps/learning-switch/src/main/java/org/onosproject/learningswitch/LearningSwitchSolution.java
View File

@ -16,11 +16,11 @@
package org.onosproject.learningswitch; package org.onosproject.learningswitch;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onlab.packet.Ethernet; import org.onlab.packet.Ethernet;
import org.onlab.packet.MacAddress; import org.onlab.packet.MacAddress;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
@ -52,13 +52,13 @@ import java.util.Optional;
public class LearningSwitchSolution { public class LearningSwitchSolution {
// Instantiates the relevant services. // Instantiates the relevant services.
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected PacketService packetService; protected PacketService packetService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowRuleService flowRuleService; protected FlowRuleService flowRuleService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());

16
apps/learning-switch/src/main/java/org/onosproject/learningswitch/LearningSwitchTutorial.java
View File

@ -16,11 +16,11 @@
package org.onosproject.learningswitch; package org.onosproject.learningswitch;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onlab.packet.Ethernet; import org.onlab.packet.Ethernet;
import org.onlab.packet.MacAddress; import org.onlab.packet.MacAddress;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
@ -48,13 +48,13 @@ import java.util.Optional;
public class LearningSwitchTutorial { public class LearningSwitchTutorial {
// Instantiates the relevant services. // Instantiates the relevant services.
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected PacketService packetService; protected PacketService packetService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowRuleService flowRuleService; protected FlowRuleService flowRuleService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());

12
apps/linkprops/src/main/java/org/onosproject/linkprops/LinkPropApp.java
View File

@ -16,11 +16,11 @@
package org.onosproject.linkprops; package org.onosproject.linkprops;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.ui.UiExtension; import org.onosproject.ui.UiExtension;
import org.onosproject.ui.UiExtensionService; import org.onosproject.ui.UiExtensionService;
import org.onosproject.ui.UiMessageHandlerFactory; import org.onosproject.ui.UiMessageHandlerFactory;
@ -43,7 +43,7 @@ public class LinkPropApp {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected UiExtensionService uiExtensionService; protected UiExtensionService uiExtensionService;
// List of application views // List of application views

12
apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/MappingCodecRegistrator.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.mapping; package org.onosproject.mapping;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.codec.CodecService; import org.onosproject.codec.CodecService;
import org.onosproject.mapping.actions.MappingAction; import org.onosproject.mapping.actions.MappingAction;
import org.onosproject.mapping.addresses.MappingAddress; import org.onosproject.mapping.addresses.MappingAddress;
@ -43,7 +43,7 @@ public class MappingCodecRegistrator {
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
public CodecService codecService; public CodecService codecService;
@Activate @Activate

18
apps/mappingmanagement/mgr/src/main/java/org/onosproject/mapping/impl/DistributedMappingStore.java
View File

@ -18,12 +18,6 @@ package org.onosproject.mapping.impl;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.mapping.DefaultMapping; import org.onosproject.mapping.DefaultMapping;
import org.onosproject.mapping.DefaultMappingEntry; import org.onosproject.mapping.DefaultMappingEntry;
import org.onosproject.mapping.Mapping; import org.onosproject.mapping.Mapping;
@ -47,6 +41,11 @@ import org.onosproject.store.service.MapEvent;
import org.onosproject.store.service.MapEventListener; import org.onosproject.store.service.MapEventListener;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Map; import java.util.Map;
@ -58,8 +57,7 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Implementation of a distributed store for managing mapping information. * Implementation of a distributed store for managing mapping information.
*/ */
@Component(immediate = true) @Component(immediate = true, service = MappingStore.class)
@Service
public class DistributedMappingStore public class DistributedMappingStore
extends AbstractStore<MappingEvent, MappingStoreDelegate> extends AbstractStore<MappingEvent, MappingStoreDelegate>
implements MappingStore { implements MappingStore {
@ -72,10 +70,10 @@ public class DistributedMappingStore
private Map<MappingId, Mapping> databaseMap; private Map<MappingId, Mapping> databaseMap;
private Map<MappingId, Mapping> cacheMap; private Map<MappingId, Mapping> cacheMap;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
private final MapEventListener<MappingId, Mapping> listener = new InternalListener(); private final MapEventListener<MappingId, Mapping> listener = new InternalListener();

18
apps/mappingmanagement/mgr/src/main/java/org/onosproject/mapping/impl/MappingManager.java
View File

@ -19,12 +19,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.mapping.MappingAdminService; import org.onosproject.mapping.MappingAdminService;
import org.onosproject.mapping.MappingEntry; import org.onosproject.mapping.MappingEntry;
@ -44,6 +38,11 @@ import org.onosproject.net.DeviceId;
import org.onosproject.net.device.DeviceService; import org.onosproject.net.device.DeviceService;
import org.onosproject.net.provider.AbstractListenerProviderRegistry; import org.onosproject.net.provider.AbstractListenerProviderRegistry;
import org.onosproject.net.provider.AbstractProviderService; import org.onosproject.net.provider.AbstractProviderService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.List; import java.util.List;
@ -54,8 +53,7 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Implementation of mapping management service. * Implementation of mapping management service.
*/ */
@Component(immediate = true) @Component(immediate = true, service = { MappingService.class, MappingAdminService.class, MappingProviderRegistry.class })
@Service
public class MappingManager public class MappingManager
extends AbstractListenerProviderRegistry<MappingEvent, MappingListener, extends AbstractListenerProviderRegistry<MappingEvent, MappingListener,
MappingProvider, MappingProviderService> MappingProvider, MappingProviderService>
@ -66,10 +64,10 @@ public class MappingManager
private static final String MAPPING_OP_TOPIC = "mapping-ops-ids"; private static final String MAPPING_OP_TOPIC = "mapping-ops-ids";
private final MappingStoreDelegate delegate = new InternalStoreDelegate(); private final MappingStoreDelegate delegate = new InternalStoreDelegate();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MappingStore store; protected MappingStore store;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Activate @Activate

12
apps/mappingmanagement/mgr/src/main/java/org/onosproject/mapping/impl/SimpleMappingStore.java
View File

@ -18,11 +18,6 @@ package org.onosproject.mapping.impl;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.mapping.DefaultMappingEntry; import org.onosproject.mapping.DefaultMappingEntry;
import org.onosproject.mapping.Mapping; import org.onosproject.mapping.Mapping;
import org.onosproject.mapping.MappingEntry; import org.onosproject.mapping.MappingEntry;
@ -35,6 +30,10 @@ import org.onosproject.mapping.StoredMappingEntry;
import org.onosproject.net.DeviceId; import org.onosproject.net.DeviceId;
import org.onosproject.store.AbstractStore; import org.onosproject.store.AbstractStore;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Collections; import java.util.Collections;
@ -52,8 +51,7 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Manages inventory of mappings using trivial in-memory implementation. * Manages inventory of mappings using trivial in-memory implementation.
*/ */
@Component(immediate = true) @Component(immediate = true, service = MappingStore.class)
@Service
public class SimpleMappingStore public class SimpleMappingStore
extends AbstractStore<MappingEvent, MappingStoreDelegate> extends AbstractStore<MappingEvent, MappingStoreDelegate>
implements MappingStore { implements MappingStore {

12
apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/gui/MappingsTopoUI.java
View File

@ -16,11 +16,11 @@
package org.onosproject.mapping.web.gui; package org.onosproject.mapping.web.gui;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.ui.UiExtension; import org.onosproject.ui.UiExtension;
import org.onosproject.ui.UiExtensionService; import org.onosproject.ui.UiExtensionService;
import org.onosproject.ui.UiMessageHandlerFactory; import org.onosproject.ui.UiMessageHandlerFactory;
@ -44,7 +44,7 @@ public class MappingsTopoUI {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected UiExtensionService uiExtensionService; protected UiExtensionService uiExtensionService;
// Factory for UI message handlers // Factory for UI message handlers

16
apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/gui/MappingsUI.java
View File

@ -16,17 +16,16 @@
package org.onosproject.mapping.web.gui; package org.onosproject.mapping.web.gui;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.ui.UiExtension; import org.onosproject.ui.UiExtension;
import org.onosproject.ui.UiExtensionService; import org.onosproject.ui.UiExtensionService;
import org.onosproject.ui.UiMessageHandlerFactory; import org.onosproject.ui.UiMessageHandlerFactory;
import org.onosproject.ui.UiView; import org.onosproject.ui.UiView;
import org.onosproject.ui.UiViewHidden; import org.onosproject.ui.UiViewHidden;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -35,8 +34,7 @@ import java.util.List;
/** /**
* Mechanism to stream data to the GUI. * Mechanism to stream data to the GUI.
*/ */
@Component(immediate = true, enabled = true) @Component(immediate = true, service = MappingsUI.class)
@Service(value = MappingsUI.class)
public class MappingsUI { public class MappingsUI {
private static final String MAPPING_ID = "mapping"; private static final String MAPPING_ID = "mapping";
private static final String RES_PATH = "gui"; private static final String RES_PATH = "gui";
@ -44,7 +42,7 @@ public class MappingsUI {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected UiExtensionService uiExtensionService; protected UiExtensionService uiExtensionService;
// Factory for UI message handlers // Factory for UI message handlers

16
apps/mcast/impl/src/main/java/org/onosproject/mcast/impl/DistributedMcastRoutesStore.java
View File

@ -17,12 +17,6 @@ package org.onosproject.mcast.impl;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.onosproject.mcast.api.McastEvent; import org.onosproject.mcast.api.McastEvent;
import org.onosproject.mcast.api.McastRoute; import org.onosproject.mcast.api.McastRoute;
@ -39,6 +33,11 @@ import org.onosproject.store.service.MapEventListener;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.Versioned; import org.onosproject.store.service.Versioned;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Collection; import java.util.Collection;
@ -56,8 +55,7 @@ import static org.slf4j.LoggerFactory.getLogger;
* New distributed mcast route store implementation. Routes are stored consistently * New distributed mcast route store implementation. Routes are stored consistently
* across the cluster. * across the cluster.
*/ */
@Component(immediate = true) @Component(immediate = true, service = McastStore.class)
@Service
public class DistributedMcastRoutesStore public class DistributedMcastRoutesStore
extends AbstractStore<McastEvent, McastStoreDelegate> extends AbstractStore<McastEvent, McastStoreDelegate>
implements McastStore { implements McastStore {
@ -65,7 +63,7 @@ public class DistributedMcastRoutesStore
private static final String MCASTRIB = "onos-mcast-route-table"; private static final String MCASTRIB = "onos-mcast-route-table";
private Logger log = getLogger(getClass()); private Logger log = getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
private Map<McastRoute, McastRouteData> mcastRoutes; private Map<McastRoute, McastRouteData> mcastRoutes;

18
apps/mcast/impl/src/main/java/org/onosproject/mcast/impl/MulticastRouteManager.java
View File

@ -18,12 +18,6 @@ package org.onosproject.mcast.impl;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.IpAddress; import org.onlab.packet.IpAddress;
import org.onosproject.event.AbstractListenerManager; import org.onosproject.event.AbstractListenerManager;
import org.onosproject.mcast.api.McastEvent; import org.onosproject.mcast.api.McastEvent;
@ -40,6 +34,11 @@ import org.onosproject.net.HostLocation;
import org.onosproject.net.host.HostEvent; import org.onosproject.net.host.HostEvent;
import org.onosproject.net.host.HostListener; import org.onosproject.net.host.HostListener;
import org.onosproject.net.host.HostService; import org.onosproject.net.host.HostService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.HashSet; import java.util.HashSet;
@ -56,8 +55,7 @@ import static org.slf4j.LoggerFactory.getLogger;
/** /**
* An implementation of a multicast route table. * An implementation of a multicast route table.
*/ */
@Component(immediate = true) @Component(immediate = true, service = MulticastRouteService.class)
@Service
public class MulticastRouteManager public class MulticastRouteManager
extends AbstractListenerManager<McastEvent, McastListener> extends AbstractListenerManager<McastEvent, McastListener>
implements MulticastRouteService { implements MulticastRouteService {
@ -67,10 +65,10 @@ public class MulticastRouteManager
private final McastStoreDelegate delegate = new InternalMcastStoreDelegate(); private final McastStoreDelegate delegate = new InternalMcastStoreDelegate();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected McastStore store; protected McastStore store;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hostService; protected HostService hostService;
private HostListener hostListener = new InternalHostListener(); private HostListener hostListener = new InternalHostListener();

12
apps/mcast/web/src/main/java/org/onosproject/mcast/web/McastServiceCodecRegistrator.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.mcast.web; package org.onosproject.mcast.web;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.codec.CodecService; import org.onosproject.codec.CodecService;
import org.onosproject.mcast.api.McastRoute; import org.onosproject.mcast.api.McastRoute;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -34,7 +34,7 @@ public class McastServiceCodecRegistrator {
private static Logger log = LoggerFactory.getLogger(McastServiceCodecRegistrator.class); private static Logger log = LoggerFactory.getLogger(McastServiceCodecRegistrator.class);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CodecService codecService; protected CodecService codecService;
@Activate @Activate

30
apps/metrics/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java
View File

@ -15,18 +15,7 @@
*/ */
package org.onosproject.metrics.intent; package org.onosproject.metrics.intent;
import static org.slf4j.LoggerFactory.getLogger;
import java.util.LinkedList;
import java.util.List;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.metrics.EventMetric; import org.onlab.metrics.EventMetric;
import org.onlab.metrics.MetricsService; import org.onlab.metrics.MetricsService;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
@ -34,24 +23,33 @@ import org.onosproject.core.CoreService;
import org.onosproject.net.intent.IntentEvent; import org.onosproject.net.intent.IntentEvent;
import org.onosproject.net.intent.IntentListener; import org.onosproject.net.intent.IntentListener;
import org.onosproject.net.intent.IntentService; import org.onosproject.net.intent.IntentService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.LinkedList;
import java.util.List;
import static org.slf4j.LoggerFactory.getLogger;
/** /**
* ONOS Intent Metrics Application that collects intent-related metrics. * ONOS Intent Metrics Application that collects intent-related metrics.
*/ */
@Component(immediate = true) @Component(immediate = true, service = { IntentMetricsService.class, IntentListener.class })
@Service
public class IntentMetrics implements IntentMetricsService, public class IntentMetrics implements IntentMetricsService,
IntentListener { IntentListener {
private static final Logger log = getLogger(IntentMetrics.class); private static final Logger log = getLogger(IntentMetrics.class);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected IntentService intentService; protected IntentService intentService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MetricsService metricsService; protected MetricsService metricsService;
private ApplicationId appId; private ApplicationId appId;

36
apps/metrics/src/main/java/org/onosproject/metrics/topology/TopologyMetrics.java
View File

@ -15,18 +15,7 @@
*/ */
package org.onosproject.metrics.topology; package org.onosproject.metrics.topology;
import static org.slf4j.LoggerFactory.getLogger;
import java.util.LinkedList;
import java.util.List;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.metrics.EventMetric; import org.onlab.metrics.EventMetric;
import org.onlab.metrics.MetricsService; import org.onlab.metrics.MetricsService;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
@ -44,32 +33,41 @@ import org.onosproject.net.link.LinkService;
import org.onosproject.net.topology.TopologyEvent; import org.onosproject.net.topology.TopologyEvent;
import org.onosproject.net.topology.TopologyListener; import org.onosproject.net.topology.TopologyListener;
import org.onosproject.net.topology.TopologyService; import org.onosproject.net.topology.TopologyService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.LinkedList;
import java.util.List;
import static org.slf4j.LoggerFactory.getLogger;
/** /**
* ONOS Topology Metrics Application that collects topology-related metrics. * ONOS Topology Metrics Application that collects topology-related metrics.
*/ */
@Component(immediate = true) @Component(immediate = true, service = TopologyMetricsService.class)
@Service
public class TopologyMetrics implements TopologyMetricsService { public class TopologyMetrics implements TopologyMetricsService {
private static final Logger log = getLogger(TopologyMetrics.class); private static final Logger log = getLogger(TopologyMetrics.class);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hostService; protected HostService hostService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LinkService linkService; protected LinkService linkService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MetricsService metricsService; protected MetricsService metricsService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected TopologyService topologyService; protected TopologyService topologyService;
private ApplicationId appId; private ApplicationId appId;

18
apps/mfwd/src/main/java/org/onosproject/mfwd/impl/McastForwarding.java
View File

@ -15,11 +15,11 @@
*/ */
package org.onosproject.mfwd.impl; package org.onosproject.mfwd.impl;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onlab.packet.Ethernet; import org.onlab.packet.Ethernet;
import org.onlab.packet.IPv4; import org.onlab.packet.IPv4;
import org.onlab.packet.Ip4Address; import org.onlab.packet.Ip4Address;
@ -68,16 +68,16 @@ public class McastForwarding {
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected PacketService packetService; protected PacketService packetService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
private IntentService intentService; private IntentService intentService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MulticastRouteService mcastRouteManager; protected MulticastRouteService mcastRouteManager;
protected McastIntentManager mcastIntentManager; protected McastIntentManager mcastIntentManager;

31
apps/mlb/src/main/java/org/onosproject/mlb/MastershipLoadBalancer.java
View File

@ -16,13 +16,6 @@
package org.onosproject.mlb; package org.onosproject.mlb;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onlab.util.Tools; import org.onlab.util.Tools;
import org.onosproject.cfg.ComponentConfigService; import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.cluster.ClusterService; import org.onosproject.cluster.ClusterService;
@ -34,10 +27,16 @@ import org.onosproject.mastership.MastershipAdminService;
import org.onosproject.mastership.MastershipEvent; import org.onosproject.mastership.MastershipEvent;
import org.onosproject.mastership.MastershipListener; import org.onosproject.mastership.MastershipListener;
import org.onosproject.mastership.MastershipService; import org.onosproject.mastership.MastershipService;
import org.osgi.service.component.ComponentContext;
import org.onosproject.net.region.RegionEvent; import org.onosproject.net.region.RegionEvent;
import org.onosproject.net.region.RegionListener; import org.onosproject.net.region.RegionListener;
import org.onosproject.net.region.RegionService; import org.onosproject.net.region.RegionService;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Dictionary; import java.util.Dictionary;
@ -63,8 +62,8 @@ public class MastershipLoadBalancer {
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
private static final int DEFAULT_SCHEDULE_PERIOD = 30; private static final int DEFAULT_SCHEDULE_PERIOD = 30;
@Property(name = "schedulePeriod", intValue = DEFAULT_SCHEDULE_PERIOD, //@Property(name = "schedulePeriod", intValue = DEFAULT_SCHEDULE_PERIOD,
label = "Period to schedule balancing the mastership to be shared as evenly as by all online instances.") // label = "Period to schedule balancing the mastership to be shared as evenly as by all online instances.")
private int schedulePeriod = DEFAULT_SCHEDULE_PERIOD; private int schedulePeriod = DEFAULT_SCHEDULE_PERIOD;
private static final String REBALANCE_MASTERSHIP = "rebalance/mastership"; private static final String REBALANCE_MASTERSHIP = "rebalance/mastership";
@ -75,22 +74,22 @@ public class MastershipLoadBalancer {
private AtomicReference<Future> nextTask = new AtomicReference<>(); private AtomicReference<Future> nextTask = new AtomicReference<>();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MastershipService mastershipService; protected MastershipService mastershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MastershipAdminService mastershipAdminService; protected MastershipAdminService mastershipAdminService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LeadershipService leadershipService; protected LeadershipService leadershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected RegionService regionService; protected RegionService regionService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ClusterService clusterService; protected ClusterService clusterService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService cfgService; protected ComponentConfigService cfgService;
private InnerLeadershipListener leadershipListener = new InnerLeadershipListener(); private InnerLeadershipListener leadershipListener = new InnerLeadershipListener();

18
apps/mobility/src/main/java/org/onosproject/mobility/HostMobility.java
View File

@ -22,11 +22,11 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.net.Device; import org.onosproject.net.Device;
@ -54,16 +54,16 @@ public class HostMobility {
private final Logger log = getLogger(getClass()); private final Logger log = getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hostService; protected HostService hostService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowRuleService flowRuleService; protected FlowRuleService flowRuleService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
private ApplicationId appId; private ApplicationId appId;

18
apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfActiveComponent.java
View File

@ -17,11 +17,11 @@
package org.onosproject.netconf.client.impl; package org.onosproject.netconf.client.impl;
import com.google.common.annotations.Beta; import com.google.common.annotations.Beta;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.onosproject.config.DynamicConfigEvent; import org.onosproject.config.DynamicConfigEvent;
import org.onosproject.config.DynamicConfigListener; import org.onosproject.config.DynamicConfigListener;
import org.onosproject.config.DynamicConfigService; import org.onosproject.config.DynamicConfigService;
@ -63,16 +63,16 @@ import static com.google.common.base.Preconditions.checkNotNull;
public class NetconfActiveComponent implements DynamicConfigListener { public class NetconfActiveComponent implements DynamicConfigListener {
private static final Logger log = LoggerFactory.getLogger(NetconfActiveComponent.class); private static final Logger log = LoggerFactory.getLogger(NetconfActiveComponent.class);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DynamicConfigService cfgService; protected DynamicConfigService cfgService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetconfTranslator netconfTranslator; protected NetconfTranslator netconfTranslator;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MastershipService mastershipService; protected MastershipService mastershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetconfController controller; protected NetconfController controller;
private final Accumulator<DynamicConfigEvent> accumulator = new InternalEventAccummulator(); private final Accumulator<DynamicConfigEvent> accumulator = new InternalEventAccummulator();

24
apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java
View File

@ -17,12 +17,6 @@
package org.onosproject.netconf.client.impl; package org.onosproject.netconf.client.impl;
import com.google.common.annotations.Beta; import com.google.common.annotations.Beta;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.cluster.NodeId; import org.onosproject.cluster.NodeId;
import org.onosproject.net.DeviceId; import org.onosproject.net.DeviceId;
import org.onosproject.netconf.NetconfController; import org.onosproject.netconf.NetconfController;
@ -31,6 +25,7 @@ import org.onosproject.netconf.NetconfException;
import org.onosproject.netconf.NetconfSession; import org.onosproject.netconf.NetconfSession;
import org.onosproject.netconf.client.NetconfTranslator; import org.onosproject.netconf.client.NetconfTranslator;
import org.onosproject.yang.model.DataNode; import org.onosproject.yang.model.DataNode;
import org.onosproject.yang.model.DefaultResourceData;
import org.onosproject.yang.model.InnerNode; import org.onosproject.yang.model.InnerNode;
import org.onosproject.yang.model.KeyLeaf; import org.onosproject.yang.model.KeyLeaf;
import org.onosproject.yang.model.LeafListKey; import org.onosproject.yang.model.LeafListKey;
@ -47,13 +42,17 @@ import org.onosproject.yang.runtime.DefaultAnnotatedNodeInfo;
import org.onosproject.yang.runtime.DefaultAnnotation; import org.onosproject.yang.runtime.DefaultAnnotation;
import org.onosproject.yang.runtime.DefaultCompositeData; import org.onosproject.yang.runtime.DefaultCompositeData;
import org.onosproject.yang.runtime.DefaultCompositeStream; import org.onosproject.yang.runtime.DefaultCompositeStream;
import org.onosproject.yang.model.DefaultResourceData;
import org.onosproject.yang.runtime.DefaultRuntimeContext; import org.onosproject.yang.runtime.DefaultRuntimeContext;
import org.onosproject.yang.runtime.DefaultYangSerializerContext; import org.onosproject.yang.runtime.DefaultYangSerializerContext;
import org.onosproject.yang.runtime.SerializerHelper;
import org.onosproject.yang.runtime.YangRuntimeService; import org.onosproject.yang.runtime.YangRuntimeService;
import org.onosproject.yang.runtime.YangSerializerContext; import org.onosproject.yang.runtime.YangSerializerContext;
import org.onosproject.yang.runtime.SerializerHelper;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -89,8 +88,7 @@ import static org.onosproject.yang.runtime.SerializerHelper.addDataNode;
* will be no session available. * will be no session available.
*/ */
@Beta @Beta
@Service @Component(immediate = true, service = NetconfTranslator.class)
@Component(immediate = true)
public class NetconfTranslatorImpl implements NetconfTranslator { public class NetconfTranslatorImpl implements NetconfTranslator {
private static final Logger log = LoggerFactory private static final Logger log = LoggerFactory
@ -120,13 +118,13 @@ public class NetconfTranslatorImpl implements NetconfTranslator {
private static final String XMLNS_XC_SPECIFIER = "xmlns:xc"; private static final String XMLNS_XC_SPECIFIER = "xmlns:xc";
private static final String XMLNS_SPECIFIER = "xmlns"; private static final String XMLNS_SPECIFIER = "xmlns";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetconfController netconfController; protected NetconfController netconfController;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected YangRuntimeService yangRuntimeService; protected YangRuntimeService yangRuntimeService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected SchemaContextProvider schemaContextProvider; protected SchemaContextProvider schemaContextProvider;
@Activate @Activate

37
apps/network-troubleshoot/core/src/main/java/org/onosproject/fnl/impl/NetworkDiagnosticManager.java
View File

@ -15,27 +15,25 @@
*/ */
package org.onosproject.fnl.impl; package org.onosproject.fnl.impl;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Deactivate;
import org.onlab.util.Tools; import org.onlab.util.Tools;
import org.onosproject.cfg.ComponentConfigService; import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.fnl.intf.NetworkAnomaly; import org.onosproject.fnl.intf.NetworkAnomaly;
import org.onosproject.fnl.intf.NetworkDiagnostic; import org.onosproject.fnl.intf.NetworkDiagnostic;
import org.onosproject.fnl.intf.NetworkDiagnostic.Type; import org.onosproject.fnl.intf.NetworkDiagnostic.Type;
import org.onosproject.fnl.intf.NetworkDiagnosticService; import org.onosproject.fnl.intf.NetworkDiagnosticService;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.net.device.DeviceService; import org.onosproject.net.device.DeviceService;
import org.onosproject.net.flow.FlowRuleService; import org.onosproject.net.flow.FlowRuleService;
import org.onosproject.net.host.HostService; import org.onosproject.net.host.HostService;
import org.onosproject.net.link.LinkService; import org.onosproject.net.link.LinkService;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -52,8 +50,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
* *
* It is simply modularized at present. * It is simply modularized at present.
*/ */
@Component(immediate = true) @Component(immediate = true, service = NetworkDiagnosticService.class)
@Service
public class NetworkDiagnosticManager implements NetworkDiagnosticService { public class NetworkDiagnosticManager implements NetworkDiagnosticService {
/** /**
@ -67,30 +64,30 @@ public class NetworkDiagnosticManager implements NetworkDiagnosticService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ComponentConfigService cfgService; protected ComponentConfigService cfgService;
// ------ service below is for auto register ------ // ------ service below is for auto register ------
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService ds; protected DeviceService ds;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected HostService hs; protected HostService hs;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected FlowRuleService frs; protected FlowRuleService frs;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LinkService ls; protected LinkService ls;
@Property(name = PROPERTY_AUTO_REGISTER_DIAG, boolValue = true, //@Property(name = PROPERTY_AUTO_REGISTER_DIAG, boolValue = true,
label = "Automatically register all of default diagnostic modules.") // label = "Automatically register all of default diagnostic modules.")
private boolean autoRegister = true; private boolean autoRegister = true;

41
apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java
View File

@ -18,14 +18,12 @@ package org.onosproject.newoptical;
import com.google.common.annotations.Beta; import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import org.apache.felix.scr.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified; import org.osgi.service.component.annotations.Modified;
import org.apache.felix.scr.annotations.Property; import org.osgi.service.component.annotations.Reference;
import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.graph.DefaultEdgeWeigher; import org.onlab.graph.DefaultEdgeWeigher;
import org.onlab.graph.ScalarWeight; import org.onlab.graph.ScalarWeight;
import org.onlab.graph.Weight; import org.onlab.graph.Weight;
@ -114,8 +112,7 @@ import static org.onosproject.net.optical.device.OpticalDeviceServiceView.optica
* Main component to configure optical connectivity. * Main component to configure optical connectivity.
*/ */
@Beta @Beta
@Service @Component(immediate = true, service = OpticalPathService.class)
@Component(immediate = true)
public class OpticalPathProvisioner public class OpticalPathProvisioner
extends AbstractListenerManager<OpticalPathEvent, OpticalPathListener> extends AbstractListenerManager<OpticalPathEvent, OpticalPathListener>
implements OpticalPathService { implements OpticalPathService {
@ -132,40 +129,40 @@ public class OpticalPathProvisioner
private static final String CONNECTIVITY_MAP_NAME = "newoptical-connectivity"; private static final String CONNECTIVITY_MAP_NAME = "newoptical-connectivity";
private static final String CROSSCONNECTLINK_SET_NAME = "newoptical-crossconnectlink"; private static final String CROSSCONNECTLINK_SET_NAME = "newoptical-crossconnectlink";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected IntentService intentService; protected IntentService intentService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected TopologyService topologyService; protected TopologyService topologyService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService; protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LinkService linkService; protected LinkService linkService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected MastershipService mastershipService; protected MastershipService mastershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ClusterService clusterService; protected ClusterService clusterService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService; protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected StorageService storageService; protected StorageService storageService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetworkConfigService networkConfigService; protected NetworkConfigService networkConfigService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ResourceService resourceService; protected ResourceService resourceService;
private static final String MAX_PATHS = "maxPaths"; private static final String MAX_PATHS = "maxPaths";
private static final int DEFAULT_MAX_PATHS = 10; private static final int DEFAULT_MAX_PATHS = 10;
@Property(name = MAX_PATHS, intValue = DEFAULT_MAX_PATHS, //@Property(name = MAX_PATHS, intValue = DEFAULT_MAX_PATHS,
label = "Maximum number of paths to consider for path provisioning") // label = "Maximum number of paths to consider for path provisioning")
private int maxPaths = DEFAULT_MAX_PATHS; private int maxPaths = DEFAULT_MAX_PATHS;
private ApplicationId appId; private ApplicationId appId;

Some files were not shown because too many files have changed in this diff Show More