Move pcep base parser Activator to its own bundle 07/41507/5
authorTom Pantelis <tpanteli@brocade.com>
Thu, 7 Jul 2016 05:30:20 +0000 (01:30 -0400)
committerMilos Fabian <milfabia@cisco.com>
Sun, 17 Jul 2016 17:45:07 +0000 (17:45 +0000)
The pcep base parser Activator was moved (and renamed to
BaseParserExtensionActivator) from the impl bundle to a new bundle,
pcep-base-parser, to avoid circular OSGi service dependencies between the
impl and spi bundles when the PCEPDispatcherImpl wiring is cobverted to
blueprint. In addition all the related message et al classes were also
moved to pcep-base-parser.

Change-Id: I9f79bc111743c21e64c6c9444d926c347d392a08
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
108 files changed:
artifacts/pom.xml
features/pcep/pom.xml
features/pcep/src/main/features/features.xml
pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PcRptMessageCodecTest.java
pcep/base-parser/pom.xml [new file with mode: 0644]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Activator.java with 84% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPCloseMessageParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPErrorMessageParser.java with 99% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPKeepAliveMessageParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPKeepAliveMessageParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringReplyMessageParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPMonitoringReplyMessageParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringRequestMessageParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPMonitoringRequestMessageParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPNotificationMessageParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPNotificationMessageParser.java with 99% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPOpenMessageParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java with 99% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java with 99% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPStartTLSMessageParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPStartTLSMessageParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractEROWithSubobjectsParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractEROWithSubobjectsParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractPccIdReqObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractPccIdReqObjectParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractPceIdObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractPceIdObjectParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractRROWithSubobjectsParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractRROWithSubobjectsParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractVendorInformationObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractVendorInformationObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractXROWithSubobjectsParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractXROWithSubobjectsParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPBandwidthObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPClassTypeObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPClassTypeObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPCloseObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPCloseObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPEndPointsIpv4ObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPEndPointsIpv4ObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPEndPointsIpv6ObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPEndPointsIpv6ObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPErrorObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPErrorObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExcludeRouteObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExcludeRouteObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExistingBandwidthObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExistingBandwidthObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExplicitRouteObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExplicitRouteObjectParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPGlobalConstraintsObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPGlobalConstraintsObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPIncludeRouteObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPIncludeRouteObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPLoadBalancingObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLoadBalancingObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPLspaObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLspaObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPMetricObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPMetricObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPMonitoringObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPMonitoringObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPNoPathObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNoPathObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPNotificationObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNotificationObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPObjectiveFunctionObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPObjectiveFunctionObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOpenObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPOpenObjectParser.java with 99% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOverloadObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPOverloadObjectParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPathKeyObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPathKeyObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPccIdReqIPv4ObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPccIdReqIPv4ObjectParser.java with 96% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPccIdReqIPv6ObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPccIdReqIPv6ObjectParser.java with 96% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPceIdIPv4ObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPceIdIPv4ObjectParser.java with 96% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPceIdIPv6ObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPceIdIPv6ObjectParser.java with 96% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPProcTimeObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPProcTimeObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPReportedRouteObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPReportedRouteObjectParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPRequestParameterObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPRequestParameterObjectParser.java with 99% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPSvecObjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPSvecObjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/AsNumberCaseParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/AsNumberCaseParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROAsNumberSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROAsNumberSubobjectParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROExplicitExclusionRouteSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROExplicitExclusionRouteSubobjectParser.java with 99% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv4PrefixSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROIpv4PrefixSubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv6PrefixSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROIpv6PrefixSubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROLabelSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROLabelSubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROPathKey128SubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROPathKey128SubobjectParser.java with 95% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROPathKey32SubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROPathKey32SubobjectParser.java with 95% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROUnnumberedInterfaceSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROUnnumberedInterfaceSubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/GeneralizedLabelParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/GeneralizedLabelParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv4PrefixSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROIpv4PrefixSubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv6PrefixSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROIpv6PrefixSubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROLabelSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROLabelSubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROPathKey128SubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROPathKey128SubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROPathKey32SubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROPathKey32SubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROUnnumberedInterfaceSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROUnnumberedInterfaceSubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/Type1LabelParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/Type1LabelParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/WavebandSwitchingLabelParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/WavebandSwitchingLabelParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROAsNumberSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROAsNumberSubobjectParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv4PrefixSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROIpv4PrefixSubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv6PrefixSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROIpv6PrefixSubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROPathKey128SubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROPathKey128SubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROPathKey32SubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROPathKey32SubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROSRLGSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROSRLGSubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROUnnumberedInterfaceSubobjectParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROUnnumberedInterfaceSubobjectParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/AbstractVendorInformationTlvParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/AbstractVendorInformationTlvParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/AbstractVendorSpecificTlvParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/AbstractVendorSpecificTlvParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/NoPathVectorTlvParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/NoPathVectorTlvParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/OFListTlvParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/OFListTlvParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/OrderTlvParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/OrderTlvParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/OverloadedDurationTlvParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/OverloadedDurationTlvParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/PathSetupTypeTlvParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/PathSetupTypeTlvParser.java with 98% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/ReqMissingTlvParser.java [moved from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/ReqMissingTlvParser.java with 97% similarity]
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/util/Util.java [new file with mode: 0644]
pcep/base-parser/src/main/resources/META-INF/services/org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator [moved from pcep/impl/src/main/resources/META-INF/services/org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator with 63% similarity]
pcep/ietf-stateful07/pom.xml
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07ErrorMessageParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LspaObjectParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07OpenObjectParser.java
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java
pcep/impl/pom.xml
pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModule.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/LabelSubobjectParserTest.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPEROSubobjectParserTest.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPRROSubobjectParserTest.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPXROSubobjectParserTest.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationObjectParser.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParser.java
pcep/pom.xml
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/SrPathSetupTypeTlvParser.java
pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrObjectParserTest.java

index e7d55a6ed3adf9dec2e1261911a764d10d5d2fee..33c256d594809b8835e3c255e22e116ca6b267be 100644 (file)
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>pcep-base-parser</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>pcep-ietf-stateful07</artifactId>
index 0470a6cf6f08cc7f472c42e8761d08ebc556ee73..d96342342ddffde3fad7ca0e9b9c09dc7053c04e 100644 (file)
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-impl</artifactId>
       </dependency>
+      <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>pcep-base-parser</artifactId>
+      </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-segment-routing</artifactId>
index ba5a77ed25a2d02551ce69594f2327aed3f2a3b0..a7fb6c16caaeb5e750f8683cee97acf9d9b02fde 100644 (file)
@@ -60,6 +60,7 @@
     <feature name='odl-bgpcep-pcep-impl' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-pcep-dependencies</feature>
         <feature version='${project.version}'>odl-bgpcep-pcep-api</feature>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-base-parser/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/pcep-impl/{{VERSION}}</bundle>
     </feature>
 
index fab0809309b0d4c1c1bbcd4022b6563ce3814a94..cc56bf1ad777ec6346bf640b3d4175fda084fd8b 100644 (file)
@@ -11,7 +11,6 @@ package org.opendaylight.protocol.pcep.auto.bandwidth.extension;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-
 import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -24,7 +23,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
-import org.opendaylight.protocol.pcep.impl.Activator;
+import org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.pojo.SimplePCEPExtensionProviderContext;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
@@ -56,14 +55,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev
 public class PcRptMessageCodecTest {
 
     private SimplePCEPExtensionProviderContext ctx;
-    private Activator act;
+    private BaseParserExtensionActivator act;
     private StatefulActivator statefulAct;
     private org.opendaylight.protocol.pcep.auto.bandwidth.extension.Activator autoBwActivator;
 
     @Before
     public void setUp() {
         this.ctx = new SimplePCEPExtensionProviderContext();
-        this.act = new Activator();
+        this.act = new BaseParserExtensionActivator();
         this.act.start(this.ctx);
         this.statefulAct = new StatefulActivator();
         this.statefulAct.start(this.ctx);
diff --git a/pcep/base-parser/pom.xml b/pcep/base-parser/pom.xml
new file mode 100644 (file)
index 0000000..0c57599
--- /dev/null
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/bgpcep.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/bgpcep.git</developerConnection>
+        <url>https://wiki.opendaylight.org/view/BGP_LS_PCEP:Main</url>
+        <tag>HEAD</tag>
+    </scm>
+    <parent>
+        <groupId>org.opendaylight.bgpcep</groupId>
+        <artifactId>pcep-parent</artifactId>
+        <version>0.6.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>pcep-base-parser</artifactId>
+    <description>PCE Protocol base parser extension provider</description>
+    <packaging>bundle</packaging>
+    <name>${project.artifactId}</name>
+    <prerequisites>
+        <maven>3.0.4</maven>
+    </prerequisites>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>ietf-inet-types-2013-07-15</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+  <!--
+      Maven Site Configuration
+
+      The following configuration is necessary for maven-site-plugin to
+      correctly identify the correct deployment path for OpenDaylight Maven
+      sites.
+  -->
+  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+  <distributionManagement>
+    <site>
+      <id>opendaylight-site</id>
+      <url>${nexus.site.url}/${project.artifactId}/</url>
+    </site>
+  </distributionManagement>
+</project>
similarity index 84%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Activator.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java
index 6b71285b9f4856def2a9324d27e1a3a96e45533c..957944b2a85c3fb6db716cec9e7cbabadd5ea00e 100644 (file)
@@ -5,78 +5,78 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl;
+package org.opendaylight.protocol.pcep.parser;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.opendaylight.protocol.pcep.impl.message.PCEPCloseMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPErrorMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPKeepAliveMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPMonitoringReplyMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPMonitoringRequestMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPNotificationMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPOpenMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPReplyMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPRequestMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPStartTLSMessageParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPBandwidthObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPClassTypeObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPCloseObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPEndPointsIpv4ObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPEndPointsIpv6ObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPErrorObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPExcludeRouteObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPExistingBandwidthObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPExplicitRouteObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPGlobalConstraintsObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPIncludeRouteObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPLoadBalancingObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPLspaObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPMetricObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPMonitoringObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPNoPathObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPNotificationObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPObjectiveFunctionObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPOpenObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPOverloadObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPPathKeyObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPPccIdReqIPv4ObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPPccIdReqIPv6ObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPPceIdIPv4ObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPPceIdIPv6ObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPProcTimeObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPReportedRouteObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPRequestParameterObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPSvecObjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROAsNumberSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROIpv4PrefixSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROIpv6PrefixSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROLabelSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROPathKey128SubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROPathKey32SubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROUnnumberedInterfaceSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.GeneralizedLabelParser;
-import org.opendaylight.protocol.pcep.impl.subobject.RROIpv4PrefixSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.RROIpv6PrefixSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.RROLabelSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.RROPathKey128SubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.RROPathKey32SubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.RROUnnumberedInterfaceSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.Type1LabelParser;
-import org.opendaylight.protocol.pcep.impl.subobject.WavebandSwitchingLabelParser;
-import org.opendaylight.protocol.pcep.impl.subobject.XROAsNumberSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.XROIpv4PrefixSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.XROIpv6PrefixSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.XROPathKey128SubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.XROPathKey32SubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.XROSRLGSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.XROUnnumberedInterfaceSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.tlv.NoPathVectorTlvParser;
-import org.opendaylight.protocol.pcep.impl.tlv.OFListTlvParser;
-import org.opendaylight.protocol.pcep.impl.tlv.OrderTlvParser;
-import org.opendaylight.protocol.pcep.impl.tlv.OverloadedDurationTlvParser;
-import org.opendaylight.protocol.pcep.impl.tlv.PathSetupTypeTlvParser;
-import org.opendaylight.protocol.pcep.impl.tlv.ReqMissingTlvParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPCloseMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPErrorMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPKeepAliveMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPMonitoringReplyMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPMonitoringRequestMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPNotificationMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPOpenMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPReplyMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPRequestMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPStartTLSMessageParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPBandwidthObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPClassTypeObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPCloseObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPEndPointsIpv4ObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPEndPointsIpv6ObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPErrorObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPExcludeRouteObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPExistingBandwidthObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPExplicitRouteObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPGlobalConstraintsObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPIncludeRouteObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPLoadBalancingObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPLspaObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPMetricObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPMonitoringObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPNoPathObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPNotificationObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPObjectiveFunctionObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPOpenObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPOverloadObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPPathKeyObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPPccIdReqIPv4ObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPPccIdReqIPv6ObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPPceIdIPv4ObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPPceIdIPv6ObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPProcTimeObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPReportedRouteObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPRequestParameterObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPSvecObjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROAsNumberSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROIpv4PrefixSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROIpv6PrefixSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROLabelSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROPathKey128SubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROPathKey32SubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROUnnumberedInterfaceSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.GeneralizedLabelParser;
+import org.opendaylight.protocol.pcep.parser.subobject.RROIpv4PrefixSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.RROIpv6PrefixSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.RROLabelSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.RROPathKey128SubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.RROPathKey32SubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.RROUnnumberedInterfaceSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.Type1LabelParser;
+import org.opendaylight.protocol.pcep.parser.subobject.WavebandSwitchingLabelParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROAsNumberSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROIpv4PrefixSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROIpv6PrefixSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROPathKey128SubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROPathKey32SubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROSRLGSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROUnnumberedInterfaceSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.tlv.NoPathVectorTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.OFListTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.OrderTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.OverloadedDurationTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.PathSetupTypeTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.ReqMissingTlvParser;
 import org.opendaylight.protocol.pcep.spi.EROSubobjectRegistry;
 import org.opendaylight.protocol.pcep.spi.LabelRegistry;
 import org.opendaylight.protocol.pcep.spi.ObjectRegistry;
@@ -134,7 +134,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.label.subobject.label.type.Type1LabelCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.label.subobject.label.type.WavebandSwitchingLabelCase;
 
-public final class Activator extends AbstractPCEPExtensionProviderActivator {
+public final class BaseParserExtensionActivator extends AbstractPCEPExtensionProviderActivator {
     @Override
     protected List<AutoCloseable> startImpl(final PCEPExtensionProviderContext context) {
         final List<AutoCloseable> regs = new ArrayList<>();
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPCloseMessageParser.java
index ee72b870641e1cf65a4171f2e24d45fbec3ab558..abc1a6f4d811859969d6e8c659a34eb37bf532b6 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.message;
+package org.opendaylight.protocol.pcep.parser.message;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 99%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPErrorMessageParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java
index 2f3ee849c634b8cdeae065d5b6045507434b8146..69e400a901e657bc8dfbecf3cf610e505463a269 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.message;
+package org.opendaylight.protocol.pcep.parser.message;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPKeepAliveMessageParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPKeepAliveMessageParser.java
index c2590608997bdf4d62547dca67037671d8beff08..a4f5c403e622febdd3a06c03d5c373ee623d53cd 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.message;
+package org.opendaylight.protocol.pcep.parser.message;
 
 import com.google.common.base.Preconditions;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPMonitoringReplyMessageParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringReplyMessageParser.java
index dd65446a5102eb7db66fba21599bf50ad76f42e2..4fafc27ca3c4f8aa7e9ed4c1f8b7743896c64cca 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.message;
+package org.opendaylight.protocol.pcep.parser.message;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
@@ -14,7 +14,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.ArrayList;
 import java.util.List;
-import org.opendaylight.protocol.pcep.impl.spi.Util;
+import org.opendaylight.protocol.pcep.parser.util.Util;
 import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.MessageUtil;
 import org.opendaylight.protocol.pcep.spi.ObjectRegistry;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPMonitoringRequestMessageParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringRequestMessageParser.java
index efabe43e741dfa4b807d496f36cee9b5326a29fb..c9bc7ea4b17f3f462a25edf130dd894592756ffd 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.message;
+package org.opendaylight.protocol.pcep.parser.message;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
similarity index 99%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPNotificationMessageParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPNotificationMessageParser.java
index 307a62c7c0ffd2aa08a805941252c7ae2d8e0869..fc084e53d9db0f31e8ffc11199bf86326af86476 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.message;
+package org.opendaylight.protocol.pcep.parser.message;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPOpenMessageParser.java
index 73c70aa958373006035410b2d737958c6bc84b9b..b2416e2f0aa0be2919e3c10fcc01e625d7cae292 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.message;
+package org.opendaylight.protocol.pcep.parser.message;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 99%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java
index baec04d8e54b6a571c31475892b2fc1bd6b02525..968c500cdb61e78457975fbde2f22b79aed6c8fa 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.message;
+package org.opendaylight.protocol.pcep.parser.message;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
@@ -13,7 +13,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.ArrayList;
 import java.util.List;
-import org.opendaylight.protocol.pcep.impl.spi.Util;
+import org.opendaylight.protocol.pcep.parser.util.Util;
 import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.MessageUtil;
 import org.opendaylight.protocol.pcep.spi.ObjectRegistry;
similarity index 99%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java
index 8c25628fb92f2665cf417a6ecf0fca3754ce779e..9033fafc36b0f48bed7f9c041ae9b4cbce559057 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.message;
+package org.opendaylight.protocol.pcep.parser.message;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPStartTLSMessageParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPStartTLSMessageParser.java
index 08ddf6031e334113e6cdb7da3f3d84f0458b13a2..f78ecb5d31c3508dc213eb632750d587ceacb900 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.message;
+package org.opendaylight.protocol.pcep.parser.message;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractEROWithSubobjectsParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractEROWithSubobjectsParser.java
index b45303df7f4b8a3cf7eba59894cec988d0f28444..8fabbda136eb959c544f5f6edf6a62672051b2b7 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractPccIdReqObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractPccIdReqObjectParser.java
index a23673447a68f4972123d7089f3012c0de9103d4..a33b6d3058387a3733ba7e90f7caa3ed9e795ff6 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractPceIdObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractPceIdObjectParser.java
index a53296e3f277f1a1beadb9f47e904c87c19f30ba..8fb91dd33a4b38bf26fe98f576ebb6f68e752a11 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractRROWithSubobjectsParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractRROWithSubobjectsParser.java
index 5abe048750f393d4ca85b307365074f0a3156a2f..4e54d7f2fd1bddb4a87e1f30d250b706a8e386fa 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.pcep.spi.VendorInformationUtil.VENDOR_INFORMATION_OBJECT_CLASS;
 import static org.opendaylight.protocol.pcep.spi.VendorInformationUtil.VENDOR_INFORMATION_OBJECT_TYPE;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/AbstractXROWithSubobjectsParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractXROWithSubobjectsParser.java
index 82d859f7549076705f5ede452edce5eef6cf7ace..ef9ee45b2c7eb0ebed81629ed5b586c51f924a5c 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.UnsignedBytes;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPBandwidthObjectParser.java
index 722f8a78d48456c539469048442205a27ce78857..4ec074aad9f320829f99241453424c970e3dc112 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeFloat32;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPClassTypeObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPClassTypeObjectParser.java
index 42195ea41bf54e63bbf1b0fddcfca02a2456f697..5958efd75670b86adfea1c912b2173ce95c52698 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPCloseObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPCloseObjectParser.java
index e449fd5623e1cab82846cfa64d2dd42b09fe4e07..eb77a09a22d49fdcba81f7faef1776f4e323421b 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPEndPointsIpv4ObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPEndPointsIpv4ObjectParser.java
index 2fb2b034c47452dd55277c12c2f593b7773b4dd3..c1af45016e35aa39352463d92656ce4a30994c3a 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv4Address;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPEndPointsIpv6ObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPEndPointsIpv6ObjectParser.java
index 3a3335844126329d945995251e9333b4002149a9..64c480784c26a4ff01fe98ff4e3715430359f01a 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv6Address;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPErrorObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPErrorObjectParser.java
index c960edf7d9feab3182772d69377cda20b3d0b9dc..7e61b1cd867804e8037c492dff721107f81596af 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExcludeRouteObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExcludeRouteObjectParser.java
index 2e409f3860228512e06126780b6d2b42d73ffe46..9fa88deb5e7223ea9e2aaa6f73ff18f2455bee06 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeBoolean;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExistingBandwidthObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExistingBandwidthObjectParser.java
index 6b6d320e1e20842d079eb2f1f09fcda16df91b0a..12daa6c496f861c0a10d961a4c64bd73a442bb7f 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeFloat32;
 
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPExplicitRouteObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExplicitRouteObjectParser.java
index e0bc5ad254ecaff2317d768e95a098edde3aa0f5..0c65d57454b2c885f46219647c108ef1466fd27d 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPGlobalConstraintsObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPGlobalConstraintsObjectParser.java
index d6c5787f95dc4cf227d4f605712114367cd93b3a..fd3d90dad4911bd3b16edbb7c7ea3d7dd668e1d5 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPIncludeRouteObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPIncludeRouteObjectParser.java
index 5d141a175076d452b3a717bb4fe15fc0b9c30248..c48b373f74203bf5360afce71a153e8465e8d0e9 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLoadBalancingObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPLoadBalancingObjectParser.java
index c035a56156cf379fc4a6159446999efd9a08f1fa..dfe2db04539c7d1ccf01ae7187628e88d1504ad0 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeFloat32;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLspaObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPLspaObjectParser.java
index 628485a8d4f2958dbd91ddc72169316e338d9659..7ff06c6acd671ffd80b404cc220705ef3118837f 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPMetricObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPMetricObjectParser.java
index 33bd86b612b6b874a179726be774eb3c1c0615de..58db1b40ad10dd1354036f0c62916d7fefd17fd3 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeFloat32;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPMonitoringObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPMonitoringObjectParser.java
index d1bf390ea3685145ec6b0cb99a0cea82d9f494fa..ab51e4dd559e3599611c7840bd4c12c64b0da33a 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNoPathObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPNoPathObjectParser.java
index 8df98be321c4ed0e1d07d35c8027a24bf6be0ba8..d85b22da44f5dc506881eab208f9bdc12a381722 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNotificationObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPNotificationObjectParser.java
index bf095a438e83a1e338e755f5871a32b66409892c..b4351b409331cb2c42d21fd96a46ef26be922a78 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPObjectiveFunctionObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPObjectiveFunctionObjectParser.java
index b0f50abcdfb85c364cb26314a31979c4590c09af..7a2a863906c19af2773c48b7d30eeb028ac88e5a 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedShort;
 
similarity index 99%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPOpenObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOpenObjectParser.java
index 19cc81f3870934a69eec06dcf75a92246572ccdc..fad65d74c630c33c256da743c09e67c903f2b05b 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
 
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPOverloadObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOverloadObjectParser.java
index 7878ffa785ef90d7cf619e1e7646f294b7113816..02deb0802de23300e63a770daff2bfe230abf262 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPathKeyObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPathKeyObjectParser.java
index 0df1eac2f852a65b2dd98bc90eae80ccbf057f6d..768945040991f2b911c62d7fcf0335d187a9bdcb 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 
similarity index 96%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPccIdReqIPv4ObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPccIdReqIPv4ObjectParser.java
index dde09db1858fdc61858b168881f45cf303c51689..3fea1fd826d58619710c9142eb175469b6ab914b 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 96%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPccIdReqIPv6ObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPccIdReqIPv6ObjectParser.java
index 3d9588d232585b20942599aba9be518b9074dd36..21cb18799b38eb7c612be691cc70d9a066eb3d50 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 96%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPceIdIPv4ObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPceIdIPv4ObjectParser.java
index 8ffa532c5999330c1a957e66a150c91163093bc6..10a293782feb776522518dcf28a9f96c97d1ba8a 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 96%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPPceIdIPv6ObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPceIdIPv6ObjectParser.java
index f25cc7121e3d128f0d740bfeea42f317242dd871..c4f08c732cb05278d2ab040de6063cbc072b8397 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPProcTimeObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPProcTimeObjectParser.java
index 601db89a8ceb4d4eb203e6d2056d62d89908c9e0..290de595a117276c65ce70b16d5b832d0d51b09a 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.INT_BYTES_LENGTH;
 
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPReportedRouteObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPReportedRouteObjectParser.java
index 190c179fce9e4a87f61de4ae8a0fa3120e5f7db5..f89323160cfddc703149d08150b4e1f8b9413920 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import com.google.common.base.Preconditions;
 
similarity index 99%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPRequestParameterObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPRequestParameterObjectParser.java
index 83ff724298a2c00a4a5f9cef0bf5d3a9c09005a7..9ca024200599435df0a1397c3e95c1bae0820ee2 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPSvecObjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPSvecObjectParser.java
index 2512d00c57ef5d1a8bab2bff002a24702f4e1ec5..0f088643ef99783fac444589ca9e6ba9a378a167 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.object;
+package org.opendaylight.protocol.pcep.parser.object;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
 
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/AsNumberCaseParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/AsNumberCaseParser.java
index 97a5998ba7932f7589fe1727bc3fc59a4fd832b0..48944fdc555fe3c9481c7030a28c69cac69d12a5 100644 (file)
@@ -5,10 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeShort;
-
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROAsNumberSubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROAsNumberSubobjectParser.java
index 8981aff14b95d641c5bb14a71cec76d1d00790c6..a681b5f18796e880c6c50814120a2f1d5c5daec3 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROIpv4PrefixSubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv4PrefixSubobjectParser.java
index 8bf9c43f4790b25dce5e8423fa0a5b9012b922cb..335ba9f166d03a8156273853e866bc510d59f1ee 100644 (file)
@@ -5,10 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv4Prefix;
-
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROIpv6PrefixSubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv6PrefixSubobjectParser.java
index 0b17791a5aeb27b2437e3eeea773728191c0e6c3..03d9817ed4ec0d60c9d48e29e79b7e5039ac8fcf 100644 (file)
@@ -5,10 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv6Prefix;
-
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROLabelSubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROLabelSubobjectParser.java
index 7aa775f6b4b4e8f785be7cd48ba809ef3b668806..0b42f31691a4c2f2ca7dd44f1fbf626f3a91f129 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 95%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROPathKey128SubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROPathKey128SubobjectParser.java
index 00a40be545212fb3e06464b68dc3e1af0b6fc302..0a3978812ad189c37818d6955eb5a0d3ceb8a858 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.pcep.spi.AbstractEROPathKeySubobjectParser;
similarity index 95%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/EROPathKey32SubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROPathKey32SubobjectParser.java
index 4a1550e6a89ebe5e25fb51299ef3f9e17615fa45..dc22e536676140adc634256af4eef5c1e979ed31 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.pcep.spi.AbstractEROPathKeySubobjectParser;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
 
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/GeneralizedLabelParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/GeneralizedLabelParser.java
index 6bf1a3db4923f470a54b6f0ca3dc68ed2419051a..c79aaf50c04dc45109bf103ae00c8675d4d1f038 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROIpv4PrefixSubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv4PrefixSubobjectParser.java
index b4d245cba4247aae253b3c625822534632f6e6fc..41bbf871312cf118ba3c10878d02c680a1cf413f 100644 (file)
@@ -5,10 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv4Prefix;
-
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROIpv6PrefixSubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv6PrefixSubobjectParser.java
index f73845e82cb101107e72449025fa74a4cc1f19f9..b10ecb93528f5dc9f931843138c3cd05e249446a 100644 (file)
@@ -5,10 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv6Prefix;
-
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROLabelSubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROLabelSubobjectParser.java
index 33a000f4502f2031911f0c40978c11934d06ca86..ca1e361e6c1aaebcc4b8c6aac009d80131a7b464 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROPathKey128SubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROPathKey128SubobjectParser.java
index 7e382ca5ef919e0df6233d398dd1198697a098b5..23c816a24cb8cca0ed7387aa58dfbab30732045f 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedShort;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/RROPathKey32SubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROPathKey32SubobjectParser.java
index 36ef6697cc732a68117952c4e206c96719a0b05e..9ffb9933914caab7687cc204a3c2bdd1e6b2f272 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedShort;
 
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/Type1LabelParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/Type1LabelParser.java
index 71e9441c0b7df0a5e560f5e58c0d761dcf8b83b8..e7a9053bc0d22a99f9f023fc9af999c4747e2279 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/WavebandSwitchingLabelParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/WavebandSwitchingLabelParser.java
index a7ada0bd6c87d696d7cd0a4f646f2b783524f0f4..7bcb77b38df271ba4cc2f5f102d858ef3a0eb170 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
 
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROAsNumberSubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROAsNumberSubobjectParser.java
index c6097933a5121af9aa0d679400f5ed32944b9fd5..10e1aa2f97da0298943804edf68070c4a51d8e2a 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROIpv4PrefixSubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv4PrefixSubobjectParser.java
index 41edcd9dcd9c47e64e9f4655058a89ade667ce5c..dbd96440c32f0f8bcf2c0d14f0ba5260572e61d7 100644 (file)
@@ -5,11 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv4Prefix;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
-
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROIpv6PrefixSubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv6PrefixSubobjectParser.java
index bda94b222f78020f0e2408283cdc0c68792a5630..881824b8606a7ee9d20b5aef815d49542996cefc 100644 (file)
@@ -5,11 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv6Prefix;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
-
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROPathKey128SubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROPathKey128SubobjectParser.java
index 296220f85720af60450ff1ceeb454707f60163ec..ac71617e7494fe64df1037a07e692458ff153eaf 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedShort;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROPathKey32SubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROPathKey32SubobjectParser.java
index 29e417b898201e32ecac259c88745e6d52e2922c..e002027ac921f00edc54af37f9ebaa0344cdb18a 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedShort;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/subobject/XROSRLGSubobjectParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROSRLGSubobjectParser.java
index 281c3ab09a4d2ef30f15444eb7dd8d15d0c87a50..0f9a4ce75c9ced8cf04bdce637d2b9e74a2bfb49 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.subobject;
+package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/AbstractVendorInformationTlvParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/AbstractVendorInformationTlvParser.java
index b006b7558b58c1f7020444b4b904c29235843866..7e6a63022722f0caf1c540e45f7c1d5348a35956 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.tlv;
+package org.opendaylight.protocol.pcep.parser.tlv;
 
 import static org.opendaylight.protocol.pcep.spi.VendorInformationUtil.VENDOR_INFORMATION_TLV_TYPE;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/AbstractVendorSpecificTlvParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/AbstractVendorSpecificTlvParser.java
index cd4eaad4358b1a862dbc0845e9db1a738943dedc..2ca7739113f7f5ea618f30c47025d68ceb428aa5 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.tlv;
+package org.opendaylight.protocol.pcep.parser.tlv;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/NoPathVectorTlvParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/NoPathVectorTlvParser.java
index f8822f8efb60a1fdbfdf62e7acbba3914a19e6b5..c8200bfdff7322ab77747a8def1445f92cd09659 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.tlv;
+package org.opendaylight.protocol.pcep.parser.tlv;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/OFListTlvParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/OFListTlvParser.java
index 7e5031c93082e92afd0aea53a1574eae2db34704..ec6c31a8ae4861f1a723a053e07f432a95250ca4 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.tlv;
+package org.opendaylight.protocol.pcep.parser.tlv;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedShort;
 
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/OrderTlvParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/OrderTlvParser.java
index 694aef576e29ff3cabdee637c90ea12c95501416..d9d9f757335f429ad890ecb1b357bd9d750d8878 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.tlv;
+package org.opendaylight.protocol.pcep.parser.tlv;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
 
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/OverloadedDurationTlvParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/OverloadedDurationTlvParser.java
index 1075895e09ef3772fee6a98b35900eaab63421bb..ef34897d0268dd1f563fac5fd33f5940ec60003d 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.tlv;
+package org.opendaylight.protocol.pcep.parser.tlv;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
 
similarity index 98%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/PathSetupTypeTlvParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/PathSetupTypeTlvParser.java
index 8f87502a7f9c80fa57737810b01bf4fb31791940..c1e85463a68406f08caf83bfe13237168e023201 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.pcep.impl.tlv;
+package org.opendaylight.protocol.pcep.parser.tlv;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
 
similarity index 97%
rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/ReqMissingTlvParser.java
rename to pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/ReqMissingTlvParser.java
index 91fddc1472a326f2875fabbe9973dfbf6314d6d9..5321e2c5b46f7f0bd248ac7a7f42156b82376538 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.pcep.impl.tlv;
+package org.opendaylight.protocol.pcep.parser.tlv;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
 
diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/util/Util.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/util/Util.java
new file mode 100644 (file)
index 0000000..41d7c16
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.protocol.pcep.parser.util;
+
+import java.util.List;
+import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.monitoring.metrics.MetricPce;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.monitoring.metrics.MetricPceBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.overload.object.Overload;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pce.id.object.PceId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.proc.time.object.ProcTime;
+
+/**
+ * Utilities used in pcep-base-parser
+ */
+public final class Util {
+
+    private Util() {
+        throw new UnsupportedOperationException();
+    }
+
+    private static State insertObject(final MetricPceBuilder metricPceBuilder, final State state, final Object obj) {
+        switch(state) {
+        case START :
+            if (obj instanceof ProcTime) {
+                metricPceBuilder.setProcTime((ProcTime) obj);
+                return State.PROC_TIME;
+            }
+        case PROC_TIME :
+            if (obj instanceof Overload) {
+                metricPceBuilder.setOverload((Overload) obj);
+                return State.OVERLOAD;
+            }
+        case OVERLOAD :
+        case END :
+            return State.END;
+        default:
+            return state;
+        }
+    }
+
+    public static MetricPce validateMonitoringMetrics(final List<Object> objects) throws PCEPDeserializerException {
+        final MetricPceBuilder metricPceBuilder = new MetricPceBuilder();
+        if (!(objects.get(0) instanceof PceId)) {
+            throw new PCEPDeserializerException("metric-pce-list must start with PCE-ID object.");
+        }
+        metricPceBuilder.setPceId((PceId) (objects.get(0)));
+        objects.remove(0);
+        State state = State.START;
+        while (!objects.isEmpty() && !state.equals(State.END)) {
+            final Object obj = objects.get(0);
+            state = insertObject(metricPceBuilder, state, obj);
+            if (!state.equals(State.END)) {
+                objects.remove(0);
+            }
+        }
+        return metricPceBuilder.build();
+    }
+
+    private enum State {
+        START, PROC_TIME, OVERLOAD, END;
+    }
+}
@@ -1,7 +1,7 @@
 # Copyright (c)2013 Cisco Systems, Inc. All rights reserved.
-# 
+#
 # This program and the accompanying materials are made available
-# under the terms of the Eclipse Public License v1.0 which 
+# under the terms of the Eclipse Public License v1.0 which
 # accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-org.opendaylight.protocol.pcep.impl.Activator
+org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator
index e63f80a4c8086c082c9fdef84cee724f72510563..524a54610833d2c457cfdff4b8bfcdccd6eb8100 100644 (file)
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-impl</artifactId>
+            <artifactId>pcep-base-parser</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
index 006b4b15d08b8bf48e7dff6361ad74e5f121954e..12a3d0c17d26bc209fdcdbd1a1a4c112e77edac0 100644 (file)
@@ -12,7 +12,7 @@ import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import java.util.ArrayList;
 import java.util.List;
-import org.opendaylight.protocol.pcep.impl.message.PCEPErrorMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPErrorMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
index ae6bca64e267c7c4367b762fcb887e415e606b75..0290ff25e356bf6027176177f14483762985b16a 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.protocol.pcep.ietf.stateful07;
 
 import io.netty.buffer.ByteBuf;
-import org.opendaylight.protocol.pcep.impl.object.PCEPLspaObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPLspaObjectParser;
 import org.opendaylight.protocol.pcep.spi.TlvRegistry;
 import org.opendaylight.protocol.pcep.spi.VendorInformationTlvRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.Tlvs2;
index 71df41445543579c7c8b1aed66f67cfd008d41ed..95b842b07d6b93e4d3011773245aa7d7bd3c9150 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.protocol.pcep.ietf.stateful07;
 
 import io.netty.buffer.ByteBuf;
-import org.opendaylight.protocol.pcep.impl.object.PCEPOpenObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPOpenObjectParser;
 import org.opendaylight.protocol.pcep.spi.TlvRegistry;
 import org.opendaylight.protocol.pcep.spi.VendorInformationTlvRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.Tlvs1;
index 3686f31cf957a52764cfad79bc521142b1951f90..6f03421bca3d1f0f508cbcf10aee233cc0cd3bc3 100644 (file)
@@ -19,7 +19,7 @@ import org.opendaylight.protocol.pcep.ietf.initiated00.CInitiated00SrpObjectPars
 import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LspObjectParser;
 import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LspaObjectParser;
 import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
-import org.opendaylight.protocol.pcep.impl.Activator;
+import org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator;
 import org.opendaylight.protocol.pcep.spi.ObjectHeaderImpl;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvRegistry;
@@ -79,7 +79,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev
 public class PCEPObjectParserTest {
 
     private SimplePCEPExtensionProviderContext ctx;
-    private Activator act;
+    private BaseParserExtensionActivator act;
 
     private TlvRegistry tlvRegistry;
     private VendorInformationTlvRegistry viTlvRegistry;
@@ -90,7 +90,7 @@ public class PCEPObjectParserTest {
     @Before
     public void setUp() throws Exception {
         this.ctx = new SimplePCEPExtensionProviderContext();
-        this.act = new Activator();
+        this.act = new BaseParserExtensionActivator();
         this.act.start(this.ctx);
         this.tlvRegistry = ServiceLoaderPCEPExtensionProviderContext.create().getTlvHandlerRegistry();
         this.viTlvRegistry = ServiceLoaderPCEPExtensionProviderContext.getSingletonInstance().getVendorInformationTlvRegistry();
index f95150483a50f271a1bd509eb97eeb74b3ec078d..7ee87f3c505ed131727b93b4ee917f06d7246bec 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.protocol.pcep.ietf;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-
 import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -26,8 +25,8 @@ import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07ErrorMessagePars
 import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07PCReportMessageParser;
 import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07PCUpdateRequestMessageParser;
 import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
-import org.opendaylight.protocol.pcep.impl.Activator;
-import org.opendaylight.protocol.pcep.impl.message.PCEPOpenMessageParser;
+import org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator;
+import org.opendaylight.protocol.pcep.parser.message.PCEPOpenMessageParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.pojo.SimplePCEPExtensionProviderContext;
 import org.opendaylight.protocol.pcep.sync.optimizations.SyncOptimizationsActivator;
@@ -126,7 +125,7 @@ public class PCEPValidatorTest {
     private UnnumberedCase rroUnnumberedSub;
 
     private SimplePCEPExtensionProviderContext ctx;
-    private Activator act;
+    private BaseParserExtensionActivator act;
 
     private static final byte[] PCRT1 = {
         (byte) 0x20, (byte) 0x0A, (byte) 0x00, (byte) 0x20,
@@ -163,7 +162,7 @@ public class PCEPValidatorTest {
     @Before
     public void setUp() throws Exception {
         this.ctx = new SimplePCEPExtensionProviderContext();
-        this.act = new Activator();
+        this.act = new BaseParserExtensionActivator();
         this.act.start(this.ctx);
 
         final LspaBuilder lspaBuilder = new LspaBuilder();
index e6b764146a024bd9d06e36a5a2118b15eeff6ca5..38d540ff737d38689cd13c040307d6226d679b2f 100644 (file)
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-base-parser</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>rsvp-api</artifactId>
index 1c7c349c65633cf98b2ad2fba10a09ba85ce7dad..877ce035600d2cec15ae8a20d6a0b4d8d5c4f4c3 100644 (file)
@@ -16,7 +16,7 @@
  */
 package org.opendaylight.controller.config.yang.pcep.impl;
 
-import org.opendaylight.protocol.pcep.impl.Activator;
+import org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator;
 
 /**
  *
@@ -37,6 +37,6 @@ public final class BasePCEPParserModule extends org.opendaylight.controller.conf
 
     @Override
     public java.lang.AutoCloseable createInstance() {
-        return new Activator();
+        return new BaseParserExtensionActivator();
     }
 }
index 62bc03c892e2c5d6f7de267a60afa74606934a68..53db1d1dabf1eb7d7e72f5c2f9af646c9c0634c5 100644 (file)
@@ -8,17 +8,10 @@
 package org.opendaylight.protocol.pcep.impl.spi;
 
 import java.util.Arrays;
-import java.util.List;
-import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.PcerrBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.monitoring.metrics.MetricPce;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.monitoring.metrics.MetricPceBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.Open;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.overload.object.Overload;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pce.id.object.PceId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcep.error.object.ErrorObject;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcep.error.object.ErrorObjectBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.PcerrMessageBuilder;
@@ -26,7 +19,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.pcerr.message.ErrorsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.pcerr.message.error.type.SessionCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.pcerr.message.error.type.session._case.SessionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.proc.time.object.ProcTime;
 
 /**
  * Utilities used in pcep-impl
@@ -49,46 +41,4 @@ public final class Util {
                     new PcerrMessageBuilder().setErrors(Arrays.asList(new ErrorsBuilder().setErrorObject(err).build())).setErrorType(type).build()).build();
         }
     }
-
-    private static State insertObject(final MetricPceBuilder metricPceBuilder, final State state, final Object obj) {
-        switch(state) {
-        case START :
-            if (obj instanceof ProcTime) {
-                metricPceBuilder.setProcTime((ProcTime) obj);
-                return State.PROC_TIME;
-            }
-        case PROC_TIME :
-            if (obj instanceof Overload) {
-                metricPceBuilder.setOverload((Overload) obj);
-                return State.OVERLOAD;
-            }
-        case OVERLOAD :
-        case END :
-            return State.END;
-        default:
-            return state;
-        }
-    }
-
-    public static MetricPce validateMonitoringMetrics(final List<Object> objects) throws PCEPDeserializerException {
-        final MetricPceBuilder metricPceBuilder = new MetricPceBuilder();
-        if (!(objects.get(0) instanceof PceId)) {
-            throw new PCEPDeserializerException("metric-pce-list must start with PCE-ID object.");
-        }
-        metricPceBuilder.setPceId((PceId) (objects.get(0)));
-        objects.remove(0);
-        State state = State.START;
-        while (!objects.isEmpty() && !state.equals(State.END)) {
-            final Object obj = objects.get(0);
-            state = insertObject(metricPceBuilder, state, obj);
-            if (!state.equals(State.END)) {
-                objects.remove(0);
-            }
-        }
-        return metricPceBuilder.build();
-    }
-
-    private enum State {
-        START, PROC_TIME, OVERLOAD, END;
-    }
 }
index ff7a61671fcb93543f1afd55d843b8672a8e5927..76f28aafda409469e345aea40eeab78c5a4e02d8 100644 (file)
@@ -14,9 +14,9 @@ import static org.junit.Assert.fail;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
-import org.opendaylight.protocol.pcep.impl.subobject.GeneralizedLabelParser;
-import org.opendaylight.protocol.pcep.impl.subobject.Type1LabelParser;
-import org.opendaylight.protocol.pcep.impl.subobject.WavebandSwitchingLabelParser;
+import org.opendaylight.protocol.pcep.parser.subobject.GeneralizedLabelParser;
+import org.opendaylight.protocol.pcep.parser.subobject.Type1LabelParser;
+import org.opendaylight.protocol.pcep.parser.subobject.WavebandSwitchingLabelParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.label.subobject.label.type.GeneralizedLabelCaseBuilder;
index 80a680fef947700ca541c876a91ebda86fcd57a2..d414dd49bacfdb5d62d26ee658ca1acd5282fb3d 100644 (file)
@@ -17,14 +17,15 @@ import io.netty.buffer.Unpooled;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.protocol.pcep.impl.subobject.EROAsNumberSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROExplicitExclusionRouteSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROIpv4PrefixSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROIpv6PrefixSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROLabelSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROPathKey128SubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROPathKey32SubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.EROUnnumberedInterfaceSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator;
+import org.opendaylight.protocol.pcep.parser.subobject.EROAsNumberSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROExplicitExclusionRouteSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROIpv4PrefixSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROIpv6PrefixSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROLabelSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROPathKey128SubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROPathKey32SubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.EROUnnumberedInterfaceSubobjectParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.pojo.SimplePCEPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
@@ -69,12 +70,12 @@ public class PCEPEROSubobjectParserTest {
     private static final byte[] exrsBytes = { (byte) 0xa1, (byte) 0x06, (byte) 0xa0, (byte) 0x04, (byte) 0x00, (byte) 0x64 };
 
     private SimplePCEPExtensionProviderContext ctx;
-    private Activator act;
+    private BaseParserExtensionActivator act;
 
     @Before
     public void setUp() {
         this.ctx = new SimplePCEPExtensionProviderContext();
-        this.act = new Activator();
+        this.act = new BaseParserExtensionActivator();
         this.act.start(this.ctx);
     }
 
index 1e3888a2402d93c12b4e7e118c9d7b13ce6ea3d8..a5c94e5a9e97134bdc718117085f5db26897c2d7 100644 (file)
@@ -23,35 +23,36 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.pcep.impl.TestVendorInformationTlvParser.TestEnterpriseSpecificInformation;
-import org.opendaylight.protocol.pcep.impl.object.PCEPBandwidthObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPClassTypeObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPCloseObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPEndPointsIpv4ObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPEndPointsIpv6ObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPErrorObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPExcludeRouteObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPExistingBandwidthObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPExplicitRouteObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPGlobalConstraintsObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPIncludeRouteObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPLoadBalancingObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPLspaObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPMetricObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPMonitoringObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPNoPathObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPNotificationObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPObjectiveFunctionObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPOpenObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPOverloadObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPPathKeyObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPPccIdReqIPv4ObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPPccIdReqIPv6ObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPPceIdIPv4ObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPPceIdIPv6ObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPProcTimeObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPReportedRouteObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPRequestParameterObjectParser;
-import org.opendaylight.protocol.pcep.impl.object.PCEPSvecObjectParser;
+import org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator;
+import org.opendaylight.protocol.pcep.parser.object.PCEPBandwidthObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPClassTypeObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPCloseObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPEndPointsIpv4ObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPEndPointsIpv6ObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPErrorObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPExcludeRouteObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPExistingBandwidthObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPExplicitRouteObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPGlobalConstraintsObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPIncludeRouteObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPLoadBalancingObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPLspaObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPMetricObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPMonitoringObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPNoPathObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPNotificationObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPObjectiveFunctionObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPOpenObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPOverloadObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPPathKeyObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPPccIdReqIPv4ObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPPccIdReqIPv6ObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPPceIdIPv4ObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPPceIdIPv6ObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPProcTimeObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPReportedRouteObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPRequestParameterObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPSvecObjectParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHeaderImpl;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
@@ -142,13 +143,13 @@ public class PCEPObjectParserTest {
     private VendorInformationTlvRegistry viTlvRegistry;
 
     private SimplePCEPExtensionProviderContext ctx;
-    private Activator act;
+    private BaseParserExtensionActivator act;
     private TestVendorInformationActivator viAct;
 
     @Before
     public void setUp() {
         this.ctx = new SimplePCEPExtensionProviderContext();
-        this.act = new Activator();
+        this.act = new BaseParserExtensionActivator();
         this.viAct = new TestVendorInformationActivator();
         this.act.start(this.ctx);
         this.viAct.start(this.ctx);
index 174ae43a9b9dd9c2b40d174f54b832acb8fba836..18a833557fe7e064daa10a0eadc3a4462f3eadee 100644 (file)
@@ -14,12 +14,13 @@ import static org.junit.Assert.fail;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
-import org.opendaylight.protocol.pcep.impl.subobject.RROIpv4PrefixSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.RROIpv6PrefixSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.RROLabelSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.RROPathKey128SubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.RROPathKey32SubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.RROUnnumberedInterfaceSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator;
+import org.opendaylight.protocol.pcep.parser.subobject.RROIpv4PrefixSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.RROIpv6PrefixSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.RROLabelSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.RROPathKey128SubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.RROPathKey32SubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.RROUnnumberedInterfaceSubobjectParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.pojo.SimplePCEPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
@@ -198,7 +199,7 @@ public class PCEPRROSubobjectParserTest {
     @Test
     public void testRROLabelSubobject() throws Exception {
         final SimplePCEPExtensionProviderContext ctx = new SimplePCEPExtensionProviderContext();
-        try (Activator a = new Activator()) {
+        try (BaseParserExtensionActivator a = new BaseParserExtensionActivator()) {
             a.start(ctx);
             final RROLabelSubobjectParser parser = new RROLabelSubobjectParser(ctx.getLabelHandlerRegistry());
             final SubobjectBuilder subs = new SubobjectBuilder();
index cbd21943c81695ec5d096df95737b5a512c98787..d1adcb58db371c8ab098a3a36bddcea9ff00a304 100644 (file)
@@ -17,13 +17,13 @@ import io.netty.buffer.Unpooled;
 import java.util.List;
 import org.junit.Test;
 import org.opendaylight.protocol.pcep.impl.TestVendorInformationTlvParser.TestEnterpriseSpecificInformation;
-import org.opendaylight.protocol.pcep.impl.tlv.AbstractVendorSpecificTlvParser;
-import org.opendaylight.protocol.pcep.impl.tlv.NoPathVectorTlvParser;
-import org.opendaylight.protocol.pcep.impl.tlv.OFListTlvParser;
-import org.opendaylight.protocol.pcep.impl.tlv.OrderTlvParser;
-import org.opendaylight.protocol.pcep.impl.tlv.OverloadedDurationTlvParser;
-import org.opendaylight.protocol.pcep.impl.tlv.PathSetupTypeTlvParser;
-import org.opendaylight.protocol.pcep.impl.tlv.ReqMissingTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.AbstractVendorSpecificTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.NoPathVectorTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.OFListTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.OrderTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.OverloadedDurationTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.PathSetupTypeTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.ReqMissingTlvParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.iana.rev130816.EnterpriseNumber;
index a24add8674ff4bbe2c80fce64f1bf5e968a0c6ae..2587e78492dfff8cac475afa633f86205eb2e25b 100644 (file)
@@ -21,16 +21,17 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.pcep.impl.TestVendorInformationTlvParser.TestEnterpriseSpecificInformation;
-import org.opendaylight.protocol.pcep.impl.message.PCEPCloseMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPErrorMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPKeepAliveMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPMonitoringReplyMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPMonitoringRequestMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPNotificationMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPOpenMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPReplyMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPRequestMessageParser;
-import org.opendaylight.protocol.pcep.impl.message.PCEPStartTLSMessageParser;
+import org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator;
+import org.opendaylight.protocol.pcep.parser.message.PCEPCloseMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPErrorMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPKeepAliveMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPMonitoringReplyMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPMonitoringRequestMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPNotificationMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPOpenMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPReplyMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPRequestMessageParser;
+import org.opendaylight.protocol.pcep.parser.message.PCEPStartTLSMessageParser;
 import org.opendaylight.protocol.pcep.spi.ObjectRegistry;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.VendorInformationObjectRegistry;
@@ -165,13 +166,13 @@ public class PCEPValidatorTest {
     private AsNumberCase eroASSubobject;
 
     private SimplePCEPExtensionProviderContext ctx;
-    private Activator act;
+    private BaseParserExtensionActivator act;
     private TestVendorInformationActivator viObjAct;
 
     @Before
     public void setUp() throws Exception {
         this.ctx = new SimplePCEPExtensionProviderContext();
-        this.act = new Activator();
+        this.act = new BaseParserExtensionActivator();
         this.viObjAct = new TestVendorInformationActivator();
         this.act.start(this.ctx);
         this.viObjAct.start(this.ctx);
index 6f7fa30aa86eb3234753f824c57120727d5dac2b..14d292d8968e3b5ad8f8d120c12be94ae35a056d 100644 (file)
@@ -14,13 +14,13 @@ import static org.junit.Assert.fail;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
-import org.opendaylight.protocol.pcep.impl.subobject.XROAsNumberSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.XROIpv4PrefixSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.XROIpv6PrefixSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.XROPathKey128SubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.XROPathKey32SubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.XROSRLGSubobjectParser;
-import org.opendaylight.protocol.pcep.impl.subobject.XROUnnumberedInterfaceSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROAsNumberSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROIpv4PrefixSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROIpv6PrefixSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROPathKey128SubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROPathKey32SubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROSRLGSubobjectParser;
+import org.opendaylight.protocol.pcep.parser.subobject.XROUnnumberedInterfaceSubobjectParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv6Util;
index a9dbc53be1439e1d7c9fbaabb62474bc7bfa1d88..81087386fb5146949f77c2e2ff0e6a4607cef4c6 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.protocol.pcep.impl;
 import io.netty.buffer.ByteBuf;
 
 import org.opendaylight.protocol.pcep.impl.TestVendorInformationTlvParser.TestEnterpriseSpecificInformation;
-import org.opendaylight.protocol.pcep.impl.object.AbstractVendorInformationObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.AbstractVendorInformationObjectParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.iana.rev130816.EnterpriseNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.vendor.information.EnterpriseSpecificInformation;
index 8489e5d6a6e7135656aabbbe1095e0cd869cc539..cd8eadd453e7538a84d2962c6f353e2729904513 100644 (file)
@@ -9,8 +9,7 @@
 package org.opendaylight.protocol.pcep.impl;
 
 import io.netty.buffer.ByteBuf;
-
-import org.opendaylight.protocol.pcep.impl.tlv.AbstractVendorInformationTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.AbstractVendorInformationTlvParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.iana.rev130816.EnterpriseNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.vendor.information.EnterpriseSpecificInformation;
index 22c1f056071d73d93b636e890491a7949012ca47..304ccf0dbb5bdee551905c2f6e44cf2897b719ec 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.protocol.pcep.pcc.mock;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
-import org.opendaylight.protocol.pcep.impl.object.PCEPEndPointsIpv4ObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPEndPointsIpv4ObjectParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;
index a275a8ed7d15bfa9825ccb290c77de2151ac35d4..dcf0abf73cfb1f0a8bbf63471eb2da69fec1dd4b 100644 (file)
@@ -33,6 +33,7 @@
         <module>api</module>
         <module>impl</module>
         <module>spi</module>
+        <module>base-parser</module>
         <module>ietf-stateful07</module>
         <module>testtool</module>
         <module>topology-api</module>
index 1dc0151ca0a8e2b7d85cf98b4349d815966ed952..149ff0d24cc414858381748623d2df1b8f5de36f 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.protocol.pcep.segment.routing;
 
-import org.opendaylight.protocol.pcep.impl.tlv.PathSetupTypeTlvParser;
+import org.opendaylight.protocol.pcep.parser.tlv.PathSetupTypeTlvParser;
 
 public class SrPathSetupTypeTlvParser extends PathSetupTypeTlvParser {
 
index 6d623e46a61ce80bf2bdb66d9bd2399c05a32559..a86ccc926640c61f0bb607461517daa8b95ff681 100644 (file)
@@ -17,7 +17,7 @@ import io.netty.buffer.Unpooled;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.protocol.pcep.impl.object.PCEPExplicitRouteObjectParser;
+import org.opendaylight.protocol.pcep.parser.object.PCEPExplicitRouteObjectParser;
 import org.opendaylight.protocol.pcep.spi.ObjectHeaderImpl;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvRegistry;