Reorganize mappingservice.implementation 57/25457/9
authorFlorin Coras <fcoras@cisco.com>
Wed, 19 Aug 2015 00:54:24 +0000 (02:54 +0200)
committerFlorin Coras <fcoras@cisco.com>
Fri, 21 Aug 2015 12:55:40 +0000 (14:55 +0200)
commitc3571cac0b746ac1c554b220959a3205c4a84e20
tree5263d0983e6fc2152d1158ec5f8506e67d7fcdc1
parent979eed58cf39a32188e7b857dc891df5be88234b
Reorganize mappingservice.implementation

This consists of a number of incremental changes ultimately meant to
ensure the clear separation between the components implementing the LISP
control plane logic (MapServer/MapResolver) and the logic used to
manipulate the database that stores mapping state. This should give us
better isolation (i.e, should help testing) but also opens the
possibility to better optimize DAO/map-cache implementation for specific
use-cases, if needed.

Noteworthy changes:
- Move out code concerning logic behind CRUD operations on DAO from
  MapServer and MapResolver to DAOMappingUtil. In future patches the
  latter will be converted to a MapCache class instead of a helper
  class.
- Move serializer and LISP protocol utility functions from
  mappingservice.implementation to yangmodel.
- Remove bundle dependencies on mappingservice.implementation. Bundles
  should be importing mappingservice.api.
- Cleanup pom files

Change-Id: I199b8d2162cd2ab2b54cd3340eb24811fd6cd5be
Signed-off-by: Florin Coras <fcoras@cisco.com>
85 files changed:
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/IMappingKey.java [moved from mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/IMappingServiceKey.java with 94% similarity]
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/RLOCGroup.java [moved from mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/MappingServiceRLOCGroup.java with 83% similarity]
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/SubscriberRLOC.java [moved from mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/MappingServiceSubscriberRLOC.java with 88% similarity]
mappingservice/clusterdao/src/main/java/org/opendaylight/lispflowmapping/clusterdao/ClusterDAOService.java
mappingservice/implementation/pom.xml
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/LfmMappingDatabaseRpc.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/LispMappingService.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/authentication/LispMACAuthentication.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/dao/MappingKey.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/dao/MappingServiceKey.java with 85% similarity]
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/dao/MappingKeyUtil.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/dao/MappingServiceKeyUtil.java with 56% similarity]
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/dao/MappingNoMaskKey.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/dao/MappingServiceNoMaskKey.java with 82% similarity]
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/AbstractLispComponent.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/DataStoreBackEnd.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListener.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DAOMappingUtil.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DAOSubKeys.java [new file with mode: 0644]
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/InstanceIdentifierUtil.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MaskUtil.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/RPCInputConvertorUtil.java
mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/authentication/LispAuthenticationTest.java
mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolverTest.java
mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java
mappingservice/inmemorydb/src/main/java/org/opendaylight/lispflowmapping/inmemorydb/HashMapDb.java
mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
mappingservice/neutron/pom.xml
mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronPortHandler.java
mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronSubnetHandler.java
mappingservice/southbound/pom.xml
mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LfmControlPlaneRpc.java
mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java
mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundService.java
mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundService.java
mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/util/LispNotificationHelper.java [new file with mode: 0644]
mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundServiceTest.java
mappingservice/yangmodel/pom.xml
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/EidRecordSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/EidRecordSerializer.java with 81% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/EidToLocatorRecordSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/EidToLocatorRecordSerializer.java with 92% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/LocatorRecordSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/LocatorRecordSerializer.java with 88% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapNotifySerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/MapNotifySerializer.java with 87% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapRegisterSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/MapRegisterSerializer.java with 94% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapReplySerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/MapReplySerializer.java with 93% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapRequestSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/MapRequestSerializer.java with 94% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispAddressSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispAddressSerializer.java with 88% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispApplicationDataLCAFAddressSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispApplicationDataLCAFAddressSerializer.java with 91% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispDistinguishedNameAddressSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispDistinguishedNameAddressSerializer.java with 93% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispIpv4AddressSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispIpv4AddressSerializer.java with 93% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispIpv6AddressSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispIpv6AddressSerializer.java with 93% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispKeyValueLCAFSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispKeyValueLCAFSerializer.java with 91% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispLCAFAddressSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispLCAFAddressSerializer.java with 88% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispListLCAFAddressSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispListLCAFAddressSerializer.java with 90% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispMACAddressSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispMACAddressSerializer.java with 96% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispNoAddressSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispNoAddressSerializer.java with 91% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispSegmentLCAFAddressSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispSegmentLCAFAddressSerializer.java with 87% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispSourceDestLCAFAddressSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispSourceDestLCAFAddressSerializer.java with 91% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispTrafficEngineeringLCAFAddressSerializer.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispTrafficEngineeringLCAFAddressSerializer.java with 92% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/factory/LispAFIAddressSerializerFactory.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/factory/LispAFIAddressSerializerFactory.java with 63% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/factory/LispLCAFAddressSerializerFactory.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/factory/LispLCAFAddressSerializerFactory.java with 64% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/exception/LispSerializationException.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/exception/LispSerializationException.java with 89% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/type/AddressFamilyNumberEnum.java [moved from mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/AddressFamilyNumberEnum.java with 95% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/type/LispCanonicalAddressFormatEnum.java [moved from mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/LispCanonicalAddressFormatEnum.java with 95% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/type/LispMessage.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/LispMessage.java with 86% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/type/LispMessageEnum.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/LispMessageEnum.java with 93% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/util/ByteUtil.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/ByteUtil.java with 97% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAFIConvertor.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispAFIConvertor.java with 99% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifier.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispAddressStringifier.java with 99% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispPrimitiveAddressStringifier.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispPrimitiveAddressStringifier.java with 95% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MapNotifyBuilderHelper.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MapNotifyBuilderHelper.java with 96% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtil.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MapRequestUtil.java with 59% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MapServerMapResolverUtil.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MapServerMapResolverUtil.java with 98% similarity]
mappingservice/yangmodel/src/main/java/org/opendaylight/lispflowmapping/lisp/util/NumberUtil.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/NumberUtil.java with 93% similarity]
mappingservice/yangmodel/src/test/java/org/opendaylight/lispflowmapping/serializer/MapNotifySerializationTest.java [moved from mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/serializer/MapNotifySerializationTest.java with 98% similarity]
mappingservice/yangmodel/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java [moved from mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/serializer/MapRegisterSerializationTest.java with 98% similarity]
mappingservice/yangmodel/src/test/java/org/opendaylight/lispflowmapping/serializer/MapReplySerializationTest.java [moved from mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/serializer/MapReplySerializationTest.java with 98% similarity]
mappingservice/yangmodel/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRequestSerializationTest.java [moved from mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/serializer/MapRequestSerializationTest.java with 98% similarity]
mappingservice/yangmodel/src/test/java/org/opendaylight/lispflowmapping/serializer/address/LispApplicationDataLCAFAddressTest.java [moved from mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispApplicationDataLCAFAddressTest.java with 91% similarity]
mappingservice/yangmodel/src/test/java/org/opendaylight/lispflowmapping/serializer/address/LispDistinguishedNameAddressSerializerTest.java [moved from mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispDistinguishedNameAddressSerializerTest.java with 90% similarity]
mappingservice/yangmodel/src/test/java/org/opendaylight/lispflowmapping/serializer/address/LispIpv6AddressTest.java [moved from mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispIpv6AddressTest.java with 83% similarity]
mappingservice/yangmodel/src/test/java/org/opendaylight/lispflowmapping/serializer/address/LispKeyValueLCAFAddressTest.java [moved from mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispKeyValueLCAFAddressTest.java with 90% similarity]
mappingservice/yangmodel/src/test/java/org/opendaylight/lispflowmapping/serializer/address/LispListLCAFAddressTest.java [moved from mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispListLCAFAddressTest.java with 93% similarity]
mappingservice/yangmodel/src/test/java/org/opendaylight/lispflowmapping/serializer/address/LispSegmentLCAFAddressTest.java [moved from mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispSegmentLCAFAddressTest.java with 90% similarity]
mappingservice/yangmodel/src/test/java/org/opendaylight/lispflowmapping/serializer/address/LispSourceDestLCAFAddressTest.java [moved from mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispSourceDestLCAFAddressTest.java with 91% similarity]
mappingservice/yangmodel/src/test/java/org/opendaylight/lispflowmapping/serializer/address/LispTrafficEngineeringLCAFAddressTest.java [moved from mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispTrafficEngineeringLCAFAddressTest.java with 93% similarity]