Fixed build failures for yang module changes

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: I4431f68ded694ae2013747f2af3a5ed7ed5c1259

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertor.java
index c6130d643ec70ce6618826562844069ed1fcc114..fef977f2e35778e7c7135d6ff9fc2a13b7ce097f 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertor.java
@@ -111,8 +111,8 @@ public final class MeterConvertor {
                         MeterBandDropBuilder meterBandDropBuilder = new MeterBandDropBuilder();
                         meterBandDropBuilder.setType(MeterBandType.OFPMBTDROP);
                         Drop drop = (Drop) meterBandHeader.getBandType();
-                        meterBandDropBuilder.setBurstSize(drop.getRate());
-                        meterBandDropBuilder.setRate(drop.getBurstSize());
+                        meterBandDropBuilder.setBurstSize(drop.getDropRate());
+                        meterBandDropBuilder.setRate(drop.getDropBurstSize());
                         dropCaseBuilder.setMeterBandDrop(meterBandDropBuilder.build());
                         meterBandItem = dropCaseBuilder.build();
                         bandsB = new BandsBuilder();
@@ -128,8 +128,8 @@ public final class MeterConvertor {
                         MeterBandDscpRemarkBuilder meterBandDscpRemarkBuilder = new MeterBandDscpRemarkBuilder();
                         meterBandDscpRemarkBuilder.setType(MeterBandType.OFPMBTDSCPREMARK);
                         DscpRemark dscpRemark = (DscpRemark) meterBandHeader.getBandType();
-                        meterBandDscpRemarkBuilder.setBurstSize(dscpRemark.getBurstSize());
-                        meterBandDscpRemarkBuilder.setRate(dscpRemark.getRate());
+                        meterBandDscpRemarkBuilder.setBurstSize(dscpRemark.getDscpRemarkBurstSize());
+                        meterBandDscpRemarkBuilder.setRate(dscpRemark.getDscpRemarkRate());
                         meterBandDscpRemarkBuilder.setPrecLevel(dscpRemark.getPercLevel());
                         dscpCaseBuilder.setMeterBandDscpRemark(meterBandDscpRemarkBuilder.build());
                         meterBandItem = dscpCaseBuilder.build();
@@ -146,8 +146,8 @@ public final class MeterConvertor {
                         MeterBandExperimenterBuilder meterBandExperimenterBuilder = new MeterBandExperimenterBuilder();
                         meterBandExperimenterBuilder.setType(MeterBandType.OFPMBTEXPERIMENTER);
                         Experimenter experimenter = (Experimenter) meterBandHeader.getBandType();
-                        meterBandExperimenterBuilder.setBurstSize(experimenter.getBurstSize());
-                        meterBandExperimenterBuilder.setRate(experimenter.getRate());
+                        meterBandExperimenterBuilder.setBurstSize(experimenter.getExperimenterBurstSize());
+                        meterBandExperimenterBuilder.setRate(experimenter.getExperimenterRate());
                         meterBandExperimenterBuilder.setExperimenter(experimenter.getExperimenter());
                         experimenterCaseBuilder.setMeterBandExperimenter(meterBandExperimenterBuilder.build());
                         meterBandItem = experimenterCaseBuilder.build();

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterStatsResponseConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterStatsResponseConvertor.java
index 1e28567c0d77f3a9fd8aafe92ea38226edf7cd12..b9ca4995dc3b7ddfc5fe0f8c81c858d2c7cfeae2 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterStatsResponseConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterStatsResponseConvertor.java
@@ -135,12 +135,12 @@ public class MeterStatsResponseConvertor {
                     MeterBandDropCase dropCaseBand = (MeterBandDropCase)band.getMeterBand();
                     MeterBandDrop dropBand = dropCaseBand.getMeterBandDrop();
                     DropBuilder dropBuilder = new DropBuilder();
-                    dropBuilder.setBurstSize(dropBand.getBurstSize());
-                    dropBuilder.setRate(dropBand.getRate());
+                    dropBuilder.setDropBurstSize(dropBand.getBurstSize());
+                    dropBuilder.setDropRate(dropBand.getRate());
                     meterBandHeaderBuilder.setBandType(dropBuilder.build());
                     
-                    meterBandHeaderBuilder.setBurstSize(dropBand.getBurstSize());
-                    meterBandHeaderBuilder.setRate(dropBand.getRate());
+                    meterBandHeaderBuilder.setBandBurstSize(dropBand.getBurstSize());
+                    meterBandHeaderBuilder.setBandRate(dropBand.getRate());
                     BandId bandId = new BandId((long)bandKey);
                     meterBandHeaderBuilder.setKey(new MeterBandHeaderKey(bandId));
                     meterBandHeaderBuilder.setBandId(bandId);
@@ -154,12 +154,12 @@ public class MeterStatsResponseConvertor {
                     MeterBandDscpRemarkCase dscpRemarkCaseBand = (MeterBandDscpRemarkCase)band.getMeterBand();
                     MeterBandDscpRemark dscpRemarkBand = dscpRemarkCaseBand.getMeterBandDscpRemark();
                     DscpRemarkBuilder dscpRemarkBuilder = new DscpRemarkBuilder();
-                    dscpRemarkBuilder.setBurstSize(dscpRemarkBand.getBurstSize());
-                    dscpRemarkBuilder.setRate(dscpRemarkBand.getRate());
+                    dscpRemarkBuilder.setDscpRemarkBurstSize(dscpRemarkBand.getBurstSize());
+                    dscpRemarkBuilder.setDscpRemarkRate(dscpRemarkBand.getRate());
                     meterBandHeaderBuilder.setBandType(dscpRemarkBuilder.build());
                     
-                    meterBandHeaderBuilder.setBurstSize(dscpRemarkBand.getBurstSize());
-                    meterBandHeaderBuilder.setRate(dscpRemarkBand.getRate());
+                    meterBandHeaderBuilder.setBandBurstSize(dscpRemarkBand.getBurstSize());
+                    meterBandHeaderBuilder.setBandRate(dscpRemarkBand.getRate());
                     BandId bandId = new BandId((long)bandKey);
                     meterBandHeaderBuilder.setKey(new MeterBandHeaderKey(bandId));
                     meterBandHeaderBuilder.setBandId(bandId);
@@ -174,12 +174,12 @@ public class MeterStatsResponseConvertor {
                     MeterBandExperimenterCase experimenterCaseBand = (MeterBandExperimenterCase)band.getMeterBand();
                     MeterBandExperimenter experimenterBand = experimenterCaseBand.getMeterBandExperimenter();
                     ExperimenterBuilder experimenterBuilder = new ExperimenterBuilder();
-                    experimenterBuilder.setBurstSize(experimenterBand.getBurstSize());
-                    experimenterBuilder.setRate(experimenterBand.getRate());
+                    experimenterBuilder.setExperimenterBurstSize(experimenterBand.getBurstSize());
+                    experimenterBuilder.setExperimenterRate(experimenterBand.getRate());
                     meterBandHeaderBuilder.setBandType(experimenterBuilder.build());
                     
-                    meterBandHeaderBuilder.setBurstSize(experimenterBand.getBurstSize());
-                    meterBandHeaderBuilder.setRate(experimenterBand.getRate());
+                    meterBandHeaderBuilder.setBandBurstSize(experimenterBand.getBurstSize());
+                    meterBandHeaderBuilder.setBandRate(experimenterBand.getRate());
                     BandId bandId = new BandId((long)bandKey);
                     meterBandHeaderBuilder.setKey(new MeterBandHeaderKey(bandId));
                     meterBandHeaderBuilder.setBandId(bandId);

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertor.java
index 871efb28f55dcb46eac6c99ff940bb0bcb8bf758..969b1a971f3b335eec10a5c9eb8bbe5710217168 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertor.java
@@ -115,6 +115,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteActionsMiss;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfield;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldMiss;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.match.MatchSetfield;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.next.table.Tables;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.next.table.miss.TablesMiss;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.wildcards.WildcardSetfield;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -176,8 +180,8 @@ public class TableFeaturesConvertor {
                 setNextTableFeatureProperty(propBuilder, TableFeaturesPropType.OFPTFPTNEXTTABLES,
                         (tables == null) ? new ArrayList<Short>() : tables.getTableIds());
             } else if (propType instanceof NextTableMiss) {
-                org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.next.table.miss.Tables tables = ((NextTableMiss) propType)
-                        .getTables();
+                TablesMiss tables = ((NextTableMiss) propType)
+                        .getTablesMiss();
                 setNextTableFeatureProperty(propBuilder, TableFeaturesPropType.OFPTFPTNEXTTABLESMISS,
                         (tables == null) ? new ArrayList<Short>() : tables.getTableIds());
             } else if (propType instanceof WriteActions) {
@@ -213,48 +217,75 @@ public class TableFeaturesConvertor {
                         ((applyActionsMiss == null) ? new ArrayList<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action>()
                                 : applyActionsMiss.getAction()));
             } else if (propType instanceof Match) {
-                List<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch> setFieldMatch = ((Match) propType)
-                        .getSetFieldMatch();
+                MatchSetfield matchSetField = ((Match) propType).getMatchSetfield();
+                List<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch> setFieldMatch = null;
+                
+                if( null != matchSetField) {
+                    setFieldMatch = matchSetField.getSetFieldMatch();
+                }
+                
                 setSetFieldTableFeatureProperty(
                         propBuilder,
                         TableFeaturesPropType.OFPTFPTMATCH,
                         ((setFieldMatch == null) ? new ArrayList<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch>()
                                 : setFieldMatch));
             } else if (propType instanceof Wildcards) {
-                List<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch> setFieldMatch = ((Wildcards) propType)
-                        .getSetFieldMatch();
+                List<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch> setFieldMatch = null;
+                WildcardSetfield wildcardSetField = ((Wildcards) propType).getWildcardSetfield();
+                
+                if (null != wildcardSetField) {
+                    setFieldMatch = wildcardSetField.getSetFieldMatch();
+                }
+                
                 setSetFieldTableFeatureProperty(
                         propBuilder,
                         TableFeaturesPropType.OFPTFPTWILDCARDS,
                         ((setFieldMatch == null) ? new ArrayList<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch>()
                                 : setFieldMatch));
             } else if (propType instanceof WriteSetfield) {
-                List<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch> setFieldMatch = ((WriteSetfield) propType)
-                        .getSetFieldMatch();
+                List<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch> setFieldMatch = null; 
+                org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.write.setfield.WriteSetfield writeSetField = ((WriteSetfield) propType).getWriteSetfield();
+                
+                if (null != writeSetField) {
+                    setFieldMatch = writeSetField.getSetFieldMatch();
+                }
+                
                 setSetFieldTableFeatureProperty(
                         propBuilder,
                         TableFeaturesPropType.OFPTFPTWRITESETFIELD,
                         ((setFieldMatch == null) ? new ArrayList<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch>()
                                 : setFieldMatch));
             } else if (propType instanceof WriteSetfieldMiss) {
-                List<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch> setFieldMatch = ((WriteSetfieldMiss) propType)
-                        .getSetFieldMatch();
+                List<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch> setFieldMatch = null;
+                org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.write.setfield.miss.WriteSetfieldMiss writeSetfieldMiss = ((WriteSetfieldMiss) propType).getWriteSetfieldMiss();
+                
+                if (null != writeSetfieldMiss) {
+                    setFieldMatch = writeSetfieldMiss.getSetFieldMatch();
+                }
                 setSetFieldTableFeatureProperty(
                         propBuilder,
                         TableFeaturesPropType.OFPTFPTWRITESETFIELDMISS,
                         ((setFieldMatch == null) ? new ArrayList<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch>()
                                 : setFieldMatch));
             } else if (propType instanceof ApplySetfield) {
-                List<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch> setFieldMatch = ((ApplySetfield) propType)
-                        .getSetFieldMatch();
+                List<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch> setFieldMatch = null; 
+                org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.setfield.ApplySetfield applySetfield = ((ApplySetfield) propType).getApplySetfield();
+                  
+                if (null != applySetfield) {
+                    setFieldMatch = applySetfield.getSetFieldMatch();
+                }
                 setSetFieldTableFeatureProperty(
                         propBuilder,
                         TableFeaturesPropType.OFPTFPTAPPLYSETFIELD,
                         ((setFieldMatch == null) ? new ArrayList<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch>()
                                 : setFieldMatch));
             } else if (propType instanceof ApplySetfieldMiss) {
-                List<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch> setFieldMatch = ((ApplySetfieldMiss) propType)
-                        .getSetFieldMatch();
+                List<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch> setFieldMatch = null;
+                org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.setfield.miss.ApplySetfieldMiss applySetfieldMiss = ((ApplySetfieldMiss) propType).getApplySetfieldMiss();
+                
+                if (null != applySetfieldMiss) {
+                    setFieldMatch = applySetfieldMiss.getSetFieldMatch();
+                }
                 setSetFieldTableFeatureProperty(
                         propBuilder,
                         TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS,

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesReplyConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesReplyConvertor.java
index 1e1489f32842562c30e92c7bd408e8a2211afb52..887c4ded1cc7776df78d9622cf324ed71f2b6c0b 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesReplyConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesReplyConvertor.java
@@ -89,6 +89,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatchBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.MatchBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WildcardsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.setfield.ApplySetfieldBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.setfield.miss.ApplySetfieldMissBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.match.MatchSetfieldBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.next.table.miss.TablesMissBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.wildcards.WildcardSetfieldBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.write.setfield.WriteSetfieldBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.write.setfield.miss.WriteSetfieldMissBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.TableFeatures;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.TableFeaturesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.table.features.TableProperties;
@@ -170,7 +179,7 @@ public class TableFeaturesReplyConvertor {
                 case OFPTFPTNEXTTABLESMISS:
                     org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.NextTableMissBuilder nextTableMissBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.NextTableMissBuilder();
                     nextTableMissBuilder
-                            .setTables(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.next.table.miss.TablesBuilder()
+                            .setTablesMiss(new TablesMissBuilder()
                                     .setTableIds(setNextTableFeatureProperty(property)).build());
                     propBuilder.setTableFeaturePropType(nextTableMissBuilder.build());
                     break;
@@ -203,34 +212,38 @@ public class TableFeaturesReplyConvertor {
                     propBuilder.setTableFeaturePropType(applyActionsMissBuilder.build());
                     break;
                 case OFPTFPTMATCH:
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.MatchBuilder matchBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.MatchBuilder();
+                    MatchSetfieldBuilder matchBuilder = new MatchSetfieldBuilder();
                     matchBuilder.setSetFieldMatch(setSetFieldTableFeatureProperty(property, true));
-                    propBuilder.setTableFeaturePropType(matchBuilder.build());
+                    propBuilder.setTableFeaturePropType(new MatchBuilder().setMatchSetfield(matchBuilder.build()).build());
                     break;
                 case OFPTFPTWILDCARDS:
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WildcardsBuilder wildcardsBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WildcardsBuilder();
+                    WildcardSetfieldBuilder wildcardsBuilder = new WildcardSetfieldBuilder();
                     wildcardsBuilder.setSetFieldMatch(setSetFieldTableFeatureProperty(property, false));
-                    propBuilder.setTableFeaturePropType(wildcardsBuilder.build());
+                    propBuilder.setTableFeaturePropType(new WildcardsBuilder().setWildcardSetfield(wildcardsBuilder.build()).build());
                     break;
                 case OFPTFPTWRITESETFIELD:
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldBuilder writeSetfieldBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldBuilder();
+                    WriteSetfieldBuilder writeSetfieldBuilder = new WriteSetfieldBuilder();
                     writeSetfieldBuilder.setSetFieldMatch(setSetFieldTableFeatureProperty(property, false));
-                    propBuilder.setTableFeaturePropType(writeSetfieldBuilder.build());
+                    propBuilder.setTableFeaturePropType(new 
+                            org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldBuilder().setWriteSetfield(writeSetfieldBuilder.build()).build());
                     break;
                 case OFPTFPTWRITESETFIELDMISS:
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldMissBuilder writeSetfieldMissBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldMissBuilder();
+                    WriteSetfieldMissBuilder writeSetfieldMissBuilder = new WriteSetfieldMissBuilder();
                     writeSetfieldMissBuilder.setSetFieldMatch(setSetFieldTableFeatureProperty(property, false));
-                    propBuilder.setTableFeaturePropType(writeSetfieldMissBuilder.build());
+                    propBuilder.setTableFeaturePropType(new 
+                            org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldMissBuilder().setWriteSetfieldMiss(writeSetfieldMissBuilder.build()).build());
                     break;
                 case OFPTFPTAPPLYSETFIELD:
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfieldBuilder applySetfieldBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfieldBuilder();
+                    ApplySetfieldBuilder applySetfieldBuilder = new ApplySetfieldBuilder();
                     applySetfieldBuilder.setSetFieldMatch(setSetFieldTableFeatureProperty(property, false));
-                    propBuilder.setTableFeaturePropType(applySetfieldBuilder.build());
+                    propBuilder.setTableFeaturePropType(new 
+                            org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfieldBuilder().setApplySetfield(applySetfieldBuilder.build()).build());
                     break;
                 case OFPTFPTAPPLYSETFIELDMISS:
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfieldMissBuilder applySetfieldMissBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfieldMissBuilder();
+                    ApplySetfieldMissBuilder applySetfieldMissBuilder = new ApplySetfieldMissBuilder();
                     applySetfieldMissBuilder.setSetFieldMatch(setSetFieldTableFeatureProperty(property, false));
-                    propBuilder.setTableFeaturePropType(applySetfieldMissBuilder.build());
+                    propBuilder.setTableFeaturePropType(new 
+                            org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfieldMissBuilder().setApplySetfieldMiss(applySetfieldMissBuilder.build()).build());
                     break;
                 case OFPTFPTEXPERIMENTER:
                     // Experimenter Table features are unhandled

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertorTest.java
index 956df4da1f6bf5ad30f52408113c2ce74ad7303c..c918846d99a5a16e8dbd000bca01980002a9081e 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertorTest.java
@@ -42,8 +42,8 @@ public class MeterConvertorTest {
         MeterBandType bandFlag = new MeterBandType(true, false, false);
         meterBandTypesB.setFlags(bandFlag);// _ofpmbtDrop
         DropBuilder drop = new DropBuilder();
-        drop.setBurstSize(10L);
-        drop.setRate(20L);
+        drop.setDropBurstSize(10L);
+        drop.setDropRate(20L);
         Drop drp = drop.build();
         meterBandHeaderBuilder.setBandType(drp);
         meterBandHeaderBuilder.setMeterBandTypes(meterBandTypesB.build());
@@ -57,8 +57,8 @@ public class MeterConvertorTest {
 
         meterBandTypesB1.setFlags(bandFlag1);
         DscpRemarkBuilder dscp = new DscpRemarkBuilder();
-        dscp.setBurstSize(11L);
-        dscp.setRate(21L);
+        dscp.setDscpRemarkBurstSize(11L);
+        dscp.setDscpRemarkRate(21L);
         dscp.setPercLevel((short) 1);
         DscpRemark dscpRemark = dscp.build();
         meterBandHeaderBuilder1.setBandType(dscpRemark);
@@ -74,8 +74,8 @@ public class MeterConvertorTest {
         meterBandTypesB2.setFlags(bandFlag2);
 
         ExperimenterBuilder exp = new ExperimenterBuilder();
-        exp.setBurstSize(12L);
-        exp.setRate(22L);
+        exp.setExperimenterBurstSize(12L);
+        exp.setExperimenterRate(22L);
         exp.setExperimenter(23L);
         Experimenter experimenter = exp.build();
         meterBandHeaderBuilder2.setBandType(experimenter);
@@ -162,8 +162,8 @@ public class MeterConvertorTest {
         MeterBandType bandFlag = new MeterBandType(true, false, false);
         meterBandTypesB.setFlags(bandFlag);// _ofpmbtDrop
         DropBuilder drop = new DropBuilder();
-        drop.setBurstSize(10L);
-        drop.setRate(20L);
+        drop.setDropBurstSize(10L);
+        drop.setDropRate(20L);
         Drop drp = drop.build();
         meterBandHeaderBuilder.setBandType(drp);
         meterBandHeaderBuilder.setMeterBandTypes(meterBandTypesB.build());
@@ -177,8 +177,8 @@ public class MeterConvertorTest {
 
         meterBandTypesB1.setFlags(bandFlag1);
         DscpRemarkBuilder dscp = new DscpRemarkBuilder();
-        dscp.setBurstSize(11L);
-        dscp.setRate(21L);
+        dscp.setDscpRemarkBurstSize(11L);
+        dscp.setDscpRemarkRate(21L);
         dscp.setPercLevel((short) 1);
         DscpRemark dscpRemark = dscp.build();
         meterBandHeaderBuilder1.setBandType(dscpRemark);
@@ -194,8 +194,8 @@ public class MeterConvertorTest {
         meterBandTypesB2.setFlags(bandFlag2);
 
         ExperimenterBuilder exp = new ExperimenterBuilder();
-        exp.setBurstSize(12L);
-        exp.setRate(22L);
+        exp.setExperimenterBurstSize(12L);
+        exp.setExperimenterRate(22L);
         exp.setExperimenter(23L);
         Experimenter experimenter = exp.build();
         meterBandHeaderBuilder2.setBandType(experimenter);
@@ -319,8 +319,8 @@ public class MeterConvertorTest {
 
         meterBandTypesB1.setFlags(bandFlag1);
         DscpRemarkBuilder dscp = new DscpRemarkBuilder();
-        dscp.setBurstSize(11L);
-        dscp.setRate(21L);
+        dscp.setDscpRemarkBurstSize(11L);
+        dscp.setDscpRemarkRate(21L);
         dscp.setPercLevel((short) 1);
         DscpRemark dscpRemark = dscp.build();
         meterBandHeaderBuilder1.setBandType(dscpRemark);
@@ -335,8 +335,8 @@ public class MeterConvertorTest {
 
 
         ExperimenterBuilder exp = new ExperimenterBuilder();
-        exp.setBurstSize(12L);
-        exp.setRate(22L);
+        exp.setExperimenterBurstSize(12L);
+        exp.setExperimenterRate(22L);
         exp.setExperimenter(23L);
         Experimenter experimenter = exp.build();
         meterBandHeaderBuilder2.setBandType(experimenter);

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java
index 3e1315e03c1bc9a94994ffacf804d4dd42dd5ffe..757f254c04c6dc004ab4f596564ff60b9343077e 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java
@@ -135,12 +135,12 @@ public class OpenflowpluginMeterTestCommandProvider implements CommandProvider {
         MeterBandHeadersBuilder bandHeaders = new MeterBandHeadersBuilder();
         List<MeterBandHeader> bandHdr = new ArrayList<MeterBandHeader>();
         MeterBandHeaderBuilder bandHeader = new MeterBandHeaderBuilder();
-        bandHeader.setRate((long) 234);
-        bandHeader.setBurstSize((long) 444);
+        bandHeader.setBandRate((long) 234);
+        bandHeader.setBandBurstSize((long) 444);
         DscpRemarkBuilder dscpRemark = new DscpRemarkBuilder();
-        dscpRemark.setBurstSize((long) 5);
+        dscpRemark.setDscpRemarkBurstSize((long) 5);
         dscpRemark.setPercLevel((short) 1);
-        dscpRemark.setRate((long) 12);
+        dscpRemark.setDscpRemarkRate((long) 12);
         bandHeader.setBandType(dscpRemark.build());
         MeterBandTypesBuilder bandTypes = new MeterBandTypesBuilder();
         MeterBandType bandType = new MeterBandType(false, true, false);

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestCommandProvider.java
index c049e792ee9a1b6cf07947af19f7b6754165cc94..6648b60995da3beec19392a18ef5781b3343a784 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestCommandProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestCommandProvider.java
@@ -57,7 +57,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.table.features.table.properties.TableFeatureProperties;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.table.features.table.properties.TableFeaturePropertiesKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.instructions.Instructions;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.match.MatchSetfieldBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.next.table.TablesBuilder ;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.next.table.miss.TablesMissBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.wildcards.WildcardSetfieldBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey;
@@ -300,7 +303,7 @@ public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandPr
        List<Short> nextTblMissIds = Arrays.asList( new Short[] { 23, 24, 25, 27, 28, 29 , 30 } );
                NextTableMissBuilder nextTblMissBld = new NextTableMissBuilder() ;
                
-               nextTblMissBld.setTables(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.next.table.miss.TablesBuilder().setTableIds(nextTblMissIds).build()) ;
+               nextTblMissBld.setTablesMiss(new TablesMissBuilder().setTableIds(nextTblMissIds).build()) ;
                tableFeatureProperty.setTableFeaturePropType(nextTblMissBld.build() ) ;
        
        TableFeaturePropertiesKey keyValue = new TableFeaturePropertiesKey(0) ;
@@ -424,7 +427,9 @@ public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandPr
        
        setFieldMatch.add(setFieldMatchBld.build()) ;
        MatchBuilder matchBld = new MatchBuilder() ;
-       matchBld.setSetFieldMatch(setFieldMatch) ;
+       MatchSetfieldBuilder matchSetfieldBld = new MatchSetfieldBuilder();
+       matchSetfieldBld.setSetFieldMatch(setFieldMatch);
+       matchBld.setMatchSetfield(matchSetfieldBld.build()) ;
        
        tableFeatureProperty.setTableFeaturePropType(matchBld.build()) ;
        TableFeaturePropertiesKey keyValue = new TableFeaturePropertiesKey(0) ;
@@ -457,7 +462,11 @@ public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandPr
        setFieldMatch.add(setFieldMatchBld3.build()) ;
        
        WriteSetfieldBuilder writeSetfieldBld = new WriteSetfieldBuilder() ;
-       writeSetfieldBld.setSetFieldMatch(setFieldMatch) ;
+       org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.write.setfield.WriteSetfieldBuilder writeSetfieldBuilder = 
+               new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.write.setfield.WriteSetfieldBuilder();
+       writeSetfieldBuilder.setSetFieldMatch(setFieldMatch);
+       writeSetfieldBld.setWriteSetfield(writeSetfieldBuilder.build());
+       
        
        tableFeatureProperty.setTableFeaturePropType(writeSetfieldBld.build()) ;
        TableFeaturePropertiesKey keyValue = new TableFeaturePropertiesKey(0) ;
@@ -489,7 +498,10 @@ public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandPr
        setFieldMatch.add(setFieldMatchBld3.build()) ;
        
        WriteSetfieldMissBuilder writeSetfieldBld = new WriteSetfieldMissBuilder() ;
-       writeSetfieldBld.setSetFieldMatch(setFieldMatch) ;
+       org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.write.setfield.miss.WriteSetfieldMissBuilder writeSetfieldMissBuilder = 
+               new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.write.setfield.miss.WriteSetfieldMissBuilder();
+       writeSetfieldMissBuilder.setSetFieldMatch(setFieldMatch);
+       writeSetfieldBld.setWriteSetfieldMiss(writeSetfieldMissBuilder.build()) ;
        
        tableFeatureProperty.setTableFeaturePropType(writeSetfieldBld.build()) ;
        TableFeaturePropertiesKey keyValue = new TableFeaturePropertiesKey(0) ;
@@ -520,8 +532,11 @@ public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandPr
        setFieldMatch.add(setFieldMatchBld2.build()) ;
        setFieldMatch.add(setFieldMatchBld3.build()) ;
        
-       ApplySetfieldBuilder applySetfieldBld = new ApplySetfieldBuilder() ;
-       applySetfieldBld.setSetFieldMatch(setFieldMatch) ;
+       ApplySetfieldBuilder applySetfieldBld = new ApplySetfieldBuilder();
+       org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.setfield.ApplySetfieldBuilder  applySetfieldBuilder = 
+                  new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.setfield.ApplySetfieldBuilder();
+       applySetfieldBuilder.setSetFieldMatch(setFieldMatch);
+       applySetfieldBld.setApplySetfield(applySetfieldBuilder.build()) ;
        
        tableFeatureProperty.setTableFeaturePropType(applySetfieldBld.build()) ;
        TableFeaturePropertiesKey keyValue = new TableFeaturePropertiesKey(0) ;
@@ -553,7 +568,10 @@ public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandPr
        setFieldMatch.add(setFieldMatchBld3.build()) ;
        
        ApplySetfieldMissBuilder applySetfieldMissBld = new ApplySetfieldMissBuilder() ;
-       applySetfieldMissBld.setSetFieldMatch(setFieldMatch) ;
+       org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.setfield.miss.ApplySetfieldMissBuilder applySetfieldMissBuilder = 
+               new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.setfield.miss.ApplySetfieldMissBuilder();
+       applySetfieldMissBuilder.setSetFieldMatch(setFieldMatch);
+       applySetfieldMissBld.setApplySetfieldMiss(applySetfieldMissBuilder.build()) ;
        
        tableFeatureProperty.setTableFeaturePropType(applySetfieldMissBld.build()) ;
        TableFeaturePropertiesKey keyValue = new TableFeaturePropertiesKey(0) ;
@@ -581,7 +599,10 @@ public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandPr
        setFieldMatch.add(setFieldMatchBld2.build()) ;
        
        WildcardsBuilder wildCardsBld = new WildcardsBuilder() ;
-       wildCardsBld.setSetFieldMatch(setFieldMatch) ;
+       WildcardSetfieldBuilder wildcardsBuilder = 
+               new WildcardSetfieldBuilder();
+       wildcardsBuilder.setSetFieldMatch(setFieldMatch);
+       wildCardsBld.setWildcardSetfield(wildcardsBuilder.build()) ;
        
        tableFeatureProperty.setTableFeaturePropType(wildCardsBld.build()) ;
        TableFeaturePropertiesKey keyValue = new TableFeaturePropertiesKey(0) ;