Bump mdsal to 4.0.0 82/81282/17
authorRobert Varga <robert.varga@pantheon.tech>
Thu, 28 Mar 2019 21:46:26 +0000 (22:46 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Sat, 13 Apr 2019 09:34:13 +0000 (11:34 +0200)
This bumps mdsal to 4.0.0, adjusting for codegen changes.

Change-Id: If3d2e2c6ec1c70b95b3aae2105fe54de6c447000
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
100 files changed:
applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterTxChain.java
applications/bulk-o-matic/src/main/resources/OSGI-INF/blueprint/bulk-o-matic.xml
applications/bulk-o-matic/src/test/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterTxChainTest.java
applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/util/FrmUtil.java
applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/ReconcileUtil.java
applications/forwardingrules-sync/src/main/resources/OSGI-INF/blueprint/forwardingrules-sync.xml
applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java
applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImplTest.java
applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImplTest.java
drop-test-karaf/src/main/resources/OSGI-INF/blueprint/drop-test-karaf.xml
extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolver.java
extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2Convertor.java
extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolverTest.java
extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputReg2ConvertorTest.java
extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/converter/BundleAddMessageConverter.java
extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/serializer/BundleAddMessageFactory.java
extension/openflowplugin-extension-onf/src/test/java/org/opendaylight/openflowplugin/extension/onf/converter/BundleAddMessageConverterTest.java
features-aggregator/odl-openflowplugin-nsf-model/pom.xml
openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImpl.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestInputMessageFactory.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputFactory.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactory.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactory.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestDescInputMessageFactoryTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputDescFactoryTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputTableFactoryTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/ForwardingPingPongDataBroker.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartReplyTranslatorUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/configuration/OpenFlowProviderConfigImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyExperimenterDeserializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/MatchSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestExperimenterSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/util/ActionUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/util/InstructionUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartRequestOnTheFlyCallback.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractService.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/multilayer/MultiLayerExperimenterMultipartService.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalExperimenterMessageServiceImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/singlelayer/SingleLayerFlowService.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/singlelayer/SingleLayerGroupService.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/singlelayer/SingleLayerMeterService.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowTableStatisticsServiceImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlatBatchUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MatchUtil.java
openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/openflowplugin-impl.xml
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactoryTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImplTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ApplyActionsInstructionDeserializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ClearActionsInstructionDeserializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/GoToTableInstructionDeserializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/MeterInstructionDeserializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteActionsInstructionDeserializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteMetadataInstructionDeserializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowStatsDeserializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyTableFeaturesDeserializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/ServiceMocking.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/PacketProcessingServiceImplTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalExperimenterMessageServiceImplTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/singlelayer/SingleLayerAggregateFlowMultipartServiceTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/singlelayer/SingleLayerExperimenterMultipartServiceTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/singlelayer/SingleLayerFlowServiceTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/singlelayer/SingleLayerGroupServiceTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/singlelayer/SingleLayerMeterServiceTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/singlelayer/SingleLayerPortServiceTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/singlelayer/SingleLayerTableMultipartServiceTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowTableStatisticsServiceImplTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringOnTheFlyServiceTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringServiceTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/BarrierUtilTest.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ActionExtensionHelper.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorManager.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertor.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfVendorCodecCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/ConvertorProcessor.java
openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ActionExtensionHelperTest.java
openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupDescStatsResponseConvertorTest.java
openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConfigStatsResponseConvertorTest.java
openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertorTest.java
openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertorTest.java
openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorTest.java
openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV10Test.java
openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV13Test.java
openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/OrderComparatorTest.java
openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java
parent/pom.xml

index b8333bf135eb677ddace25eb22b9b33a80fe6952..b6e0b2664e0d5abd5006333f8b76fb671ed62cb4 100644 (file)
@@ -116,7 +116,7 @@ public class FlowWriterTxChain implements FlowCounterMBean {
             int newBatchSize = batchSize;
             LOG.info("Number of Txn for dpId: {} is: {}", dpId, numSubmits);
 
-            txChain = dataBroker.createTransactionChain(this);
+            txChain = dataBroker.createMergingTransactionChain(this);
             LOG.info("Creating new txChain: {} for dpid: {}", txChain, dpId);
 
             for (int i = 1; i <= numSubmits; i++) {
index 5b3c410740097d25f45765e26e578380306b13dc..425cd1e60373ee0ee20fdf4d14cf166c945dfb66 100644 (file)
@@ -3,7 +3,7 @@
            xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
         odl:use-default-for-reference-types="true">
 
-  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="pingpong"/>
+  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
 
   <odl:rpc-service id="flowService"
       interface="org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService"/>
index 72e8576db3e40bec19a03e369cf49d186afa1b29..6a1ec183f2bedf0f63bab364bec75aa4380ff8af 100644 (file)
@@ -25,8 +25,6 @@ import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Test for {@link FlowWriterTxChain}.
@@ -34,7 +32,6 @@ import org.slf4j.LoggerFactory;
 @RunWith(MockitoJUnitRunner.class)
 public class FlowWriterTxChainTest {
 
-    private static final Logger LOG = LoggerFactory.getLogger(FlowWriterTxChainTest.class);
     private static final int FLOWS_PER_DPN = 100;
 
     @Mock
@@ -57,7 +54,7 @@ public class FlowWriterTxChainTest {
         final TransactionChain mockedTxChain = mock(TransactionChain.class);
         when(mockedTxChain.newWriteOnlyTransaction()).thenReturn(writeTransaction);
         doReturn(mockedTxChain).when(mockDataBroker)
-                .createTransactionChain(ArgumentMatchers.any());
+                .createMergingTransactionChain(ArgumentMatchers.any());
 
         doReturn(CommitInfo.emptyFluentFuture()).when(writeTransaction).commit();
 
index 75eecebb7d322ecde880a934add58a67440e0726..85658f05c12f22b121e969ec85d93d48b1ef84de 100644 (file)
@@ -371,7 +371,7 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
                             }
                             for (Action action : actions) {
                                 // chained-port
-                                if (action.getAction().getImplementedInterface().getName()
+                                if (action.getAction().implementedInterface().getName()
                                         .equals("org.opendaylight.yang.gen.v1.urn.opendaylight"
                                                 + ".action.types.rev131112.action.action.OutputActionCase")) {
                                     String nodeConnectorUri = ((OutputActionCase) action.getAction()).getOutputAction()
@@ -395,7 +395,7 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
                                                 nodeConnectorUri, group.getGroupId().toString());
                                         break;
                                     }
-                                } else if (action.getAction().getImplementedInterface().getName()
+                                } else if (action.getAction().implementedInterface().getName()
                                         .equals("org.opendaylight.yang.gen.v1.urn.opendaylight"
                                                 + ".action.types.rev131112.action.action.GroupActionCase")) {
                                     // chained groups
index d28cb2c348dd42948fe9fc3196b0dbb6f296d60f..52b7ed46832860033205cb34805121ba8b7b1f8e 100644 (file)
@@ -68,13 +68,13 @@ public final class FrmUtil {
             List<Instruction> instructions = flow.getInstructions().getInstruction();
             for (Instruction instruction : instructions) {
                 List<Action> actions = Collections.emptyList();
-                if (instruction.getInstruction().getImplementedInterface()
+                if (instruction.getInstruction().implementedInterface()
                         .equals(ActionType.APPLY_ACTION.getActionType())) {
                     actions = ((ApplyActionsCase) instruction.getInstruction())
                             .getApplyActions().getAction();
                 }
                 for (Action action : actions) {
-                    if (action.getAction().getImplementedInterface()
+                    if (action.getAction().implementedInterface()
                             .equals(ActionType.GROUP_ACTION.getActionType())) {
                         return ((GroupActionCase) action.getAction()).getGroupAction()
                                 .getGroupId();
index f135fe266986451196b37c4e5ed036c36e718b56..a22b2f758ba1eaf99d6b4a6d1eb446b21a0b9181 100644 (file)
@@ -228,7 +228,7 @@ public final class ReconcileUtil {
         for (Bucket bucket : pendingGroup.getBuckets().getBucket()) {
             for (Action action : bucket.getAction()) {
                 // if the output action is a group
-                if (GroupActionCase.class.equals(action.getAction().getImplementedInterface())) {
+                if (GroupActionCase.class.equals(action.getAction().implementedInterface())) {
                     Long groupId = ((GroupActionCase) action.getAction()).getGroupAction().getGroupId();
                     // see if that output group is installed
                     if (!installedGroupIds.contains(groupId)) {
index d0474367a664c81dc299e637ad9ea3d5c33674a1..29ae9e37c8ffb95b1c99bb54313ab81e21a2803f 100644 (file)
@@ -10,7 +10,7 @@
            xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
            odl:use-default-for-reference-types="true">
 
-    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="pingpong"/>
+    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
     <reference id="rpcRegistry" interface="org.opendaylight.mdsal.binding.api.RpcConsumerRegistry"/>
     <reference id="clusterSingletonService" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
 
index 74aa5b653e3ead0f3bb76c3d3a65d6b181f33975..f9727bfc0d2b69d050020ad403fd1554aba68ab6 100644 (file)
@@ -158,10 +158,10 @@ public class SyncPlanPushStrategyFlatBatchImplTest {
 
         Assert.assertEquals(6, lastOrder);
         Assert.assertEquals(2, batchBag.size());
-        Assert.assertEquals(FlatBatchRemoveFlowCase.class, batchBag.get(0).getBatchChoice().getImplementedInterface());
+        Assert.assertEquals(FlatBatchRemoveFlowCase.class, batchBag.get(0).getBatchChoice().implementedInterface());
         Assert.assertEquals(3, ((FlatBatchRemoveFlowCase) batchBag.get(0).getBatchChoice())
                 .getFlatBatchRemoveFlow().size());
-        Assert.assertEquals(FlatBatchRemoveFlowCase.class, batchBag.get(1).getBatchChoice().getImplementedInterface());
+        Assert.assertEquals(FlatBatchRemoveFlowCase.class, batchBag.get(1).getBatchChoice().implementedInterface());
         Assert.assertEquals(3, ((FlatBatchRemoveFlowCase) batchBag.get(1).getBatchChoice())
                 .getFlatBatchRemoveFlow().size());
     }
@@ -173,13 +173,13 @@ public class SyncPlanPushStrategyFlatBatchImplTest {
 
         Assert.assertEquals(9, lastOrder);
         Assert.assertEquals(3, batchBag.size());
-        Assert.assertEquals(FlatBatchAddGroupCase.class, batchBag.get(0).getBatchChoice().getImplementedInterface());
+        Assert.assertEquals(FlatBatchAddGroupCase.class, batchBag.get(0).getBatchChoice().implementedInterface());
         Assert.assertEquals(3, ((FlatBatchAddGroupCase) batchBag.get(0).getBatchChoice())
                 .getFlatBatchAddGroup().size());
-        Assert.assertEquals(FlatBatchAddGroupCase.class, batchBag.get(1).getBatchChoice().getImplementedInterface());
+        Assert.assertEquals(FlatBatchAddGroupCase.class, batchBag.get(1).getBatchChoice().implementedInterface());
         Assert.assertEquals(3, ((FlatBatchAddGroupCase) batchBag.get(1).getBatchChoice())
                 .getFlatBatchAddGroup().size());
-        Assert.assertEquals(FlatBatchUpdateGroupCase.class, batchBag.get(2).getBatchChoice().getImplementedInterface());
+        Assert.assertEquals(FlatBatchUpdateGroupCase.class, batchBag.get(2).getBatchChoice().implementedInterface());
         Assert.assertEquals(3, ((FlatBatchUpdateGroupCase) batchBag.get(2).getBatchChoice())
                 .getFlatBatchUpdateGroup().size());
     }
@@ -190,10 +190,10 @@ public class SyncPlanPushStrategyFlatBatchImplTest {
 
         Assert.assertEquals(6, lastOrder);
         Assert.assertEquals(2, batchBag.size());
-        Assert.assertEquals(FlatBatchRemoveGroupCase.class, batchBag.get(0).getBatchChoice().getImplementedInterface());
+        Assert.assertEquals(FlatBatchRemoveGroupCase.class, batchBag.get(0).getBatchChoice().implementedInterface());
         Assert.assertEquals(3, ((FlatBatchRemoveGroupCase) batchBag.get(0).getBatchChoice())
                 .getFlatBatchRemoveGroup().size());
-        Assert.assertEquals(FlatBatchRemoveGroupCase.class, batchBag.get(1).getBatchChoice().getImplementedInterface());
+        Assert.assertEquals(FlatBatchRemoveGroupCase.class, batchBag.get(1).getBatchChoice().implementedInterface());
         Assert.assertEquals(3, ((FlatBatchRemoveGroupCase) batchBag.get(1).getBatchChoice())
                 .getFlatBatchRemoveGroup().size());
     }
@@ -205,10 +205,10 @@ public class SyncPlanPushStrategyFlatBatchImplTest {
 
         Assert.assertEquals(6, lastOrder);
         Assert.assertEquals(2, batchBag.size());
-        Assert.assertEquals(FlatBatchAddMeterCase.class, batchBag.get(0).getBatchChoice().getImplementedInterface());
+        Assert.assertEquals(FlatBatchAddMeterCase.class, batchBag.get(0).getBatchChoice().implementedInterface());
         Assert.assertEquals(3, ((FlatBatchAddMeterCase) batchBag.get(0).getBatchChoice())
                 .getFlatBatchAddMeter().size());
-        Assert.assertEquals(FlatBatchUpdateMeterCase.class, batchBag.get(1).getBatchChoice().getImplementedInterface());
+        Assert.assertEquals(FlatBatchUpdateMeterCase.class, batchBag.get(1).getBatchChoice().implementedInterface());
         Assert.assertEquals(3, ((FlatBatchUpdateMeterCase) batchBag.get(1).getBatchChoice())
                 .getFlatBatchUpdateMeter().size());
     }
@@ -219,7 +219,7 @@ public class SyncPlanPushStrategyFlatBatchImplTest {
 
         Assert.assertEquals(3, lastOrder);
         Assert.assertEquals(1, batchBag.size());
-        Assert.assertEquals(FlatBatchRemoveMeterCase.class, batchBag.get(0).getBatchChoice().getImplementedInterface());
+        Assert.assertEquals(FlatBatchRemoveMeterCase.class, batchBag.get(0).getBatchChoice().implementedInterface());
         Assert.assertEquals(3, ((FlatBatchRemoveMeterCase) batchBag.get(0).getBatchChoice())
                 .getFlatBatchRemoveMeter().size());
     }
@@ -231,13 +231,13 @@ public class SyncPlanPushStrategyFlatBatchImplTest {
 
         Assert.assertEquals(9, lastOrder);
         Assert.assertEquals(3, batchBag.size());
-        Assert.assertEquals(FlatBatchAddFlowCase.class, batchBag.get(0).getBatchChoice().getImplementedInterface());
+        Assert.assertEquals(FlatBatchAddFlowCase.class, batchBag.get(0).getBatchChoice().implementedInterface());
         Assert.assertEquals(3, ((FlatBatchAddFlowCase) batchBag.get(0).getBatchChoice())
                 .getFlatBatchAddFlow().size());
-        Assert.assertEquals(FlatBatchUpdateFlowCase.class, batchBag.get(1).getBatchChoice().getImplementedInterface());
+        Assert.assertEquals(FlatBatchUpdateFlowCase.class, batchBag.get(1).getBatchChoice().implementedInterface());
         Assert.assertEquals(3, ((FlatBatchUpdateFlowCase) batchBag.get(1).getBatchChoice())
                 .getFlatBatchUpdateFlow().size());
-        Assert.assertEquals(FlatBatchAddFlowCase.class, batchBag.get(2).getBatchChoice().getImplementedInterface());
+        Assert.assertEquals(FlatBatchAddFlowCase.class, batchBag.get(2).getBatchChoice().implementedInterface());
         Assert.assertEquals(3, ((FlatBatchAddFlowCase) batchBag.get(2).getBatchChoice())
                 .getFlatBatchAddFlow().size());
     }
index 526012ddde339fae406bb6163a383113845b5304..162a4c74de3ec5379422f23236f3d4045bb1fffe 100644 (file)
@@ -27,6 +27,7 @@ import static org.opendaylight.openflowplugin.applications.topology.manager.Test
 import static org.opendaylight.openflowplugin.applications.topology.manager.TestUtils.waitForDeletes;
 import static org.opendaylight.openflowplugin.applications.topology.manager.TestUtils.waitForSubmit;
 
+import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.Arrays;
 import java.util.Collections;
@@ -80,11 +81,11 @@ public class NodeChangeListenerImplTest extends DataTreeChangeListenerBase {
         SettableFuture<Optional<Topology>> readFuture = SettableFuture.create();
         readFuture.set(Optional.of(topology));
         ReadWriteTransaction mockTx1 = mock(ReadWriteTransaction.class);
-        doReturn(readFuture).when(mockTx1).read(LogicalDatastoreType.OPERATIONAL, topologyIID);
+        doReturn(FluentFuture.from(readFuture)).when(mockTx1).read(LogicalDatastoreType.OPERATIONAL, topologyIID);
 
         SettableFuture<Optional<Node>> readFutureNode = SettableFuture.create();
         readFutureNode.set(Optional.of(topoNode));
-        doReturn(readFutureNode).when(mockTx1).read(LogicalDatastoreType.OPERATIONAL, topoNodeII);
+        doReturn(FluentFuture.from(readFutureNode)).when(mockTx1).read(LogicalDatastoreType.OPERATIONAL, topoNodeII);
 
         final CountDownLatch submitLatch1 = setupStubbedSubmit(mockTx1);
 
index a7b7f7dbe0f88fd53e2f7669ba0e354e8323ad36..c4bc396e006caff69708f4004f2fcce090017a46 100644 (file)
@@ -31,6 +31,7 @@ import static org.opendaylight.openflowplugin.applications.topology.manager.Test
 import static org.opendaylight.openflowplugin.applications.topology.manager.TestUtils.waitForDeletes;
 import static org.opendaylight.openflowplugin.applications.topology.manager.TestUtils.waitForSubmit;
 
+import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.Arrays;
 import java.util.Collections;
@@ -92,11 +93,11 @@ public class TerminationPointChangeListenerImplTest extends DataTreeChangeListen
         final SettableFuture<Optional<Topology>> readFuture = SettableFuture.create();
         readFuture.set(Optional.of(topology));
         ReadWriteTransaction mockTx1 = mock(ReadWriteTransaction.class);
-        doReturn(readFuture).when(mockTx1).read(LogicalDatastoreType.OPERATIONAL, topologyIID);
+        doReturn(FluentFuture.from(readFuture)).when(mockTx1).read(LogicalDatastoreType.OPERATIONAL, topologyIID);
 
         SettableFuture<Optional<Node>> readFutureNode = SettableFuture.create();
         readFutureNode.set(Optional.of(topoNode));
-        doReturn(readFutureNode).when(mockTx1).read(LogicalDatastoreType.OPERATIONAL, topoNodeII);
+        doReturn(FluentFuture.from(readFutureNode)).when(mockTx1).read(LogicalDatastoreType.OPERATIONAL, topoNodeII);
 
         final CountDownLatch submitLatch1 = setupStubbedSubmit(mockTx1);
 
index a3e81b550baeaf1f05c2ea051a37580466dc9693..8b36bdb3f0ab846fcf8cda3cadfb39b78fe68743 100644 (file)
@@ -3,7 +3,7 @@
            xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
         odl:use-default-for-reference-types="true">
 
-  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="pingpong"/>
+  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
   <reference id="notificationService" interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
 
   <odl:rpc-service id="flowService"
index 3b83bc12abe0b0b5a52a5fcd0f41a1b55ae03594..0393fb93c2a0c182e762708a58e6412f79de17a3 100644 (file)
@@ -82,6 +82,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfIpDstCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfIpSrcCaseBuilder;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * A helper class that maps various NXM/OXM header representations to
@@ -103,61 +104,61 @@ public final class FieldChoiceResolver {
     static {
         final ImmutableMap<SrcChoice, NxmHeader> srcChoiceToNxmheader =
                 new ImmutableMap.Builder<SrcChoice, NxmHeader>()
-                        .put(new SrcNxTunIdCaseBuilder().setNxTunId(true).build(),
+                        .put(new SrcNxTunIdCaseBuilder().setNxTunId(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.TUN_ID_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxArpShaCaseBuilder().setNxArpSha(true).build(),
+                        .put(new SrcNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ARP_SHA_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxArpThaCaseBuilder().setNxArpTha(true).build(),
+                        .put(new SrcNxArpThaCaseBuilder().setNxArpTha(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ARP_THA_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfArpOpCaseBuilder().setOfArpOp(true).build(),
+                        .put(new SrcOfArpOpCaseBuilder().setOfArpOp(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ARP_OP_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfArpSpaCaseBuilder().setOfArpSpa(true).build(),
+                        .put(new SrcOfArpSpaCaseBuilder().setOfArpSpa(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ARP_SPA_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfArpTpaCaseBuilder().setOfArpTpa(true).build(),
+                        .put(new SrcOfArpTpaCaseBuilder().setOfArpTpa(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ARP_TPA_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxOfInPortCaseBuilder().setOfInPort(true).build(),
+                        .put(new SrcNxOfInPortCaseBuilder().setOfInPort(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NXM_OF_IN_PORT_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxOfMetadataCaseBuilder().setOfMetadata(true).build(),
+                        .put(new SrcNxOfMetadataCaseBuilder().setOfMetadata(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.OXM_OF_METADATA_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfEthDstCaseBuilder().setOfEthDst(true).build(),
+                        .put(new SrcOfEthDstCaseBuilder().setOfEthDst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ETH_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfEthSrcCaseBuilder().setOfEthSrc(true).build(),
+                        .put(new SrcOfEthSrcCaseBuilder().setOfEthSrc(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ETH_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfEthTypeCaseBuilder().setOfEthType(true).build(),
+                        .put(new SrcOfEthTypeCaseBuilder().setOfEthType(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ETH_TYPE_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(true).build(),
+                        .put(new SrcNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.TUN_IPV4_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(true).build(),
+                        .put(new SrcNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.TUN_IPV4_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNspCaseBuilder().setNxNspDst(true).build(),
+                        .put(new SrcNxNspCaseBuilder().setNxNspDst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSP_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNsiCaseBuilder().setNxNsiDst(true).build(),
+                        .put(new SrcNxNsiCaseBuilder().setNxNsiDst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSI_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshc1CaseBuilder().setNxNshc1Dst(true).build(),
+                        .put(new SrcNxNshc1CaseBuilder().setNxNshc1Dst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSC1_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshc2CaseBuilder().setNxNshc2Dst(true).build(),
+                        .put(new SrcNxNshc2CaseBuilder().setNxNshc2Dst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSC2_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshc3CaseBuilder().setNxNshc3Dst(true).build(),
+                        .put(new SrcNxNshc3CaseBuilder().setNxNshc3Dst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSC3_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshc4CaseBuilder().setNxNshc4Dst(true).build(),
+                        .put(new SrcNxNshc4CaseBuilder().setNxNshc4Dst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSC4_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshFlagsCaseBuilder().setNxNshFlags(true).build(),
+                        .put(new SrcNxNshFlagsCaseBuilder().setNxNshFlags(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSH_FLAGS_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshTtlCaseBuilder().setNxNshTtl(true).build(),
+                        .put(new SrcNxNshTtlCaseBuilder().setNxNshTtl(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSH_TTL_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshMdtypeCaseBuilder().setNxNshMdtype(true).build(),
+                        .put(new SrcNxNshMdtypeCaseBuilder().setNxNshMdtype(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSH_MDTYPE_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshNpCaseBuilder().setNxNshNp(true).build(),
+                        .put(new SrcNxNshNpCaseBuilder().setNxNshNp(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSH_NP_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfIpDstCaseBuilder().setOfIpDst(true).build(),
+                        .put(new SrcOfIpDstCaseBuilder().setOfIpDst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.IP_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfIpSrcCaseBuilder().setOfIpSrc(true).build(),
+                        .put(new SrcOfIpSrcCaseBuilder().setOfIpSrc(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.IP_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxIpv6SrcCaseBuilder().setNxIpv6Src(true).build(),
+                        .put(new SrcNxIpv6SrcCaseBuilder().setNxIpv6Src(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.IPV6_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxIpv6DstCaseBuilder().setNxIpv6Dst(true).build(),
+                        .put(new SrcNxIpv6DstCaseBuilder().setNxIpv6Dst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.IPV6_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxOfMplsLabelCaseBuilder().setOfMplsLabel(true).build(),
+                        .put(new SrcNxOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.OXM_OF_MPLS_LABEL.getHeaderWithoutHasMask())
                         .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(),
                                 NiciraMatchCodecs.REG0_CODEC.getHeaderWithoutHasMask())
@@ -179,57 +180,57 @@ public final class FieldChoiceResolver {
 
         final ImmutableMap<DstChoice, NxmHeader> dstChoiceToNxmheader =
                 new ImmutableMap.Builder<DstChoice, NxmHeader>()
-                        .put(new DstNxTunIdCaseBuilder().setNxTunId(true).build(),
+                        .put(new DstNxTunIdCaseBuilder().setNxTunId(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.TUN_ID_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxArpShaCaseBuilder().setNxArpSha(true).build(),
+                        .put(new DstNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ARP_SHA_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxArpThaCaseBuilder().setNxArpTha(true).build(),
+                        .put(new DstNxArpThaCaseBuilder().setNxArpTha(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ARP_THA_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfArpOpCaseBuilder().setOfArpOp(true).build(),
+                        .put(new DstOfArpOpCaseBuilder().setOfArpOp(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ARP_OP_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfArpSpaCaseBuilder().setOfArpSpa(true).build(),
+                        .put(new DstOfArpSpaCaseBuilder().setOfArpSpa(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ARP_SPA_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfArpTpaCaseBuilder().setOfArpTpa(true).build(),
+                        .put(new DstOfArpTpaCaseBuilder().setOfArpTpa(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ARP_TPA_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxOfInPortCaseBuilder().setOfInPort(true).build(),
+                        .put(new DstNxOfInPortCaseBuilder().setOfInPort(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NXM_OF_IN_PORT_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfMetadataCaseBuilder().setOfMetadata(true).build(),
+                        .put(new DstOfMetadataCaseBuilder().setOfMetadata(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.OXM_OF_METADATA_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfEthSrcCaseBuilder().setOfEthSrc(true).build(),
+                        .put(new DstOfEthSrcCaseBuilder().setOfEthSrc(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ETH_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfEthDstCaseBuilder().setOfEthDst(true).build(),
+                        .put(new DstOfEthDstCaseBuilder().setOfEthDst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ETH_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(true).build(),
+                        .put(new DstNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.TUN_IPV4_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(true).build(),
+                        .put(new DstNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.TUN_IPV4_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNspCaseBuilder().setNxNspDst(true).build(),
+                        .put(new DstNxNspCaseBuilder().setNxNspDst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSP_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNsiCaseBuilder().setNxNsiDst(true).build(),
+                        .put(new DstNxNsiCaseBuilder().setNxNsiDst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSI_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNshc1CaseBuilder().setNxNshc1Dst(true).build(),
+                        .put(new DstNxNshc1CaseBuilder().setNxNshc1Dst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSC1_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNshc2CaseBuilder().setNxNshc2Dst(true).build(),
+                        .put(new DstNxNshc2CaseBuilder().setNxNshc2Dst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSC2_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNshc3CaseBuilder().setNxNshc3Dst(true).build(),
+                        .put(new DstNxNshc3CaseBuilder().setNxNshc3Dst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSC3_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNshc4CaseBuilder().setNxNshc4Dst(true).build(),
+                        .put(new DstNxNshc4CaseBuilder().setNxNshc4Dst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSC4_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNshFlagsCaseBuilder().setNxNshFlags(true).build(),
+                        .put(new DstNxNshFlagsCaseBuilder().setNxNshFlags(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSH_FLAGS_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNshTtlCaseBuilder().setNxNshTtl(true).build(),
+                        .put(new DstNxNshTtlCaseBuilder().setNxNshTtl(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.NSH_TTL_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfIpDstCaseBuilder().setOfIpDst(true).build(),
+                        .put(new DstOfIpDstCaseBuilder().setOfIpDst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.IP_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfIpSrcCaseBuilder().setOfIpSrc(true).build(),
+                        .put(new DstOfIpSrcCaseBuilder().setOfIpSrc(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.IP_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxIpv6SrcCaseBuilder().setNxIpv6Src(true).build(),
+                        .put(new DstNxIpv6SrcCaseBuilder().setNxIpv6Src(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.IPV6_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxIpv6DstCaseBuilder().setNxIpv6Dst(true).build(),
+                        .put(new DstNxIpv6DstCaseBuilder().setNxIpv6Dst(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.IPV6_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfMplsLabelCaseBuilder().setOfMplsLabel(true).build(),
+                        .put(new DstOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.OXM_OF_MPLS_LABEL.getHeaderWithoutHasMask())
-                        .put(new DstOfIcmpTypeCaseBuilder().setOfIcmpType(true).build(),
+                        .put(new DstOfIcmpTypeCaseBuilder().setOfIcmpType(Empty.getInstance()).build(),
                                 NiciraMatchCodecs.ICMP_TYPE_CODEC.getHeaderWithoutHasMask())
                         .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(),
                                 NiciraMatchCodecs.REG0_CODEC.getHeaderWithoutHasMask())
@@ -258,7 +259,7 @@ public final class FieldChoiceResolver {
             if (srcChoice instanceof SrcNxRegCase) {
                 regSrcChoiceToHeaderBuilder.put(srcChoice, header);
             } else {
-                srcTypeToHeaderBuilder.put(srcChoice.getImplementedInterface(), header);
+                srcTypeToHeaderBuilder.put(srcChoice.implementedInterface(), header);
             }
         });
         NXMHEADER_TO_SRC_CHOICE = headerToSrcChoiceBuilder.build();
@@ -274,7 +275,7 @@ public final class FieldChoiceResolver {
             if (dstChoice instanceof DstNxRegCase) {
                 regDstChoiceToHeaderBuilder.put(dstChoice, header);
             } else {
-                dstTypeToHeaderBuilder.put(dstChoice.getImplementedInterface(), header);
+                dstTypeToHeaderBuilder.put(dstChoice.implementedInterface(), header);
             }
         });
         NXMHEADER_TO_DST_CHOICE = dstToHeaderBuilder.build();
@@ -337,7 +338,7 @@ public final class FieldChoiceResolver {
     static Long resolveDstHeaderUint32(DstChoice dstChoice) {
         NxmHeader nxmHeader = dstChoice instanceof DstNxRegCase
                 ? REG_DST_CHOICE_TO_NXMHEADER.get(dstChoice)
-                : DST_CHOICE_TYPE_TO_NXMHEADER.get(dstChoice.getImplementedInterface());
+                : DST_CHOICE_TYPE_TO_NXMHEADER.get(dstChoice.implementedInterface());
         if (nxmHeader.isExperimenter()) {
             throw new IllegalArgumentException("Cannot fit experimenter destination choice on a uint32 header");
         }
@@ -354,7 +355,7 @@ public final class FieldChoiceResolver {
     static BigInteger resolveDstHeaderUint64(DstChoice dstChoice) {
         return dstChoice instanceof DstNxRegCase
                 ? REG_DST_CHOICE_TO_NXMHEADER.get(dstChoice).toBigInteger()
-                : DST_CHOICE_TYPE_TO_NXMHEADER.get(dstChoice.getImplementedInterface()).toBigInteger();
+                : DST_CHOICE_TYPE_TO_NXMHEADER.get(dstChoice.implementedInterface()).toBigInteger();
     }
 
     /**
@@ -368,7 +369,7 @@ public final class FieldChoiceResolver {
     static Long resolveSrcHeaderUint32(SrcChoice srcChoice) {
         NxmHeader nxmHeader = srcChoice instanceof SrcNxRegCase
                 ? REG_SRC_CHOICE_TO_NXMHEADER.get(srcChoice)
-                : SRC_CHOICE_TYPE_TO_NXMHEADER.get(srcChoice.getImplementedInterface());
+                : SRC_CHOICE_TYPE_TO_NXMHEADER.get(srcChoice.implementedInterface());
         if (nxmHeader.isExperimenter()) {
             throw new IllegalArgumentException("Cannot fit experimenter source choice on a uint32 header");
         }
@@ -385,7 +386,7 @@ public final class FieldChoiceResolver {
     static BigInteger resolveSrcHeaderUint64(SrcChoice srcChoice) {
         return srcChoice instanceof SrcNxRegCase
                 ? REG_SRC_CHOICE_TO_NXMHEADER.get(srcChoice).toBigInteger()
-                : SRC_CHOICE_TYPE_TO_NXMHEADER.get(srcChoice.getImplementedInterface()).toBigInteger();
+                : SRC_CHOICE_TYPE_TO_NXMHEADER.get(srcChoice.implementedInterface()).toBigInteger();
     }
 
     /**
@@ -397,7 +398,7 @@ public final class FieldChoiceResolver {
     static boolean isExperimenter(SrcChoice srcChoice) {
         return srcChoice instanceof SrcNxRegCase
                 ? REG_SRC_CHOICE_TO_NXMHEADER.get(srcChoice).isExperimenter()
-                : SRC_CHOICE_TYPE_TO_NXMHEADER.get(srcChoice.getImplementedInterface()).isExperimenter();
+                : SRC_CHOICE_TYPE_TO_NXMHEADER.get(srcChoice.implementedInterface()).isExperimenter();
     }
 
     /**
@@ -409,6 +410,6 @@ public final class FieldChoiceResolver {
     static boolean isExperimenter(DstChoice dstChoice) {
         return dstChoice instanceof DstNxRegCase
                 ? REG_DST_CHOICE_TO_NXMHEADER.get(dstChoice).isExperimenter()
-                : DST_CHOICE_TYPE_TO_NXMHEADER.get(dstChoice.getImplementedInterface()).isExperimenter();
+                : DST_CHOICE_TYPE_TO_NXMHEADER.get(dstChoice.implementedInterface()).isExperimenter();
     }
 }
index 2955d987b0673508f9bd5750e520940de1d76f37..423fcc23dec03f8d141719cbd03e54772086c5ce 100644 (file)
@@ -74,6 +74,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoadBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.nx.reg.load.Dst;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.nx.reg.load.DstBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Convert between RegLoad SAL action and RegLoad2 nicira action.
@@ -167,54 +168,54 @@ public class RegLoad2Convertor implements
 
         if (NxmNxNshFlags.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSH_FLAGS_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNshFlagsCaseBuilder().setNxNshFlags(true).build());
+            dstBuilder.setDstChoice(new DstNxNshFlagsCaseBuilder().setNxNshFlags(Empty.getInstance()).build());
             NshFlagsValues nshFlagsValues = ((NshFlagsCaseValue) value).getNshFlagsValues();
             return resolveRegLoad(nshFlagsValues.getNshFlags(), nshFlagsValues.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNsp.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSP_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNspCaseBuilder().setNxNspDst(true).build());
+            dstBuilder.setDstChoice(new DstNxNspCaseBuilder().setNxNspDst(Empty.getInstance()).build());
             NspValues nspValues = ((NspCaseValue) value).getNspValues();
             return resolveRegLoad(nspValues.getNsp(), nspValues.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNsi.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSI_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNsiCaseBuilder().setNxNsiDst(true).build());
+            dstBuilder.setDstChoice(new DstNxNsiCaseBuilder().setNxNsiDst(Empty.getInstance()).build());
             NsiValues nsiValues = ((NsiCaseValue) value).getNsiValues();
             return resolveRegLoad(nsiValues.getNsi(), nsiValues.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNshc1.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSC1_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNshc1CaseBuilder().setNxNshc1Dst(true).build());
+            dstBuilder.setDstChoice(new DstNxNshc1CaseBuilder().setNxNshc1Dst(Empty.getInstance()).build());
             NshcCaseValue nshcCaseValue = ((NshcCaseValue) value);
             return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNshc2.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSC2_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNshc2CaseBuilder().setNxNshc2Dst(true).build());
+            dstBuilder.setDstChoice(new DstNxNshc2CaseBuilder().setNxNshc2Dst(Empty.getInstance()).build());
             NshcCaseValue nshcCaseValue = ((NshcCaseValue) value);
             return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNshc3.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSC3_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNshc3CaseBuilder().setNxNshc3Dst(true).build());
+            dstBuilder.setDstChoice(new DstNxNshc3CaseBuilder().setNxNshc3Dst(Empty.getInstance()).build());
             NshcCaseValue nshcCaseValue = ((NshcCaseValue) value);
             return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNshc4.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSC4_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNshc4CaseBuilder().setNxNshc4Dst(true).build());
+            dstBuilder.setDstChoice(new DstNxNshc4CaseBuilder().setNxNshc4Dst(Empty.getInstance()).build());
             NshcCaseValue nshcCaseValue = ((NshcCaseValue) value);
             return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNshTtl.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSH_TTL_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNshTtlCaseBuilder().setNxNshTtl(true).build());
+            dstBuilder.setDstChoice(new DstNxNshTtlCaseBuilder().setNxNshTtl(Empty.getInstance()).build());
             NshTtlValues nshTtlValues = ((NshTtlCaseValue) value).getNshTtlValues();
             return resolveRegLoad(nshTtlValues.getNshTtl(), nshTtlValues.getMask(), valueLength, dstBuilder);
         }
 
-        throw new CodecPreconditionException("Missing codec for " + value.getImplementedInterface());
+        throw new CodecPreconditionException("Missing codec for " + value.implementedInterface());
     }
 
     private static NxRegLoad resolveRegLoad(Short value, @Nullable Short mask, int valueLength, DstBuilder dstBuilder) {
index 94054601a1070be1efca713d563d3645ddf26833..bbf9f4adf5eec7e31933bc3298e115ab9be6e327 100644 (file)
@@ -84,6 +84,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfEthTypeCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfIpDstCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfIpSrcCaseBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 @RunWith(Parameterized.class)
 public class FieldChoiceResolverTest {
@@ -143,210 +144,210 @@ public class FieldChoiceResolverTest {
             {
                 NiciraMatchCodecs.TUN_ID_CODEC.getHeaderWithoutHasMask(),
                 new DstNxTunIdCaseBuilder().build(),
-                new DstNxTunIdCaseBuilder().setNxTunId(true).build(),
+                new DstNxTunIdCaseBuilder().setNxTunId(Empty.getInstance()).build(),
                 new SrcNxTunIdCaseBuilder().build(),
-                new SrcNxTunIdCaseBuilder().setNxTunId(true).build()
+                new SrcNxTunIdCaseBuilder().setNxTunId(Empty.getInstance()).build()
             },
             {
                 NiciraMatchCodecs.ARP_SHA_CODEC.getHeaderWithoutHasMask(),
                 new DstNxArpShaCaseBuilder().build(),
-                new DstNxArpShaCaseBuilder().setNxArpSha(true).build(),
+                new DstNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build(),
                 new SrcNxArpShaCaseBuilder().build(),
-                new SrcNxArpShaCaseBuilder().setNxArpSha(true).build(),
+                new SrcNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.ARP_SHA_CODEC.getHeaderWithoutHasMask(),
                 new DstNxArpShaCaseBuilder().build(),
-                new DstNxArpShaCaseBuilder().setNxArpSha(true).build(),
+                new DstNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build(),
                 new SrcNxArpShaCaseBuilder().build(),
-                new SrcNxArpShaCaseBuilder().setNxArpSha(true).build(),
+                new SrcNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.ARP_THA_CODEC.getHeaderWithoutHasMask(),
                 new DstNxArpThaCaseBuilder().build(),
-                new DstNxArpThaCaseBuilder().setNxArpTha(true).build(),
+                new DstNxArpThaCaseBuilder().setNxArpTha(Empty.getInstance()).build(),
                 new SrcNxArpThaCaseBuilder().build(),
-                new SrcNxArpThaCaseBuilder().setNxArpTha(true).build(),
+                new SrcNxArpThaCaseBuilder().setNxArpTha(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.ARP_OP_CODEC.getHeaderWithoutHasMask(),
                 new DstOfArpOpCaseBuilder().build(),
-                new DstOfArpOpCaseBuilder().setOfArpOp(true).build(),
+                new DstOfArpOpCaseBuilder().setOfArpOp(Empty.getInstance()).build(),
                 new SrcOfArpOpCaseBuilder().build(),
-                new SrcOfArpOpCaseBuilder().setOfArpOp(true).build(),
+                new SrcOfArpOpCaseBuilder().setOfArpOp(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.ARP_SPA_CODEC.getHeaderWithoutHasMask(),
                 new DstOfArpSpaCaseBuilder().build(),
-                new DstOfArpSpaCaseBuilder().setOfArpSpa(true).build(),
+                new DstOfArpSpaCaseBuilder().setOfArpSpa(Empty.getInstance()).build(),
                 new SrcOfArpSpaCaseBuilder().build(),
-                new SrcOfArpSpaCaseBuilder().setOfArpSpa(true).build(),
+                new SrcOfArpSpaCaseBuilder().setOfArpSpa(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.ARP_TPA_CODEC.getHeaderWithoutHasMask(),
                 new DstOfArpTpaCaseBuilder().build(),
-                new DstOfArpTpaCaseBuilder().setOfArpTpa(true).build(),
+                new DstOfArpTpaCaseBuilder().setOfArpTpa(Empty.getInstance()).build(),
                 new SrcOfArpTpaCaseBuilder().build(),
-                new SrcOfArpTpaCaseBuilder().setOfArpTpa(true).build(),
+                new SrcOfArpTpaCaseBuilder().setOfArpTpa(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.NXM_OF_IN_PORT_CODEC.getHeaderWithoutHasMask(),
                 new DstNxOfInPortCaseBuilder().build(),
-                new DstNxOfInPortCaseBuilder().setOfInPort(true).build(),
+                new DstNxOfInPortCaseBuilder().setOfInPort(Empty.getInstance()).build(),
                 new SrcNxOfInPortCaseBuilder().build(),
-                new SrcNxOfInPortCaseBuilder().setOfInPort(true).build(),
+                new SrcNxOfInPortCaseBuilder().setOfInPort(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.OXM_OF_METADATA_CODEC.getHeaderWithoutHasMask(),
                 new DstOfMetadataCaseBuilder().build(),
-                new DstOfMetadataCaseBuilder().setOfMetadata(true).build(),
+                new DstOfMetadataCaseBuilder().setOfMetadata(Empty.getInstance()).build(),
                 new SrcNxOfMetadataCaseBuilder().build(),
-                new SrcNxOfMetadataCaseBuilder().setOfMetadata(true).build(),
+                new SrcNxOfMetadataCaseBuilder().setOfMetadata(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.OXM_OF_MPLS_LABEL.getHeaderWithoutHasMask(),
                 new DstOfMplsLabelCaseBuilder().build(),
-                new DstOfMplsLabelCaseBuilder().setOfMplsLabel(true).build(),
+                new DstOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.getInstance()).build(),
                 new SrcNxOfMplsLabelCaseBuilder().build(),
-                new SrcNxOfMplsLabelCaseBuilder().setOfMplsLabel(true).build(),
+                new SrcNxOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.ETH_DST_CODEC.getHeaderWithoutHasMask(),
                 new DstOfEthDstCaseBuilder().build(),
-                new DstOfEthDstCaseBuilder().setOfEthDst(true).build(),
+                new DstOfEthDstCaseBuilder().setOfEthDst(Empty.getInstance()).build(),
                 new SrcOfEthDstCaseBuilder().build(),
-                new SrcOfEthDstCaseBuilder().setOfEthDst(true).build(),
+                new SrcOfEthDstCaseBuilder().setOfEthDst(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.ETH_SRC_CODEC.getHeaderWithoutHasMask(),
                 new DstOfEthSrcCaseBuilder().build(),
-                new DstOfEthSrcCaseBuilder().setOfEthSrc(true).build(),
+                new DstOfEthSrcCaseBuilder().setOfEthSrc(Empty.getInstance()).build(),
                 new SrcOfEthSrcCaseBuilder().build(),
-                new SrcOfEthSrcCaseBuilder().setOfEthSrc(true).build(),
+                new SrcOfEthSrcCaseBuilder().setOfEthSrc(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.ETH_TYPE_CODEC.getHeaderWithoutHasMask(),
                 null,
                 null,
                 new SrcOfEthTypeCaseBuilder().build(),
-                new SrcOfEthTypeCaseBuilder().setOfEthType(true).build()
+                new SrcOfEthTypeCaseBuilder().setOfEthType(Empty.getInstance()).build()
             },
             {
                 NiciraMatchCodecs.TUN_IPV4_DST_CODEC.getHeaderWithoutHasMask(),
                 new DstNxTunIpv4DstCaseBuilder().build(),
-                new DstNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(true).build(),
+                new DstNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Empty.getInstance()).build(),
                 new SrcNxTunIpv4DstCaseBuilder().build(),
-                new SrcNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(true).build(),
+                new SrcNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.TUN_IPV4_SRC_CODEC.getHeaderWithoutHasMask(),
                 new DstNxTunIpv4SrcCaseBuilder().build(),
-                new DstNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(true).build(),
+                new DstNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Empty.getInstance()).build(),
                 new SrcNxTunIpv4SrcCaseBuilder().build(),
-                new SrcNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(true).build(),
+                new SrcNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.NSP_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNspCaseBuilder().build(),
-                new DstNxNspCaseBuilder().setNxNspDst(true).build(),
+                new DstNxNspCaseBuilder().setNxNspDst(Empty.getInstance()).build(),
                 new SrcNxNspCaseBuilder().build(),
-                new SrcNxNspCaseBuilder().setNxNspDst(true).build(),
+                new SrcNxNspCaseBuilder().setNxNspDst(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.NSI_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNsiCaseBuilder().build(),
-                new DstNxNsiCaseBuilder().setNxNsiDst(true).build(),
+                new DstNxNsiCaseBuilder().setNxNsiDst(Empty.getInstance()).build(),
                 new SrcNxNsiCaseBuilder().build(),
-                new SrcNxNsiCaseBuilder().setNxNsiDst(true).build(),
+                new SrcNxNsiCaseBuilder().setNxNsiDst(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.NSC1_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNshc1CaseBuilder().build(),
-                new DstNxNshc1CaseBuilder().setNxNshc1Dst(true).build(),
+                new DstNxNshc1CaseBuilder().setNxNshc1Dst(Empty.getInstance()).build(),
                 new SrcNxNshc1CaseBuilder().build(),
-                new SrcNxNshc1CaseBuilder().setNxNshc1Dst(true).build(),
+                new SrcNxNshc1CaseBuilder().setNxNshc1Dst(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.NSC2_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNshc2CaseBuilder().build(),
-                new DstNxNshc2CaseBuilder().setNxNshc2Dst(true).build(),
+                new DstNxNshc2CaseBuilder().setNxNshc2Dst(Empty.getInstance()).build(),
                 new SrcNxNshc2CaseBuilder().build(),
-                new SrcNxNshc2CaseBuilder().setNxNshc2Dst(true).build(),
+                new SrcNxNshc2CaseBuilder().setNxNshc2Dst(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.NSC3_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNshc3CaseBuilder().build(),
-                new DstNxNshc3CaseBuilder().setNxNshc3Dst(true).build(),
+                new DstNxNshc3CaseBuilder().setNxNshc3Dst(Empty.getInstance()).build(),
                 new SrcNxNshc3CaseBuilder().build(),
-                new SrcNxNshc3CaseBuilder().setNxNshc3Dst(true).build(),
+                new SrcNxNshc3CaseBuilder().setNxNshc3Dst(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.NSC4_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNshc4CaseBuilder().build(),
-                new DstNxNshc4CaseBuilder().setNxNshc4Dst(true).build(),
+                new DstNxNshc4CaseBuilder().setNxNshc4Dst(Empty.getInstance()).build(),
                 new SrcNxNshc4CaseBuilder().build(),
-                new SrcNxNshc4CaseBuilder().setNxNshc4Dst(true).build(),
+                new SrcNxNshc4CaseBuilder().setNxNshc4Dst(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.NSH_FLAGS_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNshFlagsCaseBuilder().build(),
-                new DstNxNshFlagsCaseBuilder().setNxNshFlags(true).build(),
+                new DstNxNshFlagsCaseBuilder().setNxNshFlags(Empty.getInstance()).build(),
                 new SrcNxNshFlagsCaseBuilder().build(),
-                new SrcNxNshFlagsCaseBuilder().setNxNshFlags(true).build(),
+                new SrcNxNshFlagsCaseBuilder().setNxNshFlags(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.NSH_TTL_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNshTtlCaseBuilder().build(),
-                new DstNxNshTtlCaseBuilder().setNxNshTtl(true).build(),
+                new DstNxNshTtlCaseBuilder().setNxNshTtl(Empty.getInstance()).build(),
                 new SrcNxNshTtlCaseBuilder().build(),
-                new SrcNxNshTtlCaseBuilder().setNxNshTtl(true).build(),
+                new SrcNxNshTtlCaseBuilder().setNxNshTtl(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.NSH_MDTYPE_CODEC.getHeaderWithoutHasMask(),
                 null,
                 null,
                 new SrcNxNshMdtypeCaseBuilder().build(),
-                new SrcNxNshMdtypeCaseBuilder().setNxNshMdtype(true).build(),
+                new SrcNxNshMdtypeCaseBuilder().setNxNshMdtype(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.NSH_NP_CODEC.getHeaderWithoutHasMask(),
                 null,
                 null,
                 new SrcNxNshNpCaseBuilder().build(),
-                new SrcNxNshNpCaseBuilder().setNxNshNp(true).build(),
+                new SrcNxNshNpCaseBuilder().setNxNshNp(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.IP_SRC_CODEC.getHeaderWithoutHasMask(),
                 new DstOfIpSrcCaseBuilder().build(),
-                new DstOfIpSrcCaseBuilder().setOfIpSrc(true).build(),
+                new DstOfIpSrcCaseBuilder().setOfIpSrc(Empty.getInstance()).build(),
                 new SrcOfIpSrcCaseBuilder().build(),
-                new SrcOfIpSrcCaseBuilder().setOfIpSrc(true).build(),
+                new SrcOfIpSrcCaseBuilder().setOfIpSrc(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.IP_DST_CODEC.getHeaderWithoutHasMask(),
                 new DstOfIpDstCaseBuilder().build(),
-                new DstOfIpDstCaseBuilder().setOfIpDst(true).build(),
+                new DstOfIpDstCaseBuilder().setOfIpDst(Empty.getInstance()).build(),
                 new SrcOfIpDstCaseBuilder().build(),
-                new SrcOfIpDstCaseBuilder().setOfIpDst(true).build(),
+                new SrcOfIpDstCaseBuilder().setOfIpDst(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.IPV6_SRC_CODEC.getHeaderWithoutHasMask(),
                 new DstNxIpv6SrcCaseBuilder().build(),
-                new DstNxIpv6SrcCaseBuilder().setNxIpv6Src(true).build(),
+                new DstNxIpv6SrcCaseBuilder().setNxIpv6Src(Empty.getInstance()).build(),
                 new SrcNxIpv6SrcCaseBuilder().build(),
-                new SrcNxIpv6SrcCaseBuilder().setNxIpv6Src(true).build(),
+                new SrcNxIpv6SrcCaseBuilder().setNxIpv6Src(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.IPV6_DST_CODEC.getHeaderWithoutHasMask(),
                 new DstNxIpv6DstCaseBuilder().build(),
-                new DstNxIpv6DstCaseBuilder().setNxIpv6Dst(true).build(),
+                new DstNxIpv6DstCaseBuilder().setNxIpv6Dst(Empty.getInstance()).build(),
                 new SrcNxIpv6DstCaseBuilder().build(),
-                new SrcNxIpv6DstCaseBuilder().setNxIpv6Dst(true).build(),
+                new SrcNxIpv6DstCaseBuilder().setNxIpv6Dst(Empty.getInstance()).build(),
             },
             {
                 NiciraMatchCodecs.ICMP_TYPE_CODEC.getHeaderWithoutHasMask(),
                 new DstOfIcmpTypeCaseBuilder().build(),
-                new DstOfIcmpTypeCaseBuilder().setOfIcmpType(true).build(),
+                new DstOfIcmpTypeCaseBuilder().setOfIcmpType(Empty.getInstance()).build(),
                 null,
                 null
             },
@@ -409,4 +410,4 @@ public class FieldChoiceResolverTest {
         });
     }
 
-}
\ No newline at end of file
+}
index 154bf8370c83a658ef41b3f13010233d184a74c3..f2cbbb6c8dd22042c04ff164dcb5dc6256f0e5e7 100644 (file)
@@ -33,13 +33,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.output.reg.grouping.nx.output.reg.Src;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxTunIdCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxTunIdCaseBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 @RunWith(MockitoJUnitRunner.class)
 public class OutputReg2ConvertorTest {
 
     private static final int OFS_N_BITS = 1;
     private static final int MAX_LEN = 2;
-    private static final SrcNxTunIdCase SRC_NX_TUN_ID_CASE = new SrcNxTunIdCaseBuilder().setNxTunId(true).build();
+    private static final SrcNxTunIdCase SRC_NX_TUN_ID_CASE = new SrcNxTunIdCaseBuilder()
+        .setNxTunId(Empty.getInstance()).build();
 
     @Mock
     private NxActionOutputRegNodesNodeGroupBucketsBucketActionsCase actionsCase;
@@ -158,4 +160,4 @@ public class OutputReg2ConvertorTest {
                 ((NxActionOutputRegNotifDirectStatisticsUpdateWriteActionsCase) actionResult5)
                         .getNxOutputReg().getSrc().getSrcChoice());
     }
-}
\ No newline at end of file
+}
index 0d9347621b64b4860a274076093eae637511fabc..5fef298dce001aa5c8ee2cdac1216fdd8090cd0a 100644 (file)
@@ -80,15 +80,15 @@ public class BundleAddMessageConverter implements
         LOG.trace("Flow or group pushed to the node: {} with transaction id : {} is {}",
                 data.getDatapathId(), data.getXid(),
                 experimenterMessageCase.getSalAddMessageData().getBundleInnerMessage());
-        if (innerMessage.getImplementedInterface().equals(BundleAddFlowCase.class)
-                || innerMessage.getImplementedInterface().equals(BundleUpdateFlowCase.class)
-                || innerMessage.getImplementedInterface().equals(BundleRemoveFlowCase.class)) {
+        if (innerMessage.implementedInterface().equals(BundleAddFlowCase.class)
+                || innerMessage.implementedInterface().equals(BundleUpdateFlowCase.class)
+                || innerMessage.implementedInterface().equals(BundleRemoveFlowCase.class)) {
             dataBuilder.setBundleInnerMessage(convertBundleFlowCase(innerMessage, data));
-        } else if (innerMessage.getImplementedInterface().equals(BundleAddGroupCase.class)
-                || innerMessage.getImplementedInterface().equals(BundleUpdateGroupCase.class)
-                || innerMessage.getImplementedInterface().equals(BundleRemoveGroupCase.class)) {
+        } else if (innerMessage.implementedInterface().equals(BundleAddGroupCase.class)
+                || innerMessage.implementedInterface().equals(BundleUpdateGroupCase.class)
+                || innerMessage.implementedInterface().equals(BundleRemoveGroupCase.class)) {
             dataBuilder.setBundleInnerMessage(convertBundleGroupCase(innerMessage, data));
-        } else if (innerMessage.getImplementedInterface().equals(BundleUpdatePortCase.class)) {
+        } else if (innerMessage.implementedInterface().equals(BundleUpdatePortCase.class)) {
             dataBuilder.setBundleInnerMessage(convertBundlePortCase(innerMessage, data));
         } else {
             throw new ConversionException("Unsupported inner message");
@@ -108,7 +108,7 @@ public class BundleAddMessageConverter implements
     private BundleFlowModCase convertBundleFlowCase(final BundleInnerMessage messageCase,
             final XidConvertorData data) throws ConversionException {
         Optional<List<FlowModInputBuilder>> flowModInputs = Optional.empty();
-        final Class clazz = messageCase.getImplementedInterface();
+        final Class clazz = messageCase.implementedInterface();
         if (clazz.equals(BundleAddFlowCase.class)) {
             flowModInputs = CONVERTER_EXECUTOR.convert(
                     new AddFlowInputBuilder(((BundleAddFlowCase) messageCase).getAddFlowCaseData()).build(), data);
@@ -145,7 +145,7 @@ public class BundleAddMessageConverter implements
     private BundleGroupModCase convertBundleGroupCase(final BundleInnerMessage messageCase,
             final XidConvertorData data) throws ConversionException {
         Optional<GroupModInputBuilder> groupModInput = Optional.empty();
-        final Class clazz = messageCase.getImplementedInterface();
+        final Class clazz = messageCase.implementedInterface();
         if (clazz.equals(BundleAddGroupCase.class)) {
             groupModInput = CONVERTER_EXECUTOR.convert(
                     new AddGroupInputBuilder(((BundleAddGroupCase) messageCase).getAddGroupCaseData()).build(), data);
@@ -176,7 +176,7 @@ public class BundleAddMessageConverter implements
     private BundlePortModCase convertBundlePortCase(final BundleInnerMessage messageCase,
             final XidConvertorData data) throws ConversionException {
         Optional<PortModInput> portModInput = Optional.empty();
-        final Class<?> clazz = messageCase.getImplementedInterface();
+        final Class<?> clazz = messageCase.implementedInterface();
         if (clazz.equals(BundleUpdatePortCase.class)) {
             portModInput = CONVERTER_EXECUTOR.convert(new PortBuilder(
                     ((BundleUpdatePortCase) messageCase).getUpdatePortCaseData().getPort().getPort().get(0)).build(),
index 19b89f4a47fd1b367546b0fb8ce02b29bfd7b011..50d70fe876623bdd6994d245e5d5261569c4ff09 100644 (file)
@@ -50,7 +50,7 @@ public class BundleAddMessageFactory extends AbstractBundleMessageFactory<Bundle
     }
 
     private void serializeInnerMessage(final BundleInnerMessage message, final ByteBuf outBuffer) {
-        final Class clazz = message.getImplementedInterface();
+        final Class clazz = message.implementedInterface();
         if (clazz.equals(BundleFlowModCase.class)) {
             OFSerializer<FlowMod> serializer = serializerRegistry.getSerializer(
                     new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, FlowModInput.class));
index c7c621b2069f392912d5bdd3f46ad621d231f294..c50878c7f8284e5a1f0a2bd545373c0def79c40a 100644 (file)
@@ -176,7 +176,7 @@ public class BundleAddMessageConverterTest {
                         original.getSalAddMessageData().getFlags().isOrdered()),
                 converted.getOnfAddMessageGroupingData().getFlags());
         Assert.assertEquals("Wrong inner message conversion", clazz,
-                converted.getOnfAddMessageGroupingData().getBundleInnerMessage().getImplementedInterface());
+                converted.getOnfAddMessageGroupingData().getBundleInnerMessage().implementedInterface());
         if (withProperty) {
             final BundlePropertyExperimenter originalProperty = (BundlePropertyExperimenter) original
                     .getSalAddMessageData().getBundleProperty().get(0).getBundlePropertyEntry();
index a05e79034a79149bb3d9a5c11031d8c7da63d116..99f9d4e6849ca1c161c270fb377ef73aaaacdc12 100644 (file)
@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>3.0.6</version>
+                <version>4.0.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
index 24997193efa03cd8d8ed82e4c9476dd134098a5c..9d6a0ac9764149a985799b6b57544e2cf454fa07 100644 (file)
@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>3.0.6</version>
+                <version>4.0.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
index 88501a1eed463d1e10583b70ef84a256a3c23d3d..a938596d10fb2f8fb487ff6c0e6e0467f0c88f37 100644 (file)
@@ -142,7 +142,7 @@ public class ConnectionAdapterImpl extends AbstractConnectionAdapterStatistics i
             LOG.debug("OF header msg received");
 
             if (alienMessageListener != null && alienMessageListener.onAlienMessage((OfHeader) message)) {
-                LOG.debug("Alien message {} received", message.getImplementedInterface());
+                LOG.debug("Alien message {} received", message.implementedInterface());
             } else if (outputManager == null || !outputManager.onMessage((OfHeader) message)
                     || message instanceof EchoOutput) {
                 final RpcResponseKey key = createRpcResponseKey((OfHeader) message);
@@ -160,7 +160,7 @@ public class ConnectionAdapterImpl extends AbstractConnectionAdapterStatistics i
     }
 
     private static RpcResponseKey createRpcResponseKey(final OfHeader message) {
-        return new RpcResponseKey(message.getXid(), message.getImplementedInterface().getName());
+        return new RpcResponseKey(message.getXid(), message.implementedInterface().getName());
     }
 
     @Override
index ddab52a6590c0dbf36828a909065411dc86f794f..84a5cfda9843c9b2a2671510d27e59ab9b5dfa40 100644 (file)
@@ -94,6 +94,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table.features._case.multipart.request.table.features.TableFeaturesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeatureProperties;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeaturePropertiesBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Translates MultipartRequestInput messages.
@@ -306,7 +307,7 @@ public class MultipartRequestInputMessageFactory
     private MultipartRequestDescCase setDesc(ByteBuf input) {
         MultipartRequestDescCaseBuilder caseBuilder = new MultipartRequestDescCaseBuilder();
         MultipartRequestDescBuilder descBuilder = new MultipartRequestDescBuilder();
-        descBuilder.setEmpty(true);
+        descBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestDesc(descBuilder.build());
         return caseBuilder.build();
     }
@@ -356,7 +357,7 @@ public class MultipartRequestInputMessageFactory
     private MultipartRequestPortDescCase setPortDesc(ByteBuf input) {
         MultipartRequestPortDescCaseBuilder caseBuilder = new MultipartRequestPortDescCaseBuilder();
         MultipartRequestPortDescBuilder portBuilder = new MultipartRequestPortDescBuilder();
-        portBuilder.setEmpty(true);
+        portBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestPortDesc(portBuilder.build());
         return caseBuilder.build();
     }
@@ -389,7 +390,7 @@ public class MultipartRequestInputMessageFactory
     private MultipartRequestGroupDescCase setGroupDesc(ByteBuf input) {
         MultipartRequestGroupDescCaseBuilder caseBuilder = new MultipartRequestGroupDescCaseBuilder();
         MultipartRequestGroupDescBuilder groupBuilder = new MultipartRequestGroupDescBuilder();
-        groupBuilder.setEmpty(true);
+        groupBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestGroupDesc(groupBuilder.build());
         return caseBuilder.build();
     }
@@ -397,7 +398,7 @@ public class MultipartRequestInputMessageFactory
     private MultipartRequestGroupFeaturesCase setGroupFeatures(ByteBuf input) {
         MultipartRequestGroupFeaturesCaseBuilder caseBuilder = new MultipartRequestGroupFeaturesCaseBuilder();
         MultipartRequestGroupFeaturesBuilder groupBuilder = new MultipartRequestGroupFeaturesBuilder();
-        groupBuilder.setEmpty(true);
+        groupBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestGroupFeatures(groupBuilder.build());
         return caseBuilder.build();
     }
@@ -421,7 +422,7 @@ public class MultipartRequestInputMessageFactory
     private MultipartRequestMeterFeaturesCase setMeterFeatures(ByteBuf input) {
         MultipartRequestMeterFeaturesCaseBuilder caseBuilder = new MultipartRequestMeterFeaturesCaseBuilder();
         MultipartRequestMeterFeaturesBuilder meterBuilder = new MultipartRequestMeterFeaturesBuilder();
-        meterBuilder.setEmpty(true);
+        meterBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestMeterFeatures(meterBuilder.build());
         return caseBuilder.build();
     }
@@ -429,7 +430,7 @@ public class MultipartRequestInputMessageFactory
     private MultipartRequestTableCase setTable(ByteBuf input) {
         MultipartRequestTableCaseBuilder caseBuilder = new MultipartRequestTableCaseBuilder();
         MultipartRequestTableBuilder tableBuilder = new MultipartRequestTableBuilder();
-        tableBuilder.setEmpty(true);
+        tableBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestTable(tableBuilder.build());
         return caseBuilder.build();
     }
index 07745c8fc408991848b9e67d263de3033ca59274..6d5b76e2379ae942d14e73750a48e0cc614ba25e 100644 (file)
@@ -41,6 +41,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.port.stats._case.MultipartRequestPortStatsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.queue._case.MultipartRequestQueueBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table._case.MultipartRequestTableBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Translates MultipartRequestInput messages.
@@ -120,7 +121,7 @@ public class OF10StatsRequestInputFactory
     private MultipartRequestTableCase setTable(ByteBuf input) {
         MultipartRequestTableCaseBuilder caseBuilder = new MultipartRequestTableCaseBuilder();
         MultipartRequestTableBuilder tableBuilder = new MultipartRequestTableBuilder();
-        tableBuilder.setEmpty(true);
+        tableBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestTable(tableBuilder.build());
         return caseBuilder.build();
     }
@@ -154,7 +155,7 @@ public class OF10StatsRequestInputFactory
     private MultipartRequestDescCase setDesc(ByteBuf input) {
         MultipartRequestDescCaseBuilder caseBuilder = new MultipartRequestDescCaseBuilder();
         MultipartRequestDescBuilder descBuilder = new MultipartRequestDescBuilder();
-        descBuilder.setEmpty(true);
+        descBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestDesc(descBuilder.build());
         return caseBuilder.build();
     }
index 85da215d4441e6fb463a20902706a36cf3b97b17..3b3aecbfddab12eee90211d9a05b30040f5344ef 100644 (file)
@@ -37,7 +37,7 @@ public class SerializationFactory {
      */
     public void messageToBuffer(short version, ByteBuf out, DataObject message) {
         OFSerializer<DataObject> serializer = registry.getSerializer(
-                new MessageTypeKey<>(version, message.getImplementedInterface()));
+                new MessageTypeKey<>(version, message.implementedInterface()));
         serializer.serialize(message, out);
     }
 }
index 9cca6acd518cbc4c3d3ed2d555e5940cb35e7819..8637dbdeff23b55baf84a87c93927a0e64ffbcf3 100644 (file)
@@ -67,11 +67,11 @@ public final class TypeKeyMakerFactory {
             public MessageTypeKey<?> make(Action entry) {
                 if (entry.getExperimenterId() != null) {
                     return new ActionSerializerKey<>(getVersion(),
-                            (Class<ActionChoice>) entry.getActionChoice().getImplementedInterface(),
+                            (Class<ActionChoice>) entry.getActionChoice().implementedInterface(),
                             entry.getExperimenterId().getValue());
                 }
                 return new ActionSerializerKey<>(getVersion(),
-                        (Class<ActionChoice>) entry.getActionChoice().getImplementedInterface(), null);
+                        (Class<ActionChoice>) entry.getActionChoice().implementedInterface(), null);
             }
         };
     }
@@ -88,11 +88,11 @@ public final class TypeKeyMakerFactory {
             public MessageTypeKey<?> make(Instruction entry) {
                 if (entry.getExperimenterId() != null) {
                     return new InstructionSerializerKey<>(getVersion(),
-                            (Class<InstructionChoice>) entry.getInstructionChoice().getImplementedInterface(),
+                            (Class<InstructionChoice>) entry.getInstructionChoice().implementedInterface(),
                             entry.getExperimenterId().getValue());
                 }
                 return new InstructionSerializerKey<>(getVersion(),
-                        (Class<InstructionChoice>) entry.getInstructionChoice().getImplementedInterface(), null);
+                        (Class<InstructionChoice>) entry.getInstructionChoice().implementedInterface(), null);
             }
         };
     }
index 55d59df915a03d0ef2c8b3c6d0ab143547c01a36..7dca156883605e8b6e8c2842d37645e274d36bb4 100644 (file)
@@ -23,6 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestDescCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestDescCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.desc._case.MultipartRequestDescBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Unit tests for MultipartRequestDescInputMessageFactory.
@@ -55,7 +56,7 @@ public class MultipartRequestDescInputMessageFactoryTest {
     private static MultipartRequestDescCase createRequestDesc() {
         MultipartRequestDescCaseBuilder caseBuilder = new MultipartRequestDescCaseBuilder();
         MultipartRequestDescBuilder builder = new MultipartRequestDescBuilder();
-        builder.setEmpty(true);
+        builder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestDesc(builder.build());
         return caseBuilder.build();
     }
index dba8db29d1e857c92f8f4690157c71e05105ce6f..6bacff0b083f630728a2793ad71a55d98a233a41 100644 (file)
@@ -22,6 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.MultipartRequestBody;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestDescCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.desc._case.MultipartRequestDescBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Unit tests for OF10StatsRequestInputDescFactory.
@@ -53,7 +54,7 @@ public class OF10StatsRequestInputDescFactoryTest {
     private static MultipartRequestBody createMultipartRequestBody() {
         MultipartRequestDescCaseBuilder caseBuilder = new MultipartRequestDescCaseBuilder();
         MultipartRequestDescBuilder descBuilder = new MultipartRequestDescBuilder();
-        descBuilder.setEmpty(true);
+        descBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestDesc(descBuilder.build());
         return caseBuilder.build();
     }
index c8ba0acd79d5c2482c310c8c9f7b6e7d1d880412..90af00075f8f0bc72a1344d744bd8e4dea585a57 100644 (file)
@@ -22,6 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.MultipartRequestBody;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestTableCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table._case.MultipartRequestTableBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Unit tests for OF10StatsRequestInputTableFactory.
@@ -53,7 +54,7 @@ public class OF10StatsRequestInputTableFactoryTest {
     private static MultipartRequestBody createMultipartRequestBody() {
         MultipartRequestTableCaseBuilder caseBuilder = new MultipartRequestTableCaseBuilder();
         MultipartRequestTableBuilder tableBuilder = new MultipartRequestTableBuilder();
-        tableBuilder.setEmpty(true);
+        tableBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestTable(tableBuilder.build());
         return caseBuilder.build();
     }
index 4fd18fe5778a542312b444ab0b430e2430641759..ee65bd3ec2c076d94d71cadfcb0f25d3d308056e 100644 (file)
@@ -26,6 +26,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroupDescCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.group.desc._case.MultipartRequestGroupDescBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Unit tests for MultipartRequestGroupDesc.
@@ -59,7 +60,7 @@ public class MultipartRequestGroupDescTest {
         builder.setFlags(new MultipartRequestFlags(false));
         MultipartRequestGroupDescCaseBuilder caseBuilder = new MultipartRequestGroupDescCaseBuilder();
         MultipartRequestGroupDescBuilder descBuilder = new MultipartRequestGroupDescBuilder();
-        descBuilder.setEmpty(true);
+        descBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestGroupDesc(descBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();
index 2cd9b7bbf1659d3fda610633d4b9dd8d727ca284..fc21ff455e0882f2f34fc1c031a8300c1c08c761 100644 (file)
@@ -5,7 +5,6 @@
  * 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.openflowjava.protocol.impl.serialization.factories.multipart;
 
 import io.netty.buffer.ByteBuf;
@@ -26,6 +25,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroupFeaturesCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.group.features._case.MultipartRequestGroupFeaturesBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Unit tests for MultipartRequestGroupFeatures.
@@ -59,7 +59,7 @@ public class MultipartRequestGroupFeaturesTest {
         builder.setFlags(new MultipartRequestFlags(false));
         MultipartRequestGroupFeaturesCaseBuilder caseBuilder = new MultipartRequestGroupFeaturesCaseBuilder();
         MultipartRequestGroupFeaturesBuilder featuresBuilder = new MultipartRequestGroupFeaturesBuilder();
-        featuresBuilder.setEmpty(true);
+        featuresBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestGroupFeatures(featuresBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();
index 84143f1dffa41960e38bacfed81e8ed17e95a197..e71f7aff9a61034478594bc3c6215805e86de67d 100644 (file)
@@ -5,7 +5,6 @@
  * 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.openflowjava.protocol.impl.serialization.factories.multipart;
 
 import io.netty.buffer.ByteBuf;
@@ -26,6 +25,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestMeterFeaturesCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.meter.features._case.MultipartRequestMeterFeaturesBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Unit tests for MultipartRequestMeterFeatures.
@@ -59,7 +59,7 @@ public class MultipartRequestMeterFeaturesTest {
         builder.setFlags(new MultipartRequestFlags(false));
         MultipartRequestMeterFeaturesCaseBuilder caseBuilder = new MultipartRequestMeterFeaturesCaseBuilder();
         MultipartRequestMeterFeaturesBuilder featuresBuilder = new MultipartRequestMeterFeaturesBuilder();
-        featuresBuilder.setEmpty(true);
+        featuresBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestMeterFeatures(featuresBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();
index 516202122154675616dd1a53a2d49d40e79c162f..86ffee7de80f25b8282b1d1a2454393579ed4296 100644 (file)
@@ -26,6 +26,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestPortDescCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.port.desc._case.MultipartRequestPortDescBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Unit tests for MultipartRequestPortDesc.
@@ -59,7 +60,7 @@ public class MultipartRequestPortDescTest {
         builder.setFlags(new MultipartRequestFlags(false));
         MultipartRequestPortDescCaseBuilder caseBuilder = new MultipartRequestPortDescCaseBuilder();
         MultipartRequestPortDescBuilder descBuilder = new MultipartRequestPortDescBuilder();
-        descBuilder.setEmpty(true);
+        descBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestPortDesc(descBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();
index ce0c81a8606102404ed7f519dae253cd945a3f0e..5f153e7f87dce65de5d06e545622b0707b2d8722 100644 (file)
@@ -5,7 +5,6 @@
  * 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.openflowjava.protocol.impl.serialization.factories.multipart;
 
 import io.netty.buffer.ByteBuf;
@@ -26,6 +25,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestTableCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table._case.MultipartRequestTableBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Unit tests for MultipartRequestTable.
@@ -59,7 +59,7 @@ public class MultipartRequestTableTest {
         builder.setFlags(new MultipartRequestFlags(false));
         MultipartRequestTableCaseBuilder caseBuilder = new MultipartRequestTableCaseBuilder();
         MultipartRequestTableBuilder tablesBuilder = new MultipartRequestTableBuilder();
-        tablesBuilder.setEmpty(true);
+        tablesBuilder.setEmpty(Empty.getInstance());
         caseBuilder.setMultipartRequestTable(tablesBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();
index 36e84e11d25c8bd61f91b8ef652ebea8f4070601..d3baa88ed8ee1713da2cd48f61114fbfb8f4a65e 100644 (file)
@@ -8,6 +8,8 @@
 package org.opendaylight.openflowplugin.impl;
 
 import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.TransactionChain;
+import org.opendaylight.mdsal.binding.api.TransactionChainListener;
 import org.opendaylight.mdsal.binding.spi.ForwardingDataBroker;
 
 /**
@@ -16,6 +18,7 @@ import org.opendaylight.mdsal.binding.spi.ForwardingDataBroker;
  *
  * @author Michael Vorburger.ch
  */
+// FIXME: this should not be necessary
 public class ForwardingPingPongDataBroker extends ForwardingDataBroker implements PingPongDataBroker {
 
     private final DataBroker delegate;
@@ -28,4 +31,9 @@ public class ForwardingPingPongDataBroker extends ForwardingDataBroker implement
     protected DataBroker delegate() {
         return delegate;
     }
+
+    @Override
+    public TransactionChain createTransactionChain(final TransactionChainListener listener) {
+        return delegate().createMergingTransactionChain(listener);
+    }
 }
index 422956d20e9f9ba9f84bfc0cc5faa59f1182b4df..a46b58d106b2cfd66356dbeaf2ed9a5b8a682bfa 100644 (file)
@@ -184,7 +184,7 @@ public final class MultipartReplyTranslatorUtil {
                 .MultipartReply) message).getMultipartReplyBody());
         }
 
-        LOG.debug("Failed to translate {} for node {}.", message.getImplementedInterface(), deviceInfo);
+        LOG.debug("Failed to translate {} for node {}.", message.implementedInterface(), deviceInfo);
         return Optional.empty();
     }
 
index f4acb907ac36bdcc9e2bdc609ac0456720464176..61e04ac6f2ee95feb65a28813904dc94091b79ee 100644 (file)
@@ -13,7 +13,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.NonZeroUint32Type;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 public class OpenFlowProviderConfigImpl implements OpenflowProviderConfig {
     private final ConfigurationService service;
@@ -173,11 +172,6 @@ public class OpenFlowProviderConfigImpl implements OpenflowProviderConfig {
         return null;
     }
 
-    @Override
-    public Class<? extends DataContainer> getImplementedInterface() {
-        return OpenflowProviderConfig.class;
-    }
-
     @Override
     public Integer getDeviceConnectionRateLimitPerMin() {
         return service.getProperty(ConfigurationProperty.DEVICE_CONNECTION_RATE_LIMIT_PER_MIN.toString(),
index 4f660f55b4511420dcd50313d3c5383b1c6c70ae..09660f0e07a428f5de4b3b6ddf7ab5933bb52356 100644 (file)
@@ -285,7 +285,7 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi
     @Override
     public void processReply(final OfHeader ofHeader) {
         messageSpy.spyMessage(
-                ofHeader.getImplementedInterface(),
+                ofHeader.implementedInterface(),
                 ofHeader instanceof Error
                         ? MessageSpy.StatisticsGroup.FROM_SWITCH_PUBLISHED_FAILURE
                         : MessageSpy.StatisticsGroup.FROM_SWITCH_PUBLISHED_SUCCESS);
@@ -294,7 +294,7 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi
     @Override
     public void processReply(final Xid xid, final List<? extends OfHeader> ofHeaderList) {
         ofHeaderList.forEach(header -> messageSpy.spyMessage(
-                header.getImplementedInterface(),
+                header.implementedInterface(),
                 header instanceof Error
                         ? MessageSpy.StatisticsGroup.FROM_SWITCH_PUBLISHED_FAILURE
                         : MessageSpy.StatisticsGroup.FROM_SWITCH_PUBLISHED_SUCCESS));
@@ -321,7 +321,7 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi
     @Override
     @SuppressWarnings("checkstyle:IllegalCatch")
     public void processPortStatusMessage(final PortStatusMessage portStatus) {
-        messageSpy.spyMessage(portStatus.getImplementedInterface(), MessageSpy.StatisticsGroup
+        messageSpy.spyMessage(portStatus.implementedInterface(), MessageSpy.StatisticsGroup
                 .FROM_SWITCH_PUBLISHED_SUCCESS);
 
         if (initialized.get()) {
@@ -365,7 +365,7 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi
     public void processPacketInMessage(final PacketInMessage packetInMessage) {
         if (isMasterOfDevice()) {
             final PacketReceived packetReceived = packetInTranslator.translate(packetInMessage, getDeviceInfo(), null);
-            handlePacketInMessage(packetReceived, packetInMessage.getImplementedInterface(), packetReceived.getMatch());
+            handlePacketInMessage(packetReceived, packetInMessage.implementedInterface(), packetReceived.getMatch());
         } else {
             LOG.debug("Controller is not owner of the device {}, skipping packet_in message", deviceInfo.getLOGValue());
         }
@@ -460,12 +460,12 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi
             final ExperimenterDataOfChoice vendorData = notification.getExperimenterDataOfChoice();
             final MessageTypeKey<? extends ExperimenterDataOfChoice> key = new MessageTypeKey<>(
                     getDeviceInfo().getVersion(),
-                    (Class<? extends ExperimenterDataOfChoice>) vendorData.getImplementedInterface());
+                    (Class<? extends ExperimenterDataOfChoice>) vendorData.implementedInterface());
             final ConvertorMessageFromOFJava<ExperimenterDataOfChoice, MessagePath> messageConverter =
                     extensionConverterProvider.getMessageConverter(key);
             if (messageConverter == null) {
                 LOG.warn("custom converter for {}[OF:{}] not found",
-                        notification.getExperimenterDataOfChoice().getImplementedInterface(),
+                        notification.getExperimenterDataOfChoice().implementedInterface(),
                         getDeviceInfo().getVersion());
                 return;
             }
@@ -489,7 +489,7 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi
     // recognize it.
     @SuppressFBWarnings("BC_UNCONFIRMED_CAST")
     public boolean processAlienMessage(final OfHeader message) {
-        final Class<? extends DataContainer> implementedInterface = message.getImplementedInterface();
+        final Class<? extends DataContainer> implementedInterface = message.implementedInterface();
 
         if (org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketInMessage.class
                 .equals(implementedInterface)) {
index 67f599f517d5305395a4b656641a552e920a0ac2..1aa5f5ccc3fbf1316335c0eabecece6c59db8f7c 100644 (file)
@@ -52,7 +52,7 @@ public class MultipartReplyExperimenterDeserializer implements OFDeserializer<Mu
             final ExperimenterDataOfChoice data = deserializer.deserialize(message);
             final MessageTypeKey<? extends ExperimenterDataOfChoice> key = new MessageTypeKey<>(
                     EncodeConstants.OF13_VERSION_ID,
-                    (Class<? extends ExperimenterDataOfChoice>) data.getImplementedInterface());
+                    (Class<? extends ExperimenterDataOfChoice>) data.implementedInterface());
 
             final ConvertorMessageFromOFJava<ExperimenterDataOfChoice, MessagePath> convertor = OFSessionUtil
                     .getExtensionConvertorProvider()
index d601d2f9cf757ef4b48059f628394115c2fbe567..d9e1c8dcb9a90ee2ebc30a83fc229565fd9e753a 100644 (file)
@@ -117,7 +117,7 @@ public class MatchSerializer implements OFSerializer<Match>, HeaderSerializer<Ma
                     })
                     .orElseGet(() -> {
                         LOG.warn("Serializer for match entry {} for version {} not found.",
-                                extension.getExtension().getImplementedInterface(),
+                                extension.getExtension().implementedInterface(),
                                 OFConstants.OFP_VERSION_1_3);
                         return null;
                     });
index 6ebe4ed7deb84fdf513c62719dbbc9e390459cd1..0a0f64bfb7e76ce97ff4126dc318b0729812a20a 100644 (file)
@@ -87,7 +87,7 @@ public class MeterMessageSerializer extends AbstractMessageSerializer<MeterMessa
                                             new ExperimenterIdSerializerKey<>(
                                                     EncodeConstants.OF13_VERSION_ID,
                                                     band.getExperimenter(),
-                                                    (Class<Experimenter>) type.getImplementedInterface());
+                                                    (Class<Experimenter>) type.implementedInterface());
 
                                     try {
                                         final OFSerializer<Experimenter> serializer = registry.getSerializer(key);
index fc73026c96fe4b697ea92dd13241850d7e4772c0..d655fab41ef7693c86c3fdcf69a4b4512e9e1db2 100644 (file)
@@ -38,7 +38,7 @@ public class MultipartRequestExperimenterSerializer implements OFSerializer<Mult
             final OFSerializer<ExperimenterMessageOfChoice> serializer = Preconditions.checkNotNull(registry)
                     .getSerializer(new MessageTypeKey<>(
                             EncodeConstants.OF13_VERSION_ID,
-                            multipartRequestExperimenter.getExperimenterMessageOfChoice().getImplementedInterface()));
+                            multipartRequestExperimenter.getExperimenterMessageOfChoice().implementedInterface()));
 
             serializer.serialize(multipartRequestExperimenter.getExperimenterMessageOfChoice(), byteBuf);
         } catch (ClassCastException | IllegalStateException ex) {
@@ -46,7 +46,7 @@ public class MultipartRequestExperimenterSerializer implements OFSerializer<Mult
                     .ofNullable(OFSessionUtil.getExtensionConvertorProvider().<ExperimenterMessageOfChoice,
                             ExperimenterDataOfChoice, ConvertorData>getMessageConverter(new TypeVersionKey<>(
                             (Class<ExperimenterMessageOfChoice>) multipartRequestExperimenter
-                                    .getExperimenterMessageOfChoice().getImplementedInterface(),
+                                    .getExperimenterMessageOfChoice().implementedInterface(),
                             OFConstants.OFP_VERSION_1_3)))
                     .ifPresent(converter -> {
                         final OFSerializer<ExperimenterDataOfChoice> serializer = Preconditions.checkNotNull(registry)
index 9daa652272498832d4cd16bb9224ba0f46a841b5..2263ae2be0b5c33406312b118bdb0cac8aee30bd 100644 (file)
@@ -56,7 +56,7 @@ public class MultipartRequestMessageSerializer extends AbstractMessageSerializer
         final OFSerializer<MultipartRequestBody> serializer = Preconditions.checkNotNull(registry)
             .getSerializer(new MessageTypeKey<>(
                 EncodeConstants.OF13_VERSION_ID,
-                multipartRequestBody.getImplementedInterface()));
+                multipartRequestBody.implementedInterface()));
 
         serializer.serialize(multipartRequestBody, outBuffer);
         outBuffer.setShort(index + 2, outBuffer.writerIndex() - index);
@@ -68,7 +68,7 @@ public class MultipartRequestMessageSerializer extends AbstractMessageSerializer
     }
 
     private static MultipartType getMultipartType(final MultipartRequestBody multipartRequestBody) {
-        final Class<? extends DataContainer> clazz = multipartRequestBody.getImplementedInterface();
+        final Class<? extends DataContainer> clazz = multipartRequestBody.implementedInterface();
 
         final MultipartType multipartType = MultipartRequestDesc.class.equals(clazz) ? MultipartType.OFPMPDESC
             : MultipartRequestFlowTableStats.class.equals(clazz) ? MultipartType.OFPMPTABLE
index e573fab5bbec603d9b2680fe65c6f55aa0472495..3939f8a14ecb4c902285d3808d2359f706d5750f 100644 (file)
@@ -63,7 +63,7 @@ public class MultipartRequestTableFeaturesSerializer implements OFSerializer<Mul
                 .forEach(property -> {
                     final Class<? extends TableFeaturePropType> clazz = (Class<? extends TableFeaturePropType>) property
                         .getTableFeaturePropType()
-                        .getImplementedInterface();
+                        .implementedInterface();
 
                     Preconditions.checkNotNull(registry)
                         .<TableFeaturePropType, OFSerializer<TableFeaturePropType>>getSerializer(
index f71a23d2bebe587837e95fbe7e1491cbb3fe737f..16600a1c11c8f41a4e60febd87745f1489bb52eb 100644 (file)
@@ -65,13 +65,13 @@ public final class ActionUtil {
                     ).orElseGet(() -> {
                         final OFSerializer<Action> serializer = registry.getSerializer(
                                 new MessageTypeKey<>(
-                                        version, (Class<? extends Action>) action.getImplementedInterface()));
+                                        version, (Class<? extends Action>) action.implementedInterface()));
 
                         serializer.serialize(action, outBuffer);
                         return action;
                     });
         } catch (final IllegalStateException | ClassCastException e) {
-            LOG.warn("Serializer for action {} for version {} not found.", action.getImplementedInterface(), version);
+            LOG.warn("Serializer for action {} for version {} not found.", action.implementedInterface(), version);
         }
     }
 
@@ -105,13 +105,13 @@ public final class ActionUtil {
                     ).orElseGet(() -> {
                         final HeaderSerializer<Action> serializer = registry.getSerializer(
                                 new MessageTypeKey<>(
-                                        version, (Class<? extends Action>) action.getImplementedInterface()));
+                                        version, (Class<? extends Action>) action.implementedInterface()));
 
                         serializer.serializeHeader(action, outBuffer);
                         return action;
                     });
         } catch (final IllegalStateException | ClassCastException e) {
-            LOG.warn("Header Serializer for action {} for version {} not found.", action.getImplementedInterface(),
+            LOG.warn("Header Serializer for action {} for version {} not found.", action.implementedInterface(),
                     version);
         }
     }
@@ -155,7 +155,7 @@ public final class ActionUtil {
                                                    final short version) {
 
         final TypeVersionKey<Action> key =
-                new TypeVersionKey<>((Class<? extends Action>) action.getImplementedInterface(), version);
+                new TypeVersionKey<>((Class<? extends Action>) action.implementedInterface(), version);
 
         final ConvertorActionToOFJava<Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action
                 .rev150203.actions.grouping.Action> converter = provider.getConverter(key);
index 413c4fdbf4ad01f96b620940e889885b8a3db3ab..dce5bde7bf8115c200a0cc77f30c427635d19886 100644 (file)
@@ -40,7 +40,7 @@ public final class InstructionUtil {
         registry.<Instruction, OFSerializer<Instruction>>getSerializer(
             new MessageTypeKey<>(
                 version,
-                (Class<Instruction>) instruction.getImplementedInterface()))
+                (Class<Instruction>) instruction.implementedInterface()))
             .serialize(instruction, outBuffer);
     }
 
@@ -62,7 +62,7 @@ public final class InstructionUtil {
         registry.<Instruction, HeaderSerializer<Instruction>>getSerializer(
             new MessageTypeKey<>(
                 version,
-                (Class<Instruction>) instruction.getImplementedInterface()))
+                (Class<Instruction>) instruction.implementedInterface()))
             .serializeHeader(instruction, outBuffer);
     }
 
index a6bd4b63db858c69f6a74b56e615c9fc347bdce8..038612c609436c6c9ef7576f227af6c1083746e4 100755 (executable)
@@ -69,7 +69,7 @@ public abstract class AbstractMultipartRequestOnTheFlyCallback<T extends OfHeade
 
             return;
         } else if (Service.State.TERMINATED.equals(gatheringState)) {
-            LOG.warn("Unexpected response received: xid={}, {}", result.getXid(), result.getImplementedInterface());
+            LOG.warn("Unexpected response received: xid={}, {}", result.getXid(), result.implementedInterface());
             return;
         }
 
index 8189a1ec70c26bb3d1456ff34332b78a23f3aa6f..af8e4495644ed725efb75c765e7ba34ce8eca8a4 100644 (file)
@@ -114,7 +114,7 @@ public abstract class AbstractService<I, O> {
         Preconditions.checkNotNull(input);
 
         final Class<?> requestType = input instanceof DataContainer
-            ? ((DataContainer) input).getImplementedInterface()
+            ? ((DataContainer) input).implementedInterface()
             : input.getClass();
 
         getMessageSpy().spyMessage(requestType, MessageSpy.StatisticsGroup.TO_SWITCH_ENTERED);
index 066efcb70dfc23e5c562141bd267e0e178d34c1e..bebf8e4e6fe1f1fd73dcb268233cd732eab7e8b5 100644 (file)
@@ -62,7 +62,7 @@ public class MultiLayerExperimenterMultipartService extends AbstractExperimenter
     @SuppressWarnings("unchecked")
     protected OfHeader buildRequest(Xid xid, SendExperimenterMpRequestInput input) throws ServiceException {
         final TypeVersionKey key = new TypeVersionKey<>(
-            input.getExperimenterMessageOfChoice().getImplementedInterface(),
+            input.getExperimenterMessageOfChoice().implementedInterface(),
             getVersion());
 
         final ConverterMessageToOFJava<ExperimenterMessageOfChoice, ExperimenterDataOfChoice,
@@ -120,12 +120,12 @@ public class MultiLayerExperimenterMultipartService extends AbstractExperimenter
                             final ExperimenterDataOfChoice vendorData = replyBody.getExperimenterDataOfChoice();
                             final MessageTypeKey<? extends ExperimenterDataOfChoice> key = new MessageTypeKey<>(
                                     getVersion(),
-                                    (Class<? extends ExperimenterDataOfChoice>) vendorData.getImplementedInterface());
+                                    (Class<? extends ExperimenterDataOfChoice>) vendorData.implementedInterface());
                             final ConvertorMessageFromOFJava<ExperimenterDataOfChoice, MessagePath> messageConverter =
                                     getExtensionConverterProvider().getMessageConverter(key);
                             if (messageConverter == null) {
                                 LOG.warn("Custom converter for {}[OF:{}] not found",
-                                        vendorData.getImplementedInterface(),
+                                        vendorData.implementedInterface(),
                                         getVersion());
                                 finalFuture.set(RpcResultBuilder.<SendExperimenterMpRequestOutput>failed()
                                         .withError(ErrorType.RPC, "Custom converter not found.").build());
index 810ab35e71920adb850bf7b95393bc8899da7cbe..a7564536b020d4c08aa98719697511920df85758 100644 (file)
@@ -46,7 +46,7 @@ public class SalExperimenterMessageServiceImpl extends AbstractSimpleService<Sen
     @Override
     protected OfHeader buildRequest(Xid xid, SendExperimenterInput input) throws ServiceException {
         final TypeVersionKey key =
-                new TypeVersionKey(input.getExperimenterMessageOfChoice().getImplementedInterface(), getVersion());
+                new TypeVersionKey(input.getExperimenterMessageOfChoice().implementedInterface(), getVersion());
         final ConverterMessageToOFJava<ExperimenterMessageOfChoice, ExperimenterDataOfChoice,
             ExtensionConvertorData> messageConverter = extensionConverterProvider.getMessageConverter(key);
 
index d4bb8e9eae58a15fedd45937ee3c5465d0f4a25d..ee121eeee4d589af9eb0ecd349e4f0ce71040921 100644 (file)
@@ -33,7 +33,7 @@ public final class SingleLayerFlowService<O extends DataObject> extends Abstract
     @Override
     protected OfHeader buildRequest(final Xid xid, final Flow input) {
         final FlowMessageBuilder flowMessageBuilder = new FlowMessageBuilder(input);
-        final Class<? extends DataContainer> clazz = input.getImplementedInterface();
+        final Class<? extends DataContainer> clazz = input.implementedInterface();
 
         if (clazz.equals(AddFlowInput.class)
                 || clazz.equals(UpdatedFlow.class)) {
index 86aa614b795fcd26da99389d5c7b973b08420f2f..446c6e83ab373ef1913b0648ab4bb6d3d9215ef6 100644 (file)
@@ -35,7 +35,7 @@ public final class SingleLayerGroupService<O extends DataObject> extends Abstrac
     @Override
     protected OfHeader buildRequest(final Xid xid, final Group input) {
         final GroupMessageBuilder groupMessageBuilder = new GroupMessageBuilder(input);
-        final Class<? extends DataContainer> clazz = input.getImplementedInterface();
+        final Class<? extends DataContainer> clazz = input.implementedInterface();
 
         if (clazz.equals(AddGroupInput.class)) {
             groupMessageBuilder.setCommand(GroupModCommand.OFPGCADD);
index 05900d7003ce0b2053f28e4f70b8a2108bcf6d02..0c30432a1c76cf35cd113ee05096ca946d4187e7 100644 (file)
@@ -35,7 +35,7 @@ public final class SingleLayerMeterService<O extends DataObject> extends Abstrac
     @Override
     protected OfHeader buildRequest(final Xid xid, final Meter input) {
         final MeterMessageBuilder meterMessageBuilder = new MeterMessageBuilder(input);
-        final Class<? extends DataContainer> clazz = input.getImplementedInterface();
+        final Class<? extends DataContainer> clazz = input.implementedInterface();
 
         if (clazz.equals(AddMeterInput.class)
                 || clazz.equals(UpdatedMeter.class)) {
index 88e73c75aee386ea732988103b63cb57ed770504..ec653043938260d9505c4a68db51799dc2ad36ae 100644 (file)
@@ -38,6 +38,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestTableCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table._case.MultipartRequestTableBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableId;
+import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
 public final class OpendaylightFlowTableStatisticsServiceImpl extends
@@ -68,7 +69,7 @@ public final class OpendaylightFlowTableStatisticsServiceImpl extends
         final MultipartRequestTableCaseBuilder multipartRequestTableCaseBuilder =
                 new MultipartRequestTableCaseBuilder();
         final MultipartRequestTableBuilder multipartRequestTableBuilder = new MultipartRequestTableBuilder();
-        multipartRequestTableBuilder.setEmpty(true);
+        multipartRequestTableBuilder.setEmpty(Empty.getInstance());
         multipartRequestTableCaseBuilder.setMultipartRequestTable(multipartRequestTableBuilder.build());
 
         // Set request body to main multipart request
index 4e0c14529f2aaf2dacf0cd68d02a25aee22ee376..03071d2e79864a084e71a4fa45ff070f524e64c9 100644 (file)
@@ -150,8 +150,9 @@ public final class FlatBatchUtil {
     @VisibleForTesting
     static <T extends BatchChoice> BatchStepType detectBatchStepType(final T batchCase) {
         final BatchStepType type;
-        final Class<? extends DataContainer> implementedInterface = batchCase.getImplementedInterface();
+        final Class<? extends DataContainer> implementedInterface = batchCase.implementedInterface();
 
+        // FIXME: use a lookup table instead of this cascade
         if (FlatBatchAddFlowCase.class.equals(implementedInterface)) {
             type = BatchStepType.FLOW_ADD;
         } else if (FlatBatchRemoveFlowCase.class.equals(implementedInterface)) {
index 9bccf59c15231723835f0aae077279c8aec606e6..ebf04678eed6b2bd48cc298d8c6802782c997d86 100644 (file)
@@ -147,7 +147,7 @@ public final class MatchUtil {
             return null;
         }
 
-        if (implementedInterface.equals(match.getImplementedInterface())) {
+        if (implementedInterface.equals(match.implementedInterface())) {
             return implementedInterface.cast(match);
         }
 
index d6c0514cc86cae225fe4e074e79ef233cba9e62f..7b80dbb1a90b91e6513031af71b18893e11a8aa7 100644 (file)
@@ -23,7 +23,7 @@
   </bean>
   <service ref="configurationService" interface="org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationService"/>
 
-  <reference id="ppDB" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="pingpong"/>
+  <reference id="ppDB" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
   <bean id="pingPongDataBroker" class="org.opendaylight.openflowplugin.impl.ForwardingPingPongDataBroker">
     <argument ref="ppDB"/>
   </bean>
index 546c202ee7f5951d1a92696028fccc2a52b37a15..49cd3416b06e8fc134fc16e67b71b25f4fac5aa1 100644 (file)
@@ -60,7 +60,7 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(), MultipartRequestDescCase.class);
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().implementedInterface(), MultipartRequestDescCase.class);
     }
 
     @Test
@@ -110,7 +110,7 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(),
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().implementedInterface(),
                 MultipartRequestAggregateCase.class);
     }
 
@@ -120,7 +120,7 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(), MultipartRequestTableCase.class);
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().implementedInterface(), MultipartRequestTableCase.class);
     }
 
     @Test
@@ -169,7 +169,7 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(),
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().implementedInterface(),
                 MultipartRequestGroupDescCase.class);
     }
 
@@ -179,7 +179,7 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(),
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().implementedInterface(),
                 MultipartRequestGroupFeaturesCase.class);
     }
 
@@ -216,7 +216,7 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(),
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().implementedInterface(),
                 MultipartRequestMeterFeaturesCase.class);
     }
 
@@ -240,7 +240,7 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(),
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().implementedInterface(),
                 MultipartRequestPortDescCase.class);
     }
 
@@ -250,7 +250,7 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(),
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().implementedInterface(),
                 MultipartRequestExperimenterCase.class);
     }
 
index ece6796c8d27fd74809dbcc05f256a332332c96c..729b2ac32e8e0a6d798f5dbeb108dc505d8ac473 100644 (file)
@@ -416,7 +416,7 @@ public class DeviceContextImplTest {
     public void testPortStatusMessage() {
         final PortStatusMessage mockedPortStatusMessage = mock(PortStatusMessage.class);
         final Class dummyClass = Class.class;
-        when(mockedPortStatusMessage.getImplementedInterface()).thenReturn(dummyClass);
+        when(mockedPortStatusMessage.implementedInterface()).thenReturn(dummyClass);
 
 
         final GetFeaturesOutput mockedFeature = mock(GetFeaturesOutput.class);
index 09339f26d12f353d7e9840b8c8bd4c521d6c3b2c..c13c4d2ceabd476ffbc1fd71efd60ece34571ddf 100644 (file)
@@ -55,11 +55,11 @@ public class ApplyActionsInstructionDeserializerTest extends AbstractInstruction
         in.setShort(index, in.writerIndex() - startIndex);
 
         final Instruction instruction = deserializer.deserialize(in);
-        assertEquals(ApplyActionsCase.class, instruction.getImplementedInterface());
+        assertEquals(ApplyActionsCase.class, instruction.implementedInterface());
         final ApplyActionsCase actionCase = (ApplyActionsCase) instruction;
         assertEquals(1, actionCase.getApplyActions().getAction().size());
         assertEquals(PopPbbActionCase.class, actionCase.getApplyActions().getAction().get(0)
-                .getAction().getImplementedInterface());
+                .getAction().implementedInterface());
         assertEquals(0, in.readableBytes());
     }
 
index 9a1e9399b105f951278a10c33f8ee52e52775096..176663feb2a32dc3c8c2d94e8be12b619d2a42b1 100644 (file)
@@ -26,7 +26,7 @@ public class ClearActionsInstructionDeserializerTest extends AbstractInstruction
         in.writeZero(InstructionConstants.PADDING_IN_ACTIONS_INSTRUCTION);
 
         final Instruction instruction = deserializeInstruction(in);
-        assertEquals(ClearActionsCase.class, instruction.getImplementedInterface());
+        assertEquals(ClearActionsCase.class, instruction.implementedInterface());
         assertEquals(0, in.readableBytes());
     }
 
index 02049513572eecc40654b94c439118d007290872..56f9ca63dc11b6f3227af88dbacf06ad1796b90d 100644 (file)
@@ -28,7 +28,7 @@ public class GoToTableInstructionDeserializerTest extends AbstractInstructionDes
         in.writeZero(InstructionConstants.PADDING_IN_GOTO_TABLE);
 
         final Instruction instruction = deserializeInstruction(in);
-        assertEquals(GoToTableCase.class, instruction.getImplementedInterface());
+        assertEquals(GoToTableCase.class, instruction.implementedInterface());
         assertEquals(tableId, ((GoToTableCase) instruction).getGoToTable().getTableId().shortValue());
         assertEquals(0, in.readableBytes());
     }
index a1c8655f805e8ac4e432acd5acb2c2794b6de8bc..57239374f1ebbed60cf74eaf7bd71eb78838ff49 100644 (file)
@@ -27,7 +27,7 @@ public class MeterInstructionDeserializerTest extends AbstractInstructionDeseria
         in.writeInt(meterId);
 
         final Instruction instruction = deserializeInstruction(in);
-        assertEquals(MeterCase.class, instruction.getImplementedInterface());
+        assertEquals(MeterCase.class, instruction.implementedInterface());
         assertEquals(meterId, ((MeterCase) instruction).getMeter().getMeterId().getValue().intValue());
         assertEquals(0, in.readableBytes());
     }
index beecbc29fcd81ac276ef2119a38889cfa196b2db..35e32747baebc2f391197f57d4abd844194e4ba4 100644 (file)
@@ -55,11 +55,11 @@ public class WriteActionsInstructionDeserializerTest extends AbstractInstruction
         in.setShort(index, in.writerIndex() - startIndex);
 
         final Instruction instruction = deserializer.deserialize(in);
-        assertEquals(WriteActionsCase.class, instruction.getImplementedInterface());
+        assertEquals(WriteActionsCase.class, instruction.implementedInterface());
         final WriteActionsCase actionCase = (WriteActionsCase) instruction;
         assertEquals(1, actionCase.getWriteActions().getAction().size());
         assertEquals(PopPbbActionCase.class, actionCase.getWriteActions().getAction().get(0)
-                .getAction().getImplementedInterface());
+                .getAction().implementedInterface());
         assertEquals(0, in.readableBytes());
     }
 
index ae1dc3a2b6205cb3b9df074f4b75d1773e415f59..e8a03262dc13cec3889729c93f82d026133b6818 100644 (file)
@@ -34,7 +34,7 @@ public class WriteMetadataInstructionDeserializerTest extends AbstractInstructio
         in.writeBytes(ByteUtil.convertBigIntegerToNBytes(metadataMask, EncodeConstants.SIZE_OF_LONG_IN_BYTES));
 
         final Instruction instruction = deserializeInstruction(in);
-        assertEquals(WriteMetadataCase.class, instruction.getImplementedInterface());
+        assertEquals(WriteMetadataCase.class, instruction.implementedInterface());
 
         assertArrayEquals(
                 ByteUtil
index a1daa00b1de1c3de061f7da08d88f67fa550396d..5d61becb2ff5ff52a44244aed26d613b6aa655ac 100644 (file)
@@ -130,12 +130,12 @@ public class FlowMessageDeserializerTest extends AbstractDeserializerTest {
         assertEquals(1, message.getInstructions().getInstruction().size());
 
         final Instruction instruction = message.getInstructions().getInstruction().get(0).getInstruction();
-        assertEquals(ApplyActionsCase.class, instruction.getImplementedInterface());
+        assertEquals(ApplyActionsCase.class, instruction.implementedInterface());
 
         final ApplyActionsCase applyActions = (ApplyActionsCase) instruction;
         assertEquals(1, applyActions.getApplyActions().getAction().size());
         assertEquals(PopPbbActionCase.class, applyActions.getApplyActions().getAction().get(0)
-                .getAction().getImplementedInterface());
+                .getAction().implementedInterface());
     }
 
 }
index 1d0caa73dabb186909224b78a47eaa3cc5dc16bd..949294cdd1633d126deb2f92965d6efcf369204c 100644 (file)
@@ -84,7 +84,7 @@ public class GroupMessageDeserializerTest extends AbstractDeserializerTest {
         assertEquals(WATCH_PORT, bucket.getWatchPort().intValue());
         assertEquals(WATCH_GROUP, bucket.getWatchGroup().intValue());
         assertEquals(1, bucket.getAction().size());
-        assertEquals(PopPbbActionCase.class, bucket.getAction().get(0).getAction().getImplementedInterface());
+        assertEquals(PopPbbActionCase.class, bucket.getAction().get(0).getAction().implementedInterface());
     }
 
 }
index 628424aefd73054f1c452531e00cf8e0c16ee057..56d82f0989743f2daa72180a5dbb1f16e8dc110b 100644 (file)
@@ -90,7 +90,7 @@ public class MeterMessageDeserializerTest extends AbstractDeserializerTest {
 
         // Drop band
         final MeterBandHeader dropHeader = meterBandHeader.get(0);
-        assertEquals(Drop.class, dropHeader.getBandType().getImplementedInterface());
+        assertEquals(Drop.class, dropHeader.getBandType().implementedInterface());
         assertTrue(dropHeader.getMeterBandTypes().getFlags().isOfpmbtDrop());
 
         final Drop drop = (Drop) dropHeader.getBandType();
@@ -99,7 +99,7 @@ public class MeterMessageDeserializerTest extends AbstractDeserializerTest {
 
         // Dscp band
         final MeterBandHeader dscpHeader = meterBandHeader.get(1);
-        assertEquals(DscpRemark.class, dscpHeader.getBandType().getImplementedInterface());
+        assertEquals(DscpRemark.class, dscpHeader.getBandType().implementedInterface());
         assertTrue(dscpHeader.getMeterBandTypes().getFlags().isOfpmbtDscpRemark());
 
         final DscpRemark dscpRemark = (DscpRemark) dscpHeader.getBandType();
index 0496b30af306ccd2b41769188afcb0debe5c89ef..f6399b25ec64a06489f427b162cb69f9ddaf9278 100644 (file)
@@ -146,21 +146,21 @@ public class MultipartReplyFlowStatsDeserializerTest extends AbstractMultipartDe
 
         final Instruction instruction =
                 flowAndStatisticsMapList.getInstructions().getInstruction().get(0).getInstruction();
-        assertEquals(ApplyActionsCase.class, instruction.getImplementedInterface());
+        assertEquals(ApplyActionsCase.class, instruction.implementedInterface());
 
         final ApplyActionsCase applyActions = (ApplyActionsCase) instruction;
         assertEquals(1, applyActions.getApplyActions().getAction().size());
         assertEquals(PopPbbActionCase.class, applyActions.getApplyActions().getAction().get(0)
-                .getAction().getImplementedInterface());
+                .getAction().implementedInterface());
 
         final Instruction instruction1 =
                 flowAndStatisticsMapList.getInstructions().getInstruction().get(1).getInstruction();
-        assertEquals(WriteActionsCase.class, instruction1.getImplementedInterface());
+        assertEquals(WriteActionsCase.class, instruction1.implementedInterface());
 
         final WriteActionsCase writeActions = (WriteActionsCase) instruction1;
         assertEquals(1, writeActions.getWriteActions().getAction().size());
         assertEquals(PopVlanActionCase.class, writeActions.getWriteActions().getAction().get(0)
-                .getAction().getImplementedInterface());
+                .getAction().implementedInterface());
     }
 
     @Override
index d6ebcbcc026f5ba71448cc11e3b2dfcefedb2f6f..70d4672ff9d22063266b89b695573d240bb0d62b 100644 (file)
@@ -150,11 +150,11 @@ public class MultipartReplyMessageDeserializerTest extends AbstractDeserializerT
 
         final Instruction instruction =
                 flowAndStatisticsMapList.getInstructions().getInstruction().get(0).getInstruction();
-        assertEquals(ApplyActionsCase.class, instruction.getImplementedInterface());
+        assertEquals(ApplyActionsCase.class, instruction.implementedInterface());
 
         final ApplyActionsCase applyActions = (ApplyActionsCase) instruction;
         assertEquals(1, applyActions.getApplyActions().getAction().size());
         assertEquals(PopPbbActionCase.class, applyActions.getApplyActions().getAction().get(0)
-                .getAction().getImplementedInterface());
+                .getAction().implementedInterface());
     }
 }
index 88d8193c80a257ab979ffcba0e0826e60087ca6b..e13577ad814439e6d3b48787bd8f02643b005273 100644 (file)
@@ -73,85 +73,85 @@ public class MultipartReplyTableFeaturesDeserializerTest extends AbstractMultipa
         assertEquals(MAX_ENTRIES, reply.getTableFeatures().get(0).getMaxEntries().longValue());
         assertEquals(MAX_ENTRIES, reply.getTableFeatures().get(0).getMaxEntries().longValue());
         assertEquals(Instructions.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
 
         writeValues(buffer, OFPTFPT_INSTRUCTIONS_MISS);
         reply = (MultipartReplyTableFeatures) deserializeMultipart(buffer);
 
         assertEquals(InstructionsMiss.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
 
         writeValues(buffer, OFPTFPT_NEXT_TABLES);
         reply = (MultipartReplyTableFeatures) deserializeMultipart(buffer);
 
         assertEquals(NextTable.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
 
         writeValues(buffer, OFPTFPT_NEXT_TABLES_MISS);
         reply = (MultipartReplyTableFeatures) deserializeMultipart(buffer);
 
         assertEquals(NextTableMiss.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
 
         writeValues(buffer, OFPTFPT_WRITE_ACTIONS);
         reply = (MultipartReplyTableFeatures) deserializeMultipart(buffer);
 
         assertEquals(WriteActions.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
 
         writeValues(buffer, OFPTFPT_WRITE_ACTIONS_MISS);
         reply = (MultipartReplyTableFeatures) deserializeMultipart(buffer);
 
         assertEquals(WriteActionsMiss.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
 
         writeValues(buffer, OFPTFPT_APPLY_ACTIONS);
         reply = (MultipartReplyTableFeatures) deserializeMultipart(buffer);
 
         assertEquals(ApplyActions.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
 
         writeValues(buffer, OFPTFPT_APPLY_ACTIONS_MISS);
         reply = (MultipartReplyTableFeatures) deserializeMultipart(buffer);
 
         assertEquals(ApplyActionsMiss.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
 
         writeValues(buffer, OFPTFPT_MATCH);
         reply = (MultipartReplyTableFeatures) deserializeMultipart(buffer);
 
         assertEquals(Match.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
 
         writeValues(buffer, OFPTFPT_WILDCARDS);
         reply = (MultipartReplyTableFeatures) deserializeMultipart(buffer);
 
         assertEquals(Wildcards.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
 
         writeValues(buffer, OFPTFPT_WRITE_SETFIELD);
         reply = (MultipartReplyTableFeatures) deserializeMultipart(buffer);
 
         assertEquals(WriteSetfield.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
 
         writeValues(buffer, OFPTFPT_WRITE_SETFIELD_MISS);
         reply = (MultipartReplyTableFeatures) deserializeMultipart(buffer);
 
         assertEquals(WriteSetfieldMiss.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
 
         writeValues(buffer, OFPTFPT_APPLY_SETFIELD);
         reply = (MultipartReplyTableFeatures) deserializeMultipart(buffer);
 
         assertEquals(ApplySetfield.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
 
         writeValues(buffer, OFPTFPT_APPLY_SETFIELD_MISS);
         reply = (MultipartReplyTableFeatures) deserializeMultipart(buffer);
 
         assertEquals(ApplySetfieldMiss.class, reply.getTableFeatures().get(0).getTableProperties()
-                .getTableFeatureProperties().get(0).getTableFeaturePropType().getImplementedInterface());
+                .getTableFeatureProperties().get(0).getTableFeaturePropType().implementedInterface());
         assertEquals(0, buffer.readableBytes());
     }
 
index 194a8552d09be07d2dbf8150b9287c643e971d3d..799ee3d43334ec2bf624f80de334acbb8b079693 100644 (file)
@@ -153,8 +153,8 @@ public abstract class ServiceMocking {
 
     public class DummyExperimenter implements ExperimenterMessageOfChoice {
         @Override
-        public Class<? extends DataContainer> getImplementedInterface() {
+        public Class<DummyExperimenter> implementedInterface() {
             return DummyExperimenter.class;
         }
     }
-}
\ No newline at end of file
+}
index 871ef12c997d823509f5a1e8646153a3036c9ec1..e8835d7695d62e0c2f9d14648c30dcd14fdacd23 100644 (file)
@@ -72,7 +72,7 @@ public class PacketProcessingServiceImplTest extends ServiceMocking {
         final PacketOutInput input = (PacketOutInput) request;
         assertEquals(OFConstants.OFP_NO_BUFFER, input.getBufferId());
         assertEquals(1, input.getAction().size());
-        assertEquals(OutputActionCase.class, input.getAction().get(0).getActionChoice().getImplementedInterface());
+        assertEquals(OutputActionCase.class, input.getAction().get(0).getActionChoice().implementedInterface());
 
         final OutputActionCase actionChoice = (OutputActionCase) input.getAction().get(0).getActionChoice();
         assertEquals(1, actionChoice.getOutputAction().getPort().getValue().intValue());
index e648341b5449a618a1b4e1e203f0ee4c0dec9e32..3d56bf96bf8d8208b985164e03f52cdfed4dd5a7 100644 (file)
@@ -30,7 +30,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.experimenter.types.rev151020.experimenter.core.message.ExperimenterMessageOfChoice;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 /**
  * Test for {@link org.opendaylight.openflowplugin.impl.services.sal.SalExperimenterMessageServiceImpl}.
@@ -85,7 +84,7 @@ public class SalExperimenterMessageServiceImplTest extends ServiceMocking {
 
     private static class DummyExperimenter implements ExperimenterMessageOfChoice {
         @Override
-        public Class<? extends DataContainer> getImplementedInterface() {
+        public Class<DummyExperimenter> implementedInterface() {
             return DummyExperimenter.class;
         }
     }
index 10b2195b4833cc31fdb4297408a27ae60e70de13..0830033a90a059264809fba1996d955d4e2db099 100644 (file)
@@ -44,7 +44,7 @@ public class SingleLayerAggregateFlowMultipartServiceTest extends ServiceMocking
                 .build();
 
         final OfHeader ofHeader = service.buildRequest(DUMMY_XID, input);
-        assertEquals(MultipartRequest.class, ofHeader.getImplementedInterface());
+        assertEquals(MultipartRequest.class, ofHeader.implementedInterface());
 
         final MultipartRequestFlowAggregateStats result =
             (MultipartRequestFlowAggregateStats) ((MultipartRequest) ofHeader)
index e331f2e2adabc683b069c39b549439d4fa6535eb..22d8b9c99a9178c78cf35b6d0d3f75f70b17e134 100644 (file)
@@ -41,12 +41,12 @@ public class SingleLayerExperimenterMultipartServiceTest extends ServiceMocking
                 .build();
 
         final OfHeader ofHeader = service.buildRequest(DUMMY_XID, input);
-        assertEquals(MultipartRequest.class, ofHeader.getImplementedInterface());
+        assertEquals(MultipartRequest.class, ofHeader.implementedInterface());
 
         final MultipartRequestExperimenter result = (MultipartRequestExperimenter) ((MultipartRequest) ofHeader)
             .getMultipartRequestBody();
 
-        assertEquals(DummyExperimenter.class, result.getExperimenterMessageOfChoice().getImplementedInterface());
+        assertEquals(DummyExperimenter.class, result.getExperimenterMessageOfChoice().implementedInterface());
     }
 
     @Test
@@ -71,6 +71,6 @@ public class SingleLayerExperimenterMultipartServiceTest extends ServiceMocking
                 .getResult()
                 .getExperimenterCoreMessageItem()
                 .get(0)
-                .getExperimenterMessageOfChoice().getImplementedInterface());
+                .getExperimenterMessageOfChoice().implementedInterface());
     }
-}
\ No newline at end of file
+}
index c4b96e31104c8122e32a615bb0817fe611296e71..88146e68abd78c353cdaec2e6c4093f5c9ac1cfc 100644 (file)
@@ -36,7 +36,7 @@ public class SingleLayerFlowServiceTest extends ServiceMocking {
                 .build();
 
         final OfHeader ofHeader = service.buildRequest(DUMMY_XID, input);
-        assertEquals(FlowMessage.class, ofHeader.getImplementedInterface());
+        assertEquals(FlowMessage.class, ofHeader.implementedInterface());
 
         final FlowMessage result = (FlowMessage) ofHeader;
 
index 363a8b1af6155dfeb4ca8e44fd38e7b211c26d93..6ae09813b80a5e5ccf6a3a5e7665ecae6c9d7f16 100644 (file)
@@ -37,7 +37,7 @@ public class SingleLayerGroupServiceTest extends ServiceMocking {
                 .build();
 
         final OfHeader ofHeader = service.buildRequest(DUMMY_XID, input);
-        assertEquals(GroupMessage.class, ofHeader.getImplementedInterface());
+        assertEquals(GroupMessage.class, ofHeader.implementedInterface());
 
         final GroupMessage result = (GroupMessage) ofHeader;
 
index 984d3e76cb45c0d28ee227cd9098aadf33ee3cee..d512a39028634fb527a44fdb5a19909e8fb82f53 100644 (file)
@@ -37,7 +37,7 @@ public class SingleLayerMeterServiceTest extends ServiceMocking {
                 .build();
 
         final OfHeader ofHeader = service.buildRequest(DUMMY_XID, input);
-        assertEquals(MeterMessage.class, ofHeader.getImplementedInterface());
+        assertEquals(MeterMessage.class, ofHeader.implementedInterface());
 
         final MeterMessage result = (MeterMessage) ofHeader;
 
index f82214baede28496857b04a8e4e972be6411288e..c4522bc74cebf78902432fa87cf9738e87bc4b8f 100644 (file)
@@ -36,7 +36,7 @@ public class SingleLayerPortServiceTest extends ServiceMocking {
                 .build();
 
         final OfHeader ofHeader = service.buildRequest(DUMMY_XID, input);
-        assertEquals(PortMessage.class, ofHeader.getImplementedInterface());
+        assertEquals(PortMessage.class, ofHeader.implementedInterface());
 
         final PortMessage result = (PortMessage) ofHeader;
 
index 7b9f0c4d9926862fe1df8cfbfe636c13d1cbe751..624c6b44b62a3b53581a1471c1791986ac458b00 100644 (file)
@@ -50,7 +50,7 @@ public class SingleLayerTableMultipartServiceTest extends ServiceMocking {
                 .build();
 
         final OfHeader ofHeader = service.buildRequest(DUMMY_XID, input);
-        assertEquals(MultipartRequest.class, ofHeader.getImplementedInterface());
+        assertEquals(MultipartRequest.class, ofHeader.implementedInterface());
 
         final MultipartRequestTableFeatures result = (MultipartRequestTableFeatures) ((MultipartRequest) ofHeader)
             .getMultipartRequestBody();
@@ -86,4 +86,4 @@ public class SingleLayerTableMultipartServiceTest extends ServiceMocking {
         assertTrue(result.isSuccessful());
         assertEquals(XID, result.getResult().getTransactionId().getValue().longValue());
     }
-}
\ No newline at end of file
+}
index 23fd2ac06a0e24aeef616905acf28ec3ff3667fe..6005d67f0e1a2abee0c6c25610d86785206f635d 100644 (file)
@@ -104,6 +104,6 @@ public class OpendaylightFlowTableStatisticsServiceImplTest extends AbstractSing
         Assert.assertTrue(mpRequest.getMultipartRequestBody() instanceof MultipartRequestTableCase);
         final MultipartRequestTableCase mpRequestBody =
                 (MultipartRequestTableCase) (mpRequest.getMultipartRequestBody());
-        Assert.assertTrue(mpRequestBody.getMultipartRequestTable().isEmpty());
+        Assert.assertNotNull(mpRequestBody.getMultipartRequestTable().getEmpty());
     }
-}
\ No newline at end of file
+}
index 8cc1fd19b07a6b177a861308ad83fc80fbace587..b31393d874ff8e8ebffba984f278375e683dfc43 100644 (file)
@@ -56,7 +56,7 @@ public class StatisticsGatheringOnTheFlyServiceTest extends ServiceMocking {
         final long xidValue = 21L;
         Xid xid = new Xid(xidValue);
         final OfHeader request = statisticsGatheringService.buildRequest(xid, MultipartType.OFPMPFLOW);
-        Assert.assertEquals(MultipartRequestInput.class, request.getImplementedInterface());
+        Assert.assertEquals(MultipartRequestInput.class, request.implementedInterface());
         Assert.assertEquals(xidValue, request.getXid().longValue());
         Assert.assertNotNull(request);
     }
index b7a70d7e4492a6bf0c1ef7f0ebf0f7ceaaa8f3f0..8ba5942262a2298f0f3207f42b97c9df254ab8c3 100644 (file)
@@ -47,9 +47,9 @@ public class StatisticsGatheringServiceTest extends ServiceMocking {
         Xid xid = new Xid(xidValue);
         for (MultipartType mpType : MultipartType.values()) {
             final OfHeader request = statisticsGatheringService.buildRequest(xid, mpType);
-            Assert.assertEquals(MultipartRequestInput.class, request.getImplementedInterface());
+            Assert.assertEquals(MultipartRequestInput.class, request.implementedInterface());
             Assert.assertEquals(xidValue, request.getXid().longValue());
             Assert.assertNotNull(request);
         }
     }
-}
\ No newline at end of file
+}
index 6f24255584711af5b25917de1104fcc571478dee..d1e5afd9d6a288e7bb2da08e5dfab23f990aad60 100644 (file)
@@ -85,6 +85,6 @@ public class BarrierUtilTest {
         final SendBarrierInput barrierInput = BarrierUtil.createSendBarrierInput(NODE_REF);
 
         Assert.assertEquals(NODE_REF, barrierInput.getNode());
-        Assert.assertEquals(SendBarrierInput.class, barrierInput.getImplementedInterface());
+        Assert.assertEquals(SendBarrierInput.class, barrierInput.implementedInterface());
     }
 }
index 5f9e30f2081f21fc626bed0051ed68321a783ccb..416b51b68d2dea8ba1b4bf126f8457072033e8a5 100644 (file)
@@ -52,7 +52,7 @@ public final class ActionExtensionHelper {
             convertor = extensionConvertorProvider.getActionConverter(key);
         } else if (action.getActionChoice() != null) {
             ActionSerializerKey<?> key = new ActionSerializerKey(EncodeConstants.OF13_VERSION_ID,
-                    action.getActionChoice().getImplementedInterface(), null);
+                    action.getActionChoice().implementedInterface(), null);
             convertor = extensionConvertorProvider.getActionConverter(key);
         }
 
index d80d3c6ff6172764c6262da71fa7b6fbdbbb3656..69382d00106087f49ebef36a0e33fdb680b117bf 100644 (file)
@@ -85,11 +85,11 @@ public class ConvertorManager implements ConvertorExecutor, ConvertorRegistrator
             return result;
         }
 
-        final Class<?> type = source instanceof DataContainer ? ((DataContainer) source).getImplementedInterface()
+        final Class<?> type = source instanceof DataContainer ? ((DataContainer) source).implementedInterface()
                 : source.getClass();
 
         if (type == null) {
-            LOG.warn("Cannot extract type from {}, because getImplementedInterface() returns null", source);
+            LOG.warn("Cannot extract type from {}, because implementedInterface() returns null", source);
             return result;
         }
 
@@ -115,11 +115,11 @@ public class ConvertorManager implements ConvertorExecutor, ConvertorRegistrator
 
         final F first = firstOptional.get();
 
-        final Class<?> type = first instanceof DataContainer ? ((DataContainer) first).getImplementedInterface()
+        final Class<?> type = first instanceof DataContainer ? ((DataContainer) first).implementedInterface()
                 : first.getClass();
 
         if (type == null) {
-            LOG.warn("Cannot extract type from {}, because getImplementedInterface() returns null", source);
+            LOG.warn("Cannot extract type from {}, because implementedInterface() returns null", source);
             return result;
         }
 
index fe3f4c481f7f755d9f5152a50317013e2e53e801..9fc912909678d9649cea1f27bbe70ab05ed50c4d 100644 (file)
@@ -520,7 +520,7 @@ public class TableFeaturesResponseConvertor
                 actionBuilder.setOrder(order++);
                 ActionChoice actionType = action.getActionChoice();
                 org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action salAction =
-                        OF_TO_SAL_ACTION.get(actionType.getImplementedInterface());
+                        OF_TO_SAL_ACTION.get(actionType.implementedInterface());
 
                 actionBuilder.setAction(salAction);
                 actionList.add(actionBuilder.build());
index e0e869575b76cde57de6d9733db9b3098ea3af1f..7016a159565f8530de040cd5807d23efde043916 100644 (file)
@@ -40,7 +40,7 @@ public class SalToOfVendorCodecCase extends ConvertorCase<org.opendaylight.yang.
         final TypeVersionKey<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action> key =
                 new TypeVersionKey<>(
                         (Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112
-                                .action.Action>) source.getImplementedInterface(),
+                                .action.Action>) source.implementedInterface(),
                         version);
 
         ExtensionConverterProvider extensionConverterProvider = OFSessionUtil.getExtensionConvertorProvider();
index dcb3dff4b6cc6dcb7114912f90e9c08fbc4aefaf..e9460497164a643d78a8a106e0c65a98b3c0f848 100644 (file)
@@ -75,7 +75,7 @@ public class ConvertorProcessor<F extends DataContainer, T, D extends ConvertorD
             return result;
         }
 
-        final Class<?> clazz = source.getImplementedInterface();
+        final Class<?> clazz = source.implementedInterface();
         final Optional<ConvertorCase<?, T, D>> caseOptional = Optional
                 .ofNullable(getCasesForVersion(version).get(clazz));
 
index 9da8078c5e66ae139e847e15a515ed878fb7a407..0c1cb116af076815f5949a1d72ee854bae4b4f63 100644 (file)
@@ -59,14 +59,14 @@ public class ActionExtensionHelperTest {
         Action action = ActionExtensionHelper.processAlienAction(actionBuilder.build(), OpenflowVersion.OF13,
                 ActionPath.FLOWS_STATISTICS_UPDATE_APPLY_ACTIONS);
         assertNotNull(action);
-        assertEquals(MockAction.class, action.getImplementedInterface());
+        assertEquals(MockAction.class, action.implementedInterface());
     }
 
 
     private class MockAction implements Action {
 
         @Override
-        public Class<? extends DataContainer> getImplementedInterface() {
+        public Class<? extends DataContainer> implementedInterface() {
             return MockAction.class;
         }
     }
index f66a6e2a47080c2821651edf92d3caeae9869413..48d171ab7d6d3cbf213a31c774f56244f807fc3f 100644 (file)
@@ -195,7 +195,7 @@ public class GroupDescStatsResponseConvertorTest {
                 .Action action = bucket.getAction().get(0);
         Assert.assertEquals("Wrong type", 0, action.getOrder().intValue());
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112"
-                + ".action.action.CopyTtlInCase", action.getAction().getImplementedInterface().getName());
+                + ".action.action.CopyTtlInCase", action.getAction().implementedInterface().getName());
 
         // **********************************************
         // Test second group desc
@@ -219,19 +219,19 @@ public class GroupDescStatsResponseConvertorTest {
         action = bucket.getAction().get(0);
         Assert.assertEquals("Wrong type", 0, action.getOrder().intValue());
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112"
-                + ".action.action.CopyTtlOutCase", action.getAction().getImplementedInterface().getName());
+                + ".action.action.CopyTtlOutCase", action.getAction().implementedInterface().getName());
 
         // Test second action for first bucket of second group desc
         action = bucket.getAction().get(1);
         Assert.assertEquals("Wrong type", 1, action.getOrder().intValue());
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112"
-                + ".action.action.DecNwTtlCase", action.getAction().getImplementedInterface().getName());
+                + ".action.action.DecNwTtlCase", action.getAction().implementedInterface().getName());
 
         // Test third action for first bucket of second group desc
         action = bucket.getAction().get(2);
         Assert.assertEquals("Wrong type", 2, action.getOrder().intValue());
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112"
-                + ".action.action.PopPbbActionCase", action.getAction().getImplementedInterface().getName());
+                + ".action.action.PopPbbActionCase", action.getAction().implementedInterface().getName());
 
         // Test second bucket for second group desc
         bucket = stat.getBuckets().getBucket().get(1);
index 038b6150d392a5348256d9a2b371866672823a66..48eb0f2be32e900f2c6bb693b12a293f35119219 100644 (file)
@@ -97,7 +97,7 @@ public class MeterConfigStatsResponseConvertorTest {
     private final class MockMeterBandBuilder implements org.opendaylight.yang.gen.v1.urn.opendaylight.openflow
             .protocol.rev130731.meter.band.header.MeterBand {
         @Override
-        public Class<? extends DataContainer> getImplementedInterface() {
+        public Class<? extends DataContainer> implementedInterface() {
             return MockMeterBandBuilder.class;
         }
     }
index bb9f2dcdbb70c0d261f1eb845e6ebedb8601952f..4b96254de60b0acbe972b33779f5f27e9cd2f3c2 100644 (file)
@@ -410,7 +410,7 @@ public class TableFeaturesConvertorTest {
         org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature
             .prop.type.ApplyActionsMiss applyActionsMiss = null;
         for (int i = 0; i < tableFeaturePropertieses.size(); i++) {
-            if (tableFeaturePropertieses.get(i).getTableFeaturePropType().getImplementedInterface().isAssignableFrom(
+            if (tableFeaturePropertieses.get(i).getTableFeaturePropType().implementedInterface().isAssignableFrom(
                     org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table
                         .feature.prop.type.ApplyActionsMiss.class)) {
                 applyActionsMiss = (org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature
index b851805005c05f8743e27c188ec13648cb8e0a72..8d97e1e0b651a177d9fcde1e3558c8e59c811c49 100644 (file)
@@ -564,7 +564,7 @@ public class TableFeaturesResponseConvertorTest {
                 .get(0);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.NextTable",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
         NextTable propType = (NextTable) property.getTableFeaturePropType();
         List<Short> ids = propType.getTables().getTableIds();
         Assert.assertEquals("Wrong next table-id size", 2, ids.size());
@@ -573,7 +573,7 @@ public class TableFeaturesResponseConvertorTest {
         property = feature.getTableProperties().getTableFeatureProperties().get(1);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.NextTableMiss",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
         NextTableMiss propType2 = (NextTableMiss) property.getTableFeaturePropType();
         ids = propType2.getTablesMiss().getTableIds();
         Assert.assertEquals("Wrong next table-id size", 1, ids.size());
@@ -582,39 +582,39 @@ public class TableFeaturesResponseConvertorTest {
         property = feature.getTableProperties().getTableFeatureProperties().get(2);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.Instructions",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
         Instructions propType3 = (Instructions) property.getTableFeaturePropType();
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list
                 .Instruction> instructionIds = propType3.getInstructions().getInstruction();
         Assert.assertEquals("Wrong instruction-ids size", 2, instructionIds.size());
         Assert.assertEquals("Wrong instruction-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types."
             + "rev131026.instruction.instruction.WriteActionsCase",
-                instructionIds.get(0).getInstruction().getImplementedInterface().getName());
+                instructionIds.get(0).getInstruction().implementedInterface().getName());
         Assert.assertEquals("Wrong instruction-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types."
             + "rev131026.instruction.instruction.GoToTableCase",
-                instructionIds.get(1).getInstruction().getImplementedInterface().getName());
+                instructionIds.get(1).getInstruction().implementedInterface().getName());
         property = feature.getTableProperties().getTableFeatureProperties().get(3);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.InstructionsMiss",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
         InstructionsMiss propType4 = (InstructionsMiss) property.getTableFeaturePropType();
         instructionIds = propType4.getInstructionsMiss().getInstruction();
         Assert.assertEquals("Wrong instruction-ids size", 5, instructionIds.size());
         Assert.assertEquals("Wrong instruction-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types."
             + "rev131026.instruction.instruction.WriteMetadataCase",
-                instructionIds.get(0).getInstruction().getImplementedInterface().getName());
+                instructionIds.get(0).getInstruction().implementedInterface().getName());
         Assert.assertEquals("Wrong instruction-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types."
             + "rev131026.instruction.instruction.ApplyActionsCase",
-                instructionIds.get(1).getInstruction().getImplementedInterface().getName());
+                instructionIds.get(1).getInstruction().implementedInterface().getName());
         Assert.assertEquals("Wrong instruction-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types."
             + "rev131026.instruction.instruction.MeterCase",
-                instructionIds.get(2).getInstruction().getImplementedInterface().getName());
+                instructionIds.get(2).getInstruction().implementedInterface().getName());
         Assert.assertEquals("Wrong instruction-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types."
             + "rev131026.instruction.instruction.ClearActionsCase",
-                instructionIds.get(3).getInstruction().getImplementedInterface().getName());
+                instructionIds.get(3).getInstruction().implementedInterface().getName());
         Assert.assertEquals("Wrong instruction-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types."
             + "rev131026.instruction.instruction.GoToTableCase",
-                instructionIds.get(4).getInstruction().getImplementedInterface().getName());
+                instructionIds.get(4).getInstruction().implementedInterface().getName());
 
         feature = list.get(1);
         Assert.assertEquals("Wrong table-id", 6, feature.getTableId().intValue());
@@ -627,7 +627,7 @@ public class TableFeaturesResponseConvertorTest {
         property = feature.getTableProperties().getTableFeatureProperties().get(0);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.Match",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
         Match propType5 = (Match) property.getTableFeaturePropType();
         List<SetFieldMatch> fieldMatch = propType5.getMatchSetfield().getSetFieldMatch();
         Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size());
@@ -638,7 +638,7 @@ public class TableFeaturesResponseConvertorTest {
         property = feature.getTableProperties().getTableFeatureProperties().get(1);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfield",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
         ApplySetfield propType6 = (ApplySetfield) property.getTableFeaturePropType();
         fieldMatch = propType6.getApplySetfield().getSetFieldMatch();
         Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size());
@@ -651,7 +651,7 @@ public class TableFeaturesResponseConvertorTest {
         property = feature.getTableProperties().getTableFeatureProperties().get(2);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfield",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
         WriteSetfield propType7 = (WriteSetfield) property.getTableFeaturePropType();
         fieldMatch = propType7.getWriteSetfield().getSetFieldMatch();
         Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size());
@@ -664,7 +664,7 @@ public class TableFeaturesResponseConvertorTest {
         property = feature.getTableProperties().getTableFeatureProperties().get(3);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldMiss",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
         WriteSetfieldMiss propType8 = (WriteSetfieldMiss) property.getTableFeaturePropType();
         fieldMatch = propType8.getWriteSetfieldMiss().getSetFieldMatch();
         Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size());
@@ -677,7 +677,7 @@ public class TableFeaturesResponseConvertorTest {
         property = feature.getTableProperties().getTableFeatureProperties().get(4);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfieldMiss",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
         ApplySetfieldMiss propType9 = (ApplySetfieldMiss) property.getTableFeaturePropType();
         fieldMatch = propType9.getApplySetfieldMiss().getSetFieldMatch();
         Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size());
@@ -690,7 +690,7 @@ public class TableFeaturesResponseConvertorTest {
         property = feature.getTableProperties().getTableFeatureProperties().get(5);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.Wildcards",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
         Wildcards propType10 = (Wildcards) property.getTableFeaturePropType();
         fieldMatch = propType10.getWildcardSetfield().getSetFieldMatch();
         Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size());
@@ -704,7 +704,7 @@ public class TableFeaturesResponseConvertorTest {
         property = feature.getTableProperties().getTableFeatureProperties().get(6);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.ApplyActions",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
         org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop
             .type.ApplyActions propType11 = (org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table
                     .feature.prop.type.table.feature.prop.type.ApplyActions) property.getTableFeaturePropType();
@@ -713,18 +713,18 @@ public class TableFeaturesResponseConvertorTest {
         Assert.assertEquals("Wrong actions-ids size", 3, actionsList.size());
         Assert.assertEquals("Wrong actions-id",
                 "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwSrcActionCase",
-                actionsList.get(0).getAction().getImplementedInterface().getName());
+                actionsList.get(0).getAction().implementedInterface().getName());
         Assert.assertEquals("Wrong actions-id",
                 "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwSrcActionCase",
-                actionsList.get(1).getAction().getImplementedInterface().getName());
+                actionsList.get(1).getAction().implementedInterface().getName());
         Assert.assertEquals("Wrong actions-id",
                 "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwSrcActionCase",
-                actionsList.get(2).getAction().getImplementedInterface().getName());
+                actionsList.get(2).getAction().implementedInterface().getName());
 
         property = feature.getTableProperties().getTableFeatureProperties().get(7);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.ApplyActionsMiss",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
         org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop
             .type.ApplyActionsMiss propType12 = (org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026
                 .table.feature.prop.type.table.feature.prop.type.ApplyActionsMiss) property.getTableFeaturePropType();
@@ -732,17 +732,17 @@ public class TableFeaturesResponseConvertorTest {
         Assert.assertEquals("Wrong actions-ids size", 3, actionsList.size());
         Assert.assertEquals("Wrong actions-id",
                 "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupActionCase",
-                actionsList.get(0).getAction().getImplementedInterface().getName());
+                actionsList.get(0).getAction().implementedInterface().getName());
         Assert.assertEquals("Wrong actions-id",
                 "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlInCase",
-                actionsList.get(1).getAction().getImplementedInterface().getName());
+                actionsList.get(1).getAction().implementedInterface().getName());
         Assert.assertEquals("Wrong actions-id",
                 "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlOutCase",
-                actionsList.get(2).getAction().getImplementedInterface().getName());
+                actionsList.get(2).getAction().implementedInterface().getName());
         property = feature.getTableProperties().getTableFeatureProperties().get(8);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.WriteActions",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
 
         org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop
             .type.WriteActions propType13 = (org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table
@@ -751,17 +751,17 @@ public class TableFeaturesResponseConvertorTest {
         Assert.assertEquals("Wrong actions-ids size", 3, actionsList.size());
         Assert.assertEquals("Wrong actions-id",
             "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetMplsTtlActionCase",
-                actionsList.get(0).getAction().getImplementedInterface().getName());
+                actionsList.get(0).getAction().implementedInterface().getName());
         Assert.assertEquals("Wrong actions-id",
                 "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecMplsTtlCase",
-                actionsList.get(1).getAction().getImplementedInterface().getName());
+                actionsList.get(1).getAction().implementedInterface().getName());
         Assert.assertEquals("Wrong actions-id",
                 "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushVlanActionCase",
-                actionsList.get(2).getAction().getImplementedInterface().getName());
+                actionsList.get(2).getAction().implementedInterface().getName());
         property = feature.getTableProperties().getTableFeatureProperties().get(9);
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
             + "rev131026.table.feature.prop.type.table.feature.prop.type.WriteActionsMiss",
-                property.getTableFeaturePropType().getImplementedInterface().getName());
+                property.getTableFeaturePropType().implementedInterface().getName());
 
         org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop
             .type.WriteActionsMiss propType14 = (org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026
@@ -770,13 +770,13 @@ public class TableFeaturesResponseConvertorTest {
         Assert.assertEquals("Wrong actions-ids size", 3, actionsList.size());
         Assert.assertEquals("Wrong actions-id",
                 "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopVlanActionCase",
-                actionsList.get(0).getAction().getImplementedInterface().getName());
+                actionsList.get(0).getAction().implementedInterface().getName());
         Assert.assertEquals("Wrong actions-id",
                 "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushPbbActionCase",
-                actionsList.get(1).getAction().getImplementedInterface().getName());
+                actionsList.get(1).getAction().implementedInterface().getName());
         Assert.assertEquals("Wrong actions-id",
                 "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCase",
-                actionsList.get(2).getAction().getImplementedInterface().getName());
+                actionsList.get(2).getAction().implementedInterface().getName());
     }
 
     private static SetNwSrcCase createSetNwSrcAction() {
index 69de35f1eac13c50447c97d787bf568fdac89349..a148dff0c241630894998d7560efdfd330affa03 100644 (file)
@@ -206,22 +206,22 @@ public class ActionConvertorTest {
 
             }
             if (action.getActionChoice() instanceof CopyTtlInCase) {
-                Assert.assertEquals(action.getActionChoice().getImplementedInterface().getName(),
+                Assert.assertEquals(action.getActionChoice().implementedInterface().getName(),
                         CopyTtlInCase.class.getName());
 
             }
             if (action.getActionChoice() instanceof CopyTtlOutCase) {
-                Assert.assertEquals(action.getActionChoice().getImplementedInterface().getName(),
+                Assert.assertEquals(action.getActionChoice().implementedInterface().getName(),
                         CopyTtlOutCase.class.getName());
             }
 
             if (action.getActionChoice() instanceof SetMplsTtlCase) {
-                Assert.assertEquals(action.getActionChoice().getImplementedInterface().getName(),
+                Assert.assertEquals(action.getActionChoice().implementedInterface().getName(),
                         SetMplsTtlCase.class.getName());
 
             }
             if (action.getActionChoice() instanceof DecMplsTtlCase) {
-                Assert.assertEquals(action.getActionChoice().getImplementedInterface().getName(),
+                Assert.assertEquals(action.getActionChoice().implementedInterface().getName(),
                         DecMplsTtlCase.class.getName());
             }
 
@@ -240,7 +240,7 @@ public class ActionConvertorTest {
             }
 
             if (action.getActionChoice() instanceof SetQueueCase) {
-                Assert.assertEquals(action.getActionChoice().getImplementedInterface().getName(),
+                Assert.assertEquals(action.getActionChoice().implementedInterface().getName(),
                         SetQueueCase.class.getName());
             }
 
@@ -250,21 +250,21 @@ public class ActionConvertorTest {
             }
 
             if (action.getActionChoice() instanceof PushVlanCase) {
-                Assert.assertEquals(action.getActionChoice().getImplementedInterface().getName(),
+                Assert.assertEquals(action.getActionChoice().implementedInterface().getName(),
                         PushVlanCase.class.getName());
             }
 
             if (action.getActionChoice() instanceof PopVlanCase) {
-                Assert.assertEquals(action.getActionChoice().getImplementedInterface().getName(),
+                Assert.assertEquals(action.getActionChoice().implementedInterface().getName(),
                         PopVlanCase.class.getName());
             }
 
             if (action.getActionChoice() instanceof SetNwTtlCase) {
-                Assert.assertEquals(action.getActionChoice().getImplementedInterface().getName(),
+                Assert.assertEquals(action.getActionChoice().implementedInterface().getName(),
                         SetNwTtlCase.class.getName());
             }
             if (action.getActionChoice() instanceof DecNwTtlCase) {
-                Assert.assertEquals(action.getActionChoice().getImplementedInterface().getName(),
+                Assert.assertEquals(action.getActionChoice().implementedInterface().getName(),
                         DecNwTtlCase.class.getName());
             }
             if (action.getActionChoice() instanceof PushPbbCase) {
@@ -275,7 +275,7 @@ public class ActionConvertorTest {
             }
 
             if (action.getActionChoice() instanceof PopMplsCase) {
-                Assert.assertEquals(action.getActionChoice().getImplementedInterface().getName(),
+                Assert.assertEquals(action.getActionChoice().implementedInterface().getName(),
                         PopMplsCase.class.getName());
             }
             if (action.getActionChoice() instanceof SetFieldCase) {
index bc6d56624bf5035651ffb35d54d83b2f31bea2f2..c2ba19c576bb8529fe9b3c4bcc726c36035f6f13 100644 (file)
@@ -227,19 +227,19 @@ public class ActionConvertorV10Test {
             action = actions.get(0);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetVlanPcpCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         SetVlanPcpCase setVlanPcpCase = (SetVlanPcpCase) action.getActionChoice();
         Assert.assertEquals("Wrong vlan pcp", 7, setVlanPcpCase.getSetVlanPcpAction().getVlanPcp().intValue());
 
         action = actions.get(1);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.StripVlanCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
 
         action = actions.get(2);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetDlDstCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         SetDlDstCase setDlDstCase = (SetDlDstCase) action.getActionChoice();
         Assert.assertEquals("Wrong dl dst", "00:00:00:00:00:06",
                 setDlDstCase.getSetDlDstAction().getDlDstAddress().getValue());
@@ -247,7 +247,7 @@ public class ActionConvertorV10Test {
         action = actions.get(3);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetDlSrcCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         SetDlSrcCase setDlSrcCase = (SetDlSrcCase) action.getActionChoice();
         Assert.assertEquals("Wrong dl src", "00:00:00:00:00:05",
                 setDlSrcCase.getSetDlSrcAction().getDlSrcAddress().getValue());
@@ -255,54 +255,54 @@ public class ActionConvertorV10Test {
         action = actions.get(4);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetNwSrcCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         SetNwSrcCase setNwSrcCase = (SetNwSrcCase) action.getActionChoice();
         Assert.assertEquals("Wrong nw src", "10.0.0.0", setNwSrcCase.getSetNwSrcAction().getIpAddress().getValue());
 
         action = actions.get(5);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetNwDstCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         SetNwDstCase setNwDstCase = (SetNwDstCase) action.getActionChoice();
         Assert.assertEquals("Wrong nw dst", "10.0.0.2", setNwDstCase.getSetNwDstAction().getIpAddress().getValue());
 
         action = actions.get(6);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetTpSrcCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         SetTpSrcCase setTpSrcCase = (SetTpSrcCase) action.getActionChoice();
         Assert.assertEquals("Wrong tp src", 54, setTpSrcCase.getSetTpSrcAction().getPort().getValue().intValue());
 
         action = actions.get(7);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetTpDstCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         SetTpDstCase setTpDstCase = (SetTpDstCase) action.getActionChoice();
         Assert.assertEquals("Wrong tp dst", 45, setTpDstCase.getSetTpDstAction().getPort().getValue().intValue());
 
         action = actions.get(8);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetNwTosCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         SetNwTosCase setNwTosCase = (SetNwTosCase) action.getActionChoice();
         Assert.assertEquals("Wrong nw tos", 18, setNwTosCase.getSetNwTosAction().getNwTos().intValue());
 
         action = actions.get(9);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetVlanVidCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         SetVlanVidCase setVlanVidCase = (SetVlanVidCase) action.getActionChoice();
         Assert.assertEquals("Wrong vlan id", 22, setVlanVidCase.getSetVlanVidAction().getVlanVid().intValue());
 
         action = actions.get(10);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.StripVlanCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
 
         action = actions.get(11);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetVlanVidCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         setVlanVidCase = (SetVlanVidCase) action.getActionChoice();
         Assert.assertEquals("Wrong vlan id", 22, setVlanVidCase.getSetVlanVidAction().getVlanVid().intValue());
     }
@@ -340,7 +340,7 @@ public class ActionConvertorV10Test {
         Assert.assertEquals("Wrong number of output actions", 1, mdSalActions.size());
         org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action = mdSalActions.get(0);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.OutputActionCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.OutputActionCase", action.implementedInterface().getName());
         OutputActionCase outputAction = (OutputActionCase) action;
         Assert.assertEquals("Wrong output port", "14",
                 outputAction.getOutputAction().getOutputNodeConnector().getValue());
index 031fd76ed626f015f8fb69022f30c7da47c56724..74b326c56b9d230e2134358b17a7fa9871374f71 100644 (file)
@@ -291,73 +291,73 @@ public class ActionConvertorV13Test {
         Assert.assertEquals("Wrong number of output actions", 16, mdSalActions.size());
         org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action = mdSalActions.get(0);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.OutputActionCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.OutputActionCase", action.implementedInterface().getName());
         OutputActionCase output = (OutputActionCase) action;
         Assert.assertEquals("Wrong output port", "42", output.getOutputAction().getOutputNodeConnector().getValue());
         Assert.assertEquals("Wrong max length", 52, output.getOutputAction().getMaxLength().intValue());
         action = mdSalActions.get(1);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.CopyTtlOutCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.CopyTtlOutCase", action.implementedInterface().getName());
         action = mdSalActions.get(2);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.CopyTtlInCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.CopyTtlInCase", action.implementedInterface().getName());
         action = mdSalActions.get(3);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.SetMplsTtlActionCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.SetMplsTtlActionCase", action.implementedInterface().getName());
         SetMplsTtlActionCase setMplsTtl = (SetMplsTtlActionCase) action;
         Assert.assertEquals("Wrong mpls ttl", 4, setMplsTtl.getSetMplsTtlAction().getMplsTtl().intValue());
         action = mdSalActions.get(4);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.DecMplsTtlCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.DecMplsTtlCase", action.implementedInterface().getName());
         action = mdSalActions.get(5);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.PushVlanActionCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.PushVlanActionCase", action.implementedInterface().getName());
         PushVlanActionCase pushVlan = (PushVlanActionCase) action;
         Assert.assertEquals("Wrong ethertype", 16, pushVlan.getPushVlanAction().getEthernetType().intValue());
         action = mdSalActions.get(6);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.PopVlanActionCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.PopVlanActionCase", action.implementedInterface().getName());
         action = mdSalActions.get(7);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.PushMplsActionCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.PushMplsActionCase", action.implementedInterface().getName());
         PushMplsActionCase pushMpls = (PushMplsActionCase) action;
         Assert.assertEquals("Wrong ethertype", 17, pushMpls.getPushMplsAction().getEthernetType().intValue());
         action = mdSalActions.get(8);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.PopMplsActionCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.PopMplsActionCase", action.implementedInterface().getName());
         PopMplsActionCase popMpls = (PopMplsActionCase) action;
         Assert.assertEquals("Wrong ethertype", 18, popMpls.getPopMplsAction().getEthernetType().intValue());
         action = mdSalActions.get(9);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.SetQueueActionCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.SetQueueActionCase", action.implementedInterface().getName());
         SetQueueActionCase setQueue = (SetQueueActionCase) action;
         Assert.assertEquals("Wrong queue-id", 1234, setQueue.getSetQueueAction().getQueueId().intValue());
         action = mdSalActions.get(10);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.GroupActionCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.GroupActionCase", action.implementedInterface().getName());
         GroupActionCase groupAction = (GroupActionCase) action;
         Assert.assertEquals("Wrong group-id", 555, groupAction.getGroupAction().getGroupId().intValue());
         action = mdSalActions.get(11);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.SetNwTtlActionCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.SetNwTtlActionCase", action.implementedInterface().getName());
         SetNwTtlActionCase setNwTtl = (SetNwTtlActionCase) action;
         Assert.assertEquals("Wrong nw ttl", 8, setNwTtl.getSetNwTtlAction().getNwTtl().intValue());
         action = mdSalActions.get(12);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.DecNwTtlCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.DecNwTtlCase", action.implementedInterface().getName());
         action = mdSalActions.get(13);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.SetFieldCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.SetFieldCase", action.implementedInterface().getName());
         SetFieldCase setField = (SetFieldCase) action;
         Assert.assertEquals("Wrong in port", "openflow:null:1", setField.getSetField().getInPort().getValue());
         action = mdSalActions.get(14);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.PushPbbActionCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.PushPbbActionCase", action.implementedInterface().getName());
         PushPbbActionCase pushPbb = (PushPbbActionCase) action;
         Assert.assertEquals("Wrong ethertype", 19, pushPbb.getPushPbbAction().getEthernetType().intValue());
         action = mdSalActions.get(15);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types"
-                + ".rev131112.action.action.PopPbbActionCase", action.getImplementedInterface().getName());
+                + ".rev131112.action.action.PopPbbActionCase", action.implementedInterface().getName());
     }
 
     /**
@@ -519,7 +519,7 @@ public class ActionConvertorV13Test {
         Action action = actions.get(0);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice
             .SetFieldCase setFieldCase =
                 (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping
@@ -533,7 +533,7 @@ public class ActionConvertorV13Test {
         action = actions.get(1);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         setFieldCase = (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping
                 .action.choice.SetFieldCase) action.getActionChoice();
         entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
@@ -546,7 +546,7 @@ public class ActionConvertorV13Test {
         action = actions.get(2);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         setFieldCase = (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping
                 .action.choice.SetFieldCase) action.getActionChoice();
         entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
@@ -560,7 +560,7 @@ public class ActionConvertorV13Test {
                 .action.choice.SetFieldCase) action.getActionChoice();
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
         checkEntryHeader(entry,
                 org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthSrc.class, false);
@@ -572,7 +572,7 @@ public class ActionConvertorV13Test {
                 .action.choice.SetFieldCase) action.getActionChoice();
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
         checkEntryHeader(entry,
                 org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Src.class, false);
@@ -584,7 +584,7 @@ public class ActionConvertorV13Test {
                 .action.choice.SetFieldCase) action.getActionChoice();
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
         checkEntryHeader(entry,
                 org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Dst.class, false);
@@ -596,7 +596,7 @@ public class ActionConvertorV13Test {
                 .action.choice.SetFieldCase) action.getActionChoice();
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
         checkEntryHeader(entry,
                 org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpSrc.class, false);
@@ -608,7 +608,7 @@ public class ActionConvertorV13Test {
                 .action.choice.SetFieldCase) action.getActionChoice();
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
         checkEntryHeader(entry,
                 org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpDst.class, false);
@@ -620,7 +620,7 @@ public class ActionConvertorV13Test {
                 .action.choice.SetFieldCase) action.getActionChoice();
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
         checkEntryHeader(entry,
                 org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.IpDscp.class, false);
@@ -632,7 +632,7 @@ public class ActionConvertorV13Test {
                 .action.choice.SetFieldCase) action.getActionChoice();
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
         checkEntryHeader(entry,
                 org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanVid.class, false);
@@ -646,7 +646,7 @@ public class ActionConvertorV13Test {
                 .action.choice.SetFieldCase) action.getActionChoice();
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
         checkEntryHeader(entry,
                 org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Src.class, false);
@@ -658,7 +658,7 @@ public class ActionConvertorV13Test {
                 .action.choice.SetFieldCase) action.getActionChoice();
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase",
-                action.getActionChoice().getImplementedInterface().getName());
+                action.getActionChoice().implementedInterface().getName());
         entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
         checkEntryHeader(entry,
                 org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Dst.class, false);
index 2eb5706a649c83428c9c7f34b1a1c107eb447c9d..b575a21c9ca9b79f39680e800d0886b7d1d14fcf 100644 (file)
@@ -12,7 +12,6 @@ import static org.junit.Assert.fail;
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.Ordered;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 /**
  * To test OrderComparator.
@@ -95,7 +94,7 @@ public class OrderComparatorTest {
         }
 
         @Override
-        public Class<? extends DataContainer> getImplementedInterface() {
+        public Class<Ordered> implementedInterface() {
             return Ordered.class;
         }
     }
index 55d1d0e9b3720684148a27dd9c5d917ac3067101..c4dc5c7c318e80285eb5ac52bf2ff4ecdd2a0bd8 100644 (file)
@@ -69,7 +69,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.FlowModFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInputBuilder;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 /**
  * Unit tests for flow conversion.
@@ -225,13 +224,13 @@ public class FlowConvertorTest {
             .grouping.Instruction instruction = flowMod.get(0).getInstruction().get(0);
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".instruction.rev130731.instruction.grouping.instruction.choice.GotoTableCase",
-                instruction.getInstructionChoice().getImplementedInterface().getName());
+                instruction.getInstructionChoice().implementedInterface().getName());
         GotoTableCase gotoTableCase = (GotoTableCase) instruction.getInstructionChoice();
         Assert.assertEquals("Wrong table id", 1, gotoTableCase.getGotoTable().getTableId().intValue());
         instruction = flowMod.get(0).getInstruction().get(1);
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".instruction.rev130731.instruction.grouping.instruction.choice.WriteMetadataCase",
-                instruction.getInstructionChoice().getImplementedInterface().getName());
+                instruction.getInstructionChoice().implementedInterface().getName());
         WriteMetadataCase writeMetadataCase = (WriteMetadataCase) instruction.getInstructionChoice();
         Assert.assertArrayEquals("Wrong metadata", new byte[]{0, 0, 0, 0, 0, 0, 0, 2},
                 writeMetadataCase.getWriteMetadata().getMetadata());
@@ -241,23 +240,23 @@ public class FlowConvertorTest {
         instruction = flowMod.get(0).getInstruction().get(2);
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".instruction.rev130731.instruction.grouping.instruction.choice.WriteActionsCase",
-                instruction.getInstructionChoice().getImplementedInterface().getName());
+                instruction.getInstructionChoice().implementedInterface().getName());
         WriteActionsCase writeActionsCase = (WriteActionsCase) instruction.getInstructionChoice();
         Assert.assertEquals("Wrong actions size", 0, writeActionsCase.getWriteActions().getAction().size());
         instruction = flowMod.get(0).getInstruction().get(3);
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".instruction.rev130731.instruction.grouping.instruction.choice.ApplyActionsCase",
-                instruction.getInstructionChoice().getImplementedInterface().getName());
+                instruction.getInstructionChoice().implementedInterface().getName());
         ApplyActionsCase applyActionsCase =  (ApplyActionsCase) instruction.getInstructionChoice();
         Assert.assertEquals("Wrong actions size", 0, applyActionsCase.getApplyActions().getAction().size());
         instruction = flowMod.get(0).getInstruction().get(4);
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".instruction.rev130731.instruction.grouping.instruction.choice.ClearActionsCase",
-                instruction.getInstructionChoice().getImplementedInterface().getName());
+                instruction.getInstructionChoice().implementedInterface().getName());
         instruction = flowMod.get(0).getInstruction().get(5);
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"
                 + ".instruction.rev130731.instruction.grouping.instruction.choice.MeterCase",
-                instruction.getInstructionChoice().getImplementedInterface().getName());
+                instruction.getInstructionChoice().implementedInterface().getName());
         MeterCase meterCase = (MeterCase) instruction.getInstructionChoice();
         Assert.assertEquals("Wrong meter id", 5, meterCase.getMeter().getMeterId().intValue());
     }
@@ -434,8 +433,8 @@ public class FlowConvertorTest {
         }
 
         @Override
-        public Class<? extends DataContainer> getImplementedInterface() {
-            return Flow.class;
+        public Class<AddFlowInput> implementedInterface() {
+            return AddFlowInput.class;
         }
     }
 }
index e52756e519d1def9fe38a222c677c47ba362f55b..0422d848a1d43e995886305db1ca699f84fdc990 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>3.0.6</version>
+        <version>4.0.0</version>
         <relativePath/>
     </parent>