make both templates reqiured when registering EP 18/38318/3
authorMichal Rehak <mirehak@cisco.com>
Mon, 2 May 2016 17:52:12 +0000 (19:52 +0200)
committerMartin Sunal <msunal@cisco.com>
Wed, 4 May 2016 13:36:05 +0000 (13:36 +0000)
commita24459ceba18a01d2a395cf6a2b077e71932d20d
tree06e737ab90c7453378ac029fc8fb35097782c9a3
parent108ea6cd97d062b3acd7775e02344e13d8f2ce89
make both templates reqiured when registering EP

    - fixed unit tests
    - changed template resolution
    - only if both templates are present then EP is registered
    - migrated to base-endpoint model

Change-Id: I1bda438a10ab5f71b1158485def689c3a406b3a0
Signed-off-by: Michal Rehak <mirehak@cisco.com>
16 files changed:
sxp-mapper/pom.xml
sxp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/sxp/mapper/api/SxpMapperReactor.java
sxp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/SxpMapperProviderImpl.java
sxp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/SxpMapperReactorImpl.java
sxp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/dao/SimpleCachedDaoEPForwardingTemplateImpl.java
sxp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/listen/EPForwardingTemplateListenerImpl.java
sxp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/listen/EPPolicyTemplateListenerImpl.java
sxp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/listen/MasterDatabaseBindingListenerImpl.java
sxp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/util/EPTemplateUtil.java [new file with mode: 0644]
sxp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/util/ForwardingTemplateUtil.java [deleted file]
sxp-mapper/src/test/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/SxpMapperReactorImplTest.java
sxp-mapper/src/test/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/listen/EPForwardingTemplateListenerImplTest.java
sxp-mapper/src/test/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/listen/EPPolicyTemplateListenerImplTest.java
sxp-mapper/src/test/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/listen/MasterDatabaseBindingListenerImplTest.java
sxp-mapper/src/test/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/util/EPTemplateUtilTest.java [moved from sxp-mapper/src/test/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/util/ForwardingTemplateUtilTest.java with 83% similarity]
sxp-mapper/src/test/resources/log4j.xml [new file with mode: 0644]