Code Review / bgpcep.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
BUG-113: switch BGP to proper activators
[bgpcep.git] / bgp / parser-impl / src / main / java / org / opendaylight / protocol / bgp / parser / impl / Activator.java
diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/ActivatorImpl.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/Activator.java
similarity index 64%
rename from bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/ActivatorImpl.java
rename to bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/Activator.java
index 14a2d0ad6fd66b700a5128cfad0f46aeb441987f..82162a9130866c6d7d336bf60c29dbc53f74c5a6 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/ActivatorImpl.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/Activator.java
@@ -10,8 +10,6 @@ package org.opendaylight.protocol.bgp.parser.impl;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.opendaylight.protocol.bgp.linkstate.LinkstateAttributeParser;
-import org.opendaylight.protocol.bgp.linkstate.LinkstateNlriParser;
 import org.opendaylight.protocol.bgp.parser.impl.message.BGPKeepAliveMessageParser;
 import org.opendaylight.protocol.bgp.parser.impl.message.BGPNotificationMessageParser;
 import org.opendaylight.protocol.bgp.parser.impl.message.BGPOpenMessageParser;
@@ -38,15 +36,12 @@ import org.opendaylight.protocol.bgp.parser.impl.message.update.OriginAttributeP
 import org.opendaylight.protocol.bgp.parser.impl.message.update.OriginatorIdAttributeParser;
 import org.opendaylight.protocol.bgp.parser.spi.AddressFamilyRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.AttributeRegistry;
+import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator;
+import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
 import org.opendaylight.protocol.bgp.parser.spi.CapabilityRegistry;
-import org.opendaylight.protocol.bgp.parser.spi.MessageRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.NlriRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.ParameterRegistry;
-import org.opendaylight.protocol.bgp.parser.spi.ProviderActivator;
-import org.opendaylight.protocol.bgp.parser.spi.ProviderContext;
 import org.opendaylight.protocol.bgp.parser.spi.SubsequentAddressFamilyRegistry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev130918.LinkstateAddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev130918.LinkstateSubsequentAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130918.Keepalive;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130918.Notify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130918.Open;
@@ -62,85 +57,77 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Preconditions;
 
-public final class ActivatorImpl implements ProviderActivator {
-       private static final Logger logger = LoggerFactory.getLogger(ActivatorImpl.class);
+public final class Activator implements BGPExtensionProviderActivator {
+       private static final Logger logger = LoggerFactory.getLogger(Activator.class);
        private List<AutoCloseable> registrations;
 
        @Override
-       public synchronized void start(final ProviderContext context) {
+       public synchronized void start(final BGPExtensionProviderContext context) {
                Preconditions.checkState(registrations == null);
                final List<AutoCloseable> regs = new ArrayList<>();
 
                final AddressFamilyRegistry afiReg = context.getAddressFamilyRegistry();
-               regs.add(afiReg.registerAddressFamily(Ipv4AddressFamily.class, 1));
-               regs.add(afiReg.registerAddressFamily(Ipv6AddressFamily.class, 2));
-               regs.add(afiReg.registerAddressFamily(LinkstateAddressFamily.class, 16388));
+               regs.add(context.registerAddressFamily(Ipv4AddressFamily.class, 1));
+               regs.add(context.registerAddressFamily(Ipv6AddressFamily.class, 2));
 
                final SubsequentAddressFamilyRegistry safiReg = context.getSubsequentAddressFamilyRegistry();
-               regs.add(safiReg.registerSubsequentAddressFamily(UnicastSubsequentAddressFamily.class, 1));
-               regs.add(safiReg.registerSubsequentAddressFamily(LinkstateSubsequentAddressFamily.class, 71));
-               regs.add(safiReg.registerSubsequentAddressFamily(MplsLabeledVpnSubsequentAddressFamily.class, 128));
+               regs.add(context.registerSubsequentAddressFamily(UnicastSubsequentAddressFamily.class, 1));
+               regs.add(context.registerSubsequentAddressFamily(MplsLabeledVpnSubsequentAddressFamily.class, 128));
 
                final NlriRegistry nlriReg = context.getNlriRegistry();
-               regs.add(nlriReg.registerNlriParser(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class,
+               regs.add(context.registerNlriParser(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class,
                                new Ipv4NlriParser()));
-               regs.add(nlriReg.registerNlriParser(Ipv6AddressFamily.class, UnicastSubsequentAddressFamily.class,
+               regs.add(context.registerNlriParser(Ipv6AddressFamily.class, UnicastSubsequentAddressFamily.class,
                                new Ipv6NlriParser()));
-               regs.add(nlriReg.registerNlriParser(LinkstateAddressFamily.class, LinkstateSubsequentAddressFamily.class,
-                               new LinkstateNlriParser(false)));
-               regs.add(nlriReg.registerNlriParser(LinkstateAddressFamily.class, MplsLabeledVpnSubsequentAddressFamily.class,
-                               new LinkstateNlriParser(true)));
 
                final AttributeRegistry attrReg = context.getAttributeRegistry();
-               regs.add(attrReg.registerAttributeParser(OriginAttributeParser.TYPE, new OriginAttributeParser()));
-               regs.add(attrReg.registerAttributeParser(AsPathAttributeParser.TYPE, new AsPathAttributeParser()));
-               regs.add(attrReg.registerAttributeParser(NextHopAttributeParser.TYPE, new NextHopAttributeParser()));
-               regs.add(attrReg.registerAttributeParser(MultiExitDiscriminatorAttributeParser.TYPE,
+               regs.add(context.registerAttributeParser(OriginAttributeParser.TYPE, new OriginAttributeParser()));
+               regs.add(context.registerAttributeParser(AsPathAttributeParser.TYPE, new AsPathAttributeParser()));
+               regs.add(context.registerAttributeParser(NextHopAttributeParser.TYPE, new NextHopAttributeParser()));
+               regs.add(context.registerAttributeParser(MultiExitDiscriminatorAttributeParser.TYPE,
                                new MultiExitDiscriminatorAttributeParser()));
-               regs.add(attrReg.registerAttributeParser(LocalPreferenceAttributeParser.TYPE, new LocalPreferenceAttributeParser()));
-               regs.add(attrReg.registerAttributeParser(AtomicAggregateAttributeParser.TYPE, new AtomicAggregateAttributeParser()));
-               regs.add(attrReg.registerAttributeParser(AggregatorAttributeParser.TYPE, new AggregatorAttributeParser()));
-               regs.add(attrReg.registerAttributeParser(CommunitiesAttributeParser.TYPE, new CommunitiesAttributeParser()));
-               regs.add(attrReg.registerAttributeParser(OriginatorIdAttributeParser.TYPE, new OriginatorIdAttributeParser()));
-               regs.add(attrReg.registerAttributeParser(ClusterIdAttributeParser.TYPE, new ClusterIdAttributeParser()));
-               regs.add(attrReg.registerAttributeParser(MPReachAttributeParser.TYPE, new MPReachAttributeParser(nlriReg)));
-               regs.add(attrReg.registerAttributeParser(MPUnreachAttributeParser.TYPE, new MPUnreachAttributeParser(nlriReg)));
-               regs.add(attrReg.registerAttributeParser(ExtendedCommunitiesAttributeParser.TYPE, new ExtendedCommunitiesAttributeParser()));
-               regs.add(attrReg.registerAttributeParser(AS4AggregatorAttributeParser.TYPE, new AS4AggregatorAttributeParser()));
-               regs.add(attrReg.registerAttributeParser(AS4PathAttributeParser.TYPE, new AS4PathAttributeParser()));
-               regs.add(attrReg.registerAttributeParser(LinkstateAttributeParser.TYPE, new LinkstateAttributeParser()));
+               regs.add(context.registerAttributeParser(LocalPreferenceAttributeParser.TYPE, new LocalPreferenceAttributeParser()));
+               regs.add(context.registerAttributeParser(AtomicAggregateAttributeParser.TYPE, new AtomicAggregateAttributeParser()));
+               regs.add(context.registerAttributeParser(AggregatorAttributeParser.TYPE, new AggregatorAttributeParser()));
+               regs.add(context.registerAttributeParser(CommunitiesAttributeParser.TYPE, new CommunitiesAttributeParser()));
+               regs.add(context.registerAttributeParser(OriginatorIdAttributeParser.TYPE, new OriginatorIdAttributeParser()));
+               regs.add(context.registerAttributeParser(ClusterIdAttributeParser.TYPE, new ClusterIdAttributeParser()));
+               regs.add(context.registerAttributeParser(MPReachAttributeParser.TYPE, new MPReachAttributeParser(nlriReg)));
+               regs.add(context.registerAttributeParser(MPUnreachAttributeParser.TYPE, new MPUnreachAttributeParser(nlriReg)));
+               regs.add(context.registerAttributeParser(ExtendedCommunitiesAttributeParser.TYPE, new ExtendedCommunitiesAttributeParser()));
+               regs.add(context.registerAttributeParser(AS4AggregatorAttributeParser.TYPE, new AS4AggregatorAttributeParser()));
+               regs.add(context.registerAttributeParser(AS4PathAttributeParser.TYPE, new AS4PathAttributeParser()));
 
                final CapabilityRegistry capReg = context.getCapabilityRegistry();
                final MultiProtocolCapabilityHandler multi = new MultiProtocolCapabilityHandler(afiReg, safiReg);
-               regs.add(capReg.registerCapabilityParser(MultiProtocolCapabilityHandler.CODE, multi));
-               regs.add(capReg.registerCapabilitySerializer(CMultiprotocol.class, multi));
+               regs.add(context.registerCapabilityParser(MultiProtocolCapabilityHandler.CODE, multi));
+               regs.add(context.registerCapabilitySerializer(CMultiprotocol.class, multi));
 
                final As4CapabilityHandler as4 = new As4CapabilityHandler();
-               regs.add(capReg.registerCapabilityParser(As4CapabilityHandler.CODE, as4));
-               regs.add(capReg.registerCapabilitySerializer(CAs4Bytes.class, as4));
+               regs.add(context.registerCapabilityParser(As4CapabilityHandler.CODE, as4));
+               regs.add(context.registerCapabilitySerializer(CAs4Bytes.class, as4));
 
                final ParameterRegistry paramReg = context.getParameterRegistry();
                final CapabilityParameterParser cpp = new CapabilityParameterParser(capReg);
-               regs.add(paramReg.registerParameterParser(CapabilityParameterParser.TYPE, cpp));
-               regs.add(paramReg.registerParameterSerializer(BgpParameters.class, cpp));
+               regs.add(context.registerParameterParser(CapabilityParameterParser.TYPE, cpp));
+               regs.add(context.registerParameterSerializer(BgpParameters.class, cpp));
 
-               final MessageRegistry msgReg = context.getMessageRegistry();
                final BGPOpenMessageParser omp = new BGPOpenMessageParser(paramReg);
-               regs.add(msgReg.registerMessageParser(BGPOpenMessageParser.TYPE, omp));
-               regs.add(msgReg.registerMessageSerializer(Open.class, omp));
+               regs.add(context.registerMessageParser(BGPOpenMessageParser.TYPE, omp));
+               regs.add(context.registerMessageSerializer(Open.class, omp));
 
                final BGPUpdateMessageParser ump = new BGPUpdateMessageParser(attrReg);
-               regs.add(msgReg.registerMessageParser(BGPUpdateMessageParser.TYPE, ump));
+               regs.add(context.registerMessageParser(BGPUpdateMessageParser.TYPE, ump));
                // Serialization of Update message is not supported
                // regs.add(msgReg.registerMessageSerializer(Update.class, ump));
 
                final BGPNotificationMessageParser nmp = new BGPNotificationMessageParser();
-               regs.add(msgReg.registerMessageParser(BGPNotificationMessageParser.TYPE, nmp));
-               regs.add(msgReg.registerMessageSerializer(Notify.class, nmp));
+               regs.add(context.registerMessageParser(BGPNotificationMessageParser.TYPE, nmp));
+               regs.add(context.registerMessageSerializer(Notify.class, nmp));
 
                final BGPKeepAliveMessageParser kamp = new BGPKeepAliveMessageParser();
-               regs.add(msgReg.registerMessageParser(BGPKeepAliveMessageParser.TYPE, kamp));
-               regs.add(msgReg.registerMessageSerializer(Keepalive.class, kamp));
+               regs.add(context.registerMessageParser(BGPKeepAliveMessageParser.TYPE, kamp));
+               regs.add(context.registerMessageSerializer(Keepalive.class, kamp));
 
                registrations = regs;
        }
BGP/PCEP protocol library