From f15aed916c69b0766c7bed2dc7fe534f48b97ac9 Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Thu, 14 Jul 2016 10:41:49 +0200 Subject: HONEYCOMB-122: Reader registry integration tests Add IT test for read infrastructure + some additional unit tests + Make Read/Write Factory autoCloseable Change-Id: I6eab8e6df2c2132af01cea0a9c4b9bece7dc9b74 Signed-off-by: Maros Marsalek --- .../ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModule.java | 5 ----- .../v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java | 5 ----- .../yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java | 5 ----- .../v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModule.java | 5 ----- .../xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java | 5 ----- .../ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModule.java | 5 ----- 6 files changed, 30 deletions(-) (limited to 'v3po/v3po2vpp') diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModule.java index 635c77a0b..7ac666b8a 100644 --- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModule.java +++ b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModule.java @@ -100,11 +100,6 @@ public class InterfacesHoneycombWriterModule extends this.classifyTableContext = classifyTableContextDependency; } - @Override - public void close() throws Exception { - // unregister is not supported in ModifiableWriterRegistry (not really needed though) - } - @Override public void init(final ModifiableWriterRegistryBuilder registry) { // Interfaces diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java index 83758d828..fb2f281f9 100644 --- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java +++ b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java @@ -150,10 +150,5 @@ public class InterfacesStateHoneycombReaderModule extends new GenericReader<>(vppIfcAugId.child(Acl.class), new AclCustomizer(jvpp, ifcCtx, classifyCtx))); } - - @Override - public void close() throws Exception { - // unregister not supported - } } } diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java index ca05b392b..5d15d16c2 100644 --- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java +++ b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java @@ -60,11 +60,6 @@ public class VppClassifierHoneycombWriterModule extends this.classifyTableContext = classifyTableContext; } - @Override - public void close() throws Exception { - // unregister is not supported in ModifiableWriterRegistry (not really needed though) - } - @Override public void init(final ModifiableWriterRegistryBuilder registry) { diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModule.java index 4a91f2679..80370fe9d 100644 --- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModule.java +++ b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModule.java @@ -55,10 +55,5 @@ public class VppClassifierStateHoneycombReaderModule extends org.opendaylight.ya final InstanceIdentifier classSesId = classTblId.child(ClassifySession.class); registry.add(new GenericListReader<>(classSesId, new ClassifySessionReader(jvpp, classifyCtx))); } - - @Override - public void close() throws Exception { - // Noop, no unregister provided - } } } diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java index ba42cfba5..4b31e2ebe 100644 --- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java +++ b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java @@ -56,11 +56,6 @@ public class VppHoneycombWriterModule extends this.ifcContext = interfaceContextVppDependency; } - @Override - public void close() throws Exception { - // unregister is not supported in ModifiableWriterRegistry (not really needed though) - } - @Override public void init(final ModifiableWriterRegistryBuilder registry) { // Vpp has no handlers diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModule.java index 4634a5b59..98d38c5f8 100644 --- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModule.java +++ b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModule.java @@ -134,11 +134,6 @@ public class VppStateHoneycombReaderModule extends this.keepaliveExecutor = keepaliveExecutorDependency; } - @Override - public void close() throws Exception { - // TODO unregister not available - } - @Override public void init(final ModifiableReaderRegistryBuilder registry) { // VppState(Structural) -- cgit 1.2.3-korg