Fixed some null checks and defaults values

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

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertor.java
index 285d8cb6a3123f1ee7eb731e3d4c343d1f8d70f7..77e1261455b491f11f3b12bb39437924182407f9 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertor.java
@@ -5,6 +5,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.opendaylight.openflowjava.protocol.api.util.BinContent;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.group.update.UpdatedGroup;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.Buckets;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.ActionsList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupModCommand;
@@ -45,27 +46,32 @@ public final class GroupConvertor {
     org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.Group source, short version) {
         List<BucketsList> bucketLists = new ArrayList<BucketsList>();
         GroupModInputBuilder groupModInputBuilder = new GroupModInputBuilder();
-        if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupInput)
+        if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupInput) {
             groupModInputBuilder.setCommand(GroupModCommand.OFPGCADD);
-        if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroupInput)
+        } else if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroupInput) {
             groupModInputBuilder.setCommand(GroupModCommand.OFPGCDELETE);
-        if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupInput)
+        } else if (source instanceof UpdatedGroup) {
             groupModInputBuilder.setCommand(GroupModCommand.OFPGCMODIFY);
-
-        if (source.getGroupType().getIntValue() == 0)
+        }
+        
+        if (source.getGroupType().getIntValue() == 0) {
             groupModInputBuilder.setType(GroupType.OFPGTALL);
+        }
 
-        if (source.getGroupType().getIntValue() == 1)
+        if (source.getGroupType().getIntValue() == 1) {
             groupModInputBuilder.setType(GroupType.OFPGTSELECT);
+        }
 
-        if (source.getGroupType().getIntValue() == 2)
+        if (source.getGroupType().getIntValue() == 2) {
             groupModInputBuilder.setType(GroupType.OFPGTINDIRECT);
+        }
 
-        if (source.getGroupType().getIntValue() == 3)
+        if (source.getGroupType().getIntValue() == 3) {
             groupModInputBuilder.setType(GroupType.OFPGTFF);
+        }
 
-        groupModInputBuilder.setGroupId(source.getGroupId().getValue());
-
+        
+        groupModInputBuilder.setGroupId(new Long(source.getGroupId().getValue()));
         getbucketList(source.getBuckets(), bucketLists, version, source.getGroupType().getIntValue());
         groupModInputBuilder.setBucketsList(bucketLists);
         groupModInputBuilder.setVersion(version);
@@ -78,18 +84,17 @@ public final class GroupConvertor {
         Iterator<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.Bucket> groupBucketIterator = buckets
                 .getBucket().iterator();
         org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.Bucket groupBucket;
-
-
-
+        
         while (groupBucketIterator.hasNext()) {
             groupBucket = groupBucketIterator.next();
             BucketsListBuilder bucketBuilder = new BucketsListBuilder();
 
             if ((groupType == GroupType.OFPGTSELECT.getIntValue()) && (groupBucket.getWeight() == null)) {
 
-                logger.error("Wieght value required for this OFPGT_SELECT");
+                logger.error("Weight value required for this OFPGT_SELECT");
 
             }
+
             if (null != groupBucket.getWeight()) {
                 bucketBuilder.setWeight(groupBucket.getWeight().intValue());
             } else {
@@ -101,6 +106,7 @@ public final class GroupConvertor {
                 logger.error("WatchGroup required for this OFPGT_FF");
 
             }
+            
             if (null != groupBucket.getWatchGroup()) {
                 bucketBuilder.setWatchGroup(groupBucket.getWatchGroup());
             } else {
@@ -112,10 +118,10 @@ public final class GroupConvertor {
                 logger.error("WatchPort required for this OFPGT_FF");
 
             }
+
             if (null != groupBucket.getWatchPort()) {
                 bucketBuilder.setWatchPort(new PortNumber(groupBucket.getWatchPort()));
             } else {
-
                 bucketBuilder.setWatchPort(new PortNumber(BinContent.intToUnsignedLong(DEFAULT_WATCH_PORT.intValue())));
             }
 

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 d770d9a12b822bab9ff86a00cd927245d33d87e8..efad9c5a38b1a9decbc75c8a6e078e6028a3595d 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
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.meter.update.UpdatedMeter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.type.band.type.Drop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.type.band.type.DscpRemark;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.type.band.type.Experimenter;
@@ -49,21 +50,21 @@ public final class MeterConvertor {
             org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.Meter source, short version) {
 
         MeterModInputBuilder meterModInputBuilder = new MeterModInputBuilder();
-
-        List<Bands> bands = new ArrayList<Bands>();
-        MeterFlags flags = null;
-        if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterInput)
+        List<Bands> bands = new ArrayList<Bands>();       
+        
+        if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterInput) {
             meterModInputBuilder.setCommand(MeterModCommand.OFPMCADD);
-        else if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.RemoveMeterInput)
+        } else if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.RemoveMeterInput) {
             meterModInputBuilder.setCommand(MeterModCommand.OFPMCDELETE);
-        else if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.UpdateMeterInput)
+        } else if (source instanceof UpdatedMeter) {
             meterModInputBuilder.setCommand(MeterModCommand.OFPMCMODIFY);
+        }
 
         meterModInputBuilder.setMeterId(new MeterId(source.getMeterId().getValue()));
 
-        if (source.getFlags() != null) {
-            meterModInputBuilder.setFlags(flags = new MeterFlags(source.getFlags().isMeterBurst(), source.getFlags()
-                    .isMeterKbps(), source.getFlags().isMeterPktps(), source.getFlags().isMeterStats()));
+        if (null != source.getFlags()) {
+            meterModInputBuilder.setFlags(new MeterFlags(source.getFlags().isMeterBurst(), source.getFlags()
+                .isMeterKbps(), source.getFlags().isMeterPktps(), source.getFlags().isMeterStats()));
         } else {
 
             /*
@@ -74,15 +75,15 @@ public final class MeterConvertor {
              * seconds.
              */
 
-            meterModInputBuilder.setFlags(flags = new MeterFlags(false, false, true, false));
+            meterModInputBuilder.setFlags(new MeterFlags(false, false, true, false));
         }
         if (source.getMeterBandHeaders() != null) {
             getBandsFromSAL(source.getMeterBandHeaders(), bands);
+            meterModInputBuilder.setBands(bands);
         } else {
             logger.error("For this meter Id" + source.getMeterId().getValue() + ",no associated band data found!");
         }
-
-        meterModInputBuilder.setBands(bands);
+        
         meterModInputBuilder.setVersion(version);
         return meterModInputBuilder.build();
     }
@@ -98,21 +99,19 @@ public final class MeterConvertor {
             meterBandHeader = bandHeadersIterator.next();
             MeterBand meterBandItem = null;
             // The band types :drop,DSCP_Remark or experimenter.
-            if (null != meterBandHeader.getMeterBandTypes() && null != meterBandHeader.getMeterBandTypes().getFlags()) {
+            if (null != meterBandHeader.getMeterBandTypes() && 
+                    null != meterBandHeader.getMeterBandTypes().getFlags()) {
 
                 if (meterBandHeader.getMeterBandTypes().getFlags().isOfpmbtDrop()) {
                     if (meterBandHeader.getBandType() != null) {
                         MeterBandDropBuilder meterBandDropBuilder = new MeterBandDropBuilder();
                         meterBandDropBuilder.setType(MeterBandType.OFPMBTDROP);
-
                         Drop drop = (Drop) meterBandHeader.getBandType();
-
                         meterBandDropBuilder.setBurstSize(drop.getRate());
                         meterBandDropBuilder.setRate(drop.getBurstSize());
                         meterBandItem = meterBandDropBuilder.build();
                         bandsB = new BandsBuilder();
-                        bandsB.setMeterBand(meterBandItem).build();
-
+                        bandsB.setMeterBand(meterBandItem);
                         bands.add(bandsB.build()); // Bands list
 
                     } else {
@@ -122,16 +121,13 @@ public final class MeterConvertor {
                     if (meterBandHeader.getBandType() != null) {
                         MeterBandDscpRemarkBuilder meterBandDscpRemarkBuilder = new MeterBandDscpRemarkBuilder();
                         meterBandDscpRemarkBuilder.setType(MeterBandType.OFPMBTDSCPREMARK);
-
                         DscpRemark dscpRemark = (DscpRemark) meterBandHeader.getBandType();
-
                         meterBandDscpRemarkBuilder.setBurstSize(dscpRemark.getBurstSize());
                         meterBandDscpRemarkBuilder.setRate(dscpRemark.getRate());
                         meterBandDscpRemarkBuilder.setPrecLevel(dscpRemark.getPercLevel());
                         meterBandItem = meterBandDscpRemarkBuilder.build();
                         bandsB = new BandsBuilder();
-                        bandsB.setMeterBand(meterBandItem).build();
-
+                        bandsB.setMeterBand(meterBandItem);
                         bands.add(bandsB.build()); // Bands list
 
                     } else {
@@ -147,8 +143,7 @@ public final class MeterConvertor {
                         meterBandExperimenterBuilder.setExperimenter(experimenter.getExperimenter());
                         meterBandItem = meterBandExperimenterBuilder.build();
                         bandsB = new BandsBuilder();
-                        bandsB.setMeterBand(meterBandItem).build();
-
+                        bandsB.setMeterBand(meterBandItem);
                         bands.add(bandsB.build()); // Bands list
 
                     } else {

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestCommandProvider.java
index b24e34261887abc67150157f2ef14f0c7d5b81cc..bdb0cedc5fdfcee0d53e4c0a357cd12e62d63b60 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestCommandProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestCommandProvider.java
@@ -77,26 +77,26 @@ public class OpenflowpluginGroupTestCommandProvider implements CommandProvider {
         return InstanceIdentifier.builder(Nodes.class).child(Node.class, node.getKey()).toInstance();
     }
 
-    private void createTestGroup() {
+    private GroupBuilder createTestGroup() {
         // Sample data , committing to DataStore
         DataModification modification = dataBrokerService.beginTransaction();
-        long id = 123;
-        GroupKey key = new GroupKey(id, new NodeRef(new NodeRef(nodeToInstanceId(testNode))));
+        Long id = new Long(12);
+        GroupKey key = new GroupKey(id.longValue(), new NodeRef(new NodeRef(nodeToInstanceId(testNode))));
         GroupBuilder group = new GroupBuilder();
         BucketBuilder bucket = new BucketBuilder();
         bucket.setBucketId(new BucketId((long) 12));
         group.setKey(key);
         group.setInstall(false);       
-        group.setId(id);
+        group.setId(new Long(12));
         PopVlanActionBuilder vlanAction = new PopVlanActionBuilder();
         ActionBuilder action = new ActionBuilder();
         action.setAction(vlanAction.build());
         List<Action> actions = new ArrayList<Action>();
         actions.add(action.build());        
         bucket.setAction(actions);    
-        bucket.setWatchGroup((long) 123);
+        bucket.setWatchGroup((long) 14);
         bucket.setWatchPort((long) 1234);
-        bucket.setWeight(123);
+        bucket.setWeight(15);
         group.setGroupType(GroupTypes.GroupSelect);
         group.setGroupName(originalGroupName);
         group.setBarrier(false);
@@ -106,6 +106,7 @@ public class OpenflowpluginGroupTestCommandProvider implements CommandProvider {
         value.setBucket(value1);
         group.setBuckets(value.build());
         testGroup = group.build();
+        return group;
     }
 
     public void _removeGroup(CommandInterpreter ci) {
@@ -118,20 +119,21 @@ public class OpenflowpluginGroupTestCommandProvider implements CommandProvider {
             ci.println("User node added" + nref);
             createUserNode(nref);
         }
-        createTestGroup();
+        GroupBuilder gbuilder = createTestGroup();
         DataModification modification = dataBrokerService.beginTransaction();
         InstanceIdentifier<Group> path1 = InstanceIdentifier.builder(Groups.class)
-                .child(Group.class, testGroup.getKey()).toInstance();
+                .child(Group.class, gbuilder.getKey()).toInstance();
         DataObject cls = (DataObject) modification.readConfigurationData(path1);
-        modification.removeOperationalData(nodeToInstanceId(testNode));
+        //modification.removeOperationalData(nodeToInstanceId(testNode));
         modification.removeOperationalData(path1);
-        modification.removeConfigurationData(nodeToInstanceId(testNode));
+        //modification.removeConfigurationData(nodeToInstanceId(testNode));
         modification.removeConfigurationData(path1);
         Future<RpcResult<TransactionStatus>> commitFuture = modification.commit();
         try {
             RpcResult<TransactionStatus> result = commitFuture.get();
             TransactionStatus status = result.getResult();
             ci.println("Status of Group Data Loaded Transaction: " + status);
+            ci.println("Status of Group Data Loaded Transaction: ");
 
         } catch (InterruptedException e) {
             // TODO Auto-generated catch block
@@ -189,9 +191,8 @@ public class OpenflowpluginGroupTestCommandProvider implements CommandProvider {
         } else {
             ci.println("User node added" + nref);
             createUserNode(nref);
-        }
-        createTestGroup();
-        GroupBuilder group = new GroupBuilder(testGroup);
+        }        
+        GroupBuilder group = createTestGroup();        
         group.setGroupName(updatedGroupName);
         writeGroup(ci, group.build());
         group.setGroupName(originalGroupName);

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 7ac4c4c4a662cfc9aee5b67c8a2df82d11729c63..9e77054c234359f9d4311c4eecb579889618c2a8 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
@@ -77,10 +77,10 @@ public class OpenflowpluginMeterTestCommandProvider implements CommandProvider {
         return InstanceIdentifier.builder(Nodes.class).child(Node.class, node.getKey()).toInstance();
     }
 
-    private void createTestMeter() {
+    private MeterBuilder createTestMeter() {
         // Sample data , committing to DataStore
         DataModification modification = dataBrokerService.beginTransaction();
-        long id = 123;
+        long id = 12;
         MeterKey key = new MeterKey(id, new NodeRef(new NodeRef(nodeToInstanceId(testNode))));
         MeterBuilder meter = new MeterBuilder();
         meter.setContainerName("abcd");     
@@ -107,6 +107,7 @@ public class OpenflowpluginMeterTestCommandProvider implements CommandProvider {
         meter.setMeterBandHeaders(bandHeaders.build());
         
         testMeter = meter.build();
+        return meter;
     }
 
     public void _removeMeter(CommandInterpreter ci) {
@@ -119,10 +120,10 @@ public class OpenflowpluginMeterTestCommandProvider implements CommandProvider {
             ci.println("User node added" + nref);
             createUserNode(nref);
         }
-        createTestMeter();
+        MeterBuilder mBuilder = createTestMeter();
         DataModification modification = dataBrokerService.beginTransaction();
         InstanceIdentifier<Meter> path1 = InstanceIdentifier.builder(Meters.class)
-                .child(Meter.class, testMeter.getKey()).toInstance();
+                .child(Meter.class, mBuilder.getKey()).toInstance();
         DataObject cls = (DataObject) modification.readConfigurationData(path1);
         modification.removeOperationalData(nodeToInstanceId(testNode));
         modification.removeOperationalData(path1);
@@ -192,8 +193,7 @@ public class OpenflowpluginMeterTestCommandProvider implements CommandProvider {
             ci.println("User node added" + nref);
             createUserNode(nref);
         }
-        createTestMeter();
-        MeterBuilder meter = new MeterBuilder(testMeter);
+        MeterBuilder meter = createTestMeter();        
         meter.setMeterName(updatedMeterName);
         writeMeter(ci, meter.build());
         meter.setMeterName(originalMeterName);