Fixed Group and meter id bugs

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

diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/GroupConsumerImpl.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/GroupConsumerImpl.java
index 7d16cb5b428452dfa25e110ebbc7ad795c298a18..d28e8e1fd18994979d211821680eb2ff7339eec9 100644 (file)
--- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/GroupConsumerImpl.java
+++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/GroupConsumerImpl.java
@@ -39,6 +39,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.Sal
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.SalGroupService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.group.update.UpdatedGroupBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.Buckets;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.Bucket;
@@ -269,6 +270,7 @@ public class GroupConsumerImpl implements IForwardingRulesManager {
         
         UpdateGroupInputBuilder groupData = new UpdateGroupInputBuilder();
         updateGroupBuilder = new UpdatedGroupBuilder();
+        updateGroupBuilder.setGroupId(new GroupId(groupUpdateDataObject.getId()));
         updateGroupBuilder.fieldsFrom(groupUpdateDataObject);
         groupData.setUpdatedGroup(updateGroupBuilder.build());        
         groupService.updateGroup(groupData.build());
@@ -293,7 +295,7 @@ public class GroupConsumerImpl implements IForwardingRulesManager {
         AddGroupInputBuilder groupData = new AddGroupInputBuilder();
         groupData.setBuckets(groupAddDataObject.getBuckets());
         groupData.setContainerName(groupAddDataObject.getContainerName());
-        groupData.setGroupId(groupAddDataObject.getGroupId());
+        groupData.setGroupId(new GroupId(groupAddDataObject.getId()));
         groupData.setGroupType(groupAddDataObject.getGroupType());
         groupData.setNode(groupAddDataObject.getNode());    
         groupService.addGroup(groupData.build());
@@ -318,7 +320,7 @@ public class GroupConsumerImpl implements IForwardingRulesManager {
         RemoveGroupInputBuilder groupData = new RemoveGroupInputBuilder();
         groupData.setBuckets(groupRemoveDataObject.getBuckets());
         groupData.setContainerName(groupRemoveDataObject.getContainerName());
-        groupData.setGroupId(groupRemoveDataObject.getGroupId());
+        groupData.setGroupId(new GroupId(groupRemoveDataObject.getId()));
         groupData.setGroupType(groupRemoveDataObject.getGroupType());
         groupData.setNode(groupRemoveDataObject.getNode());    
         groupService.removeGroup(groupData.build());  
@@ -336,7 +338,7 @@ public class GroupConsumerImpl implements IForwardingRulesManager {
 
         for (Entry<InstanceIdentifier<?>, Group> entry : transaction.updates.entrySet()) {
 
-            if (!updateGroup(entry.getKey(), entry.getValue()).isSuccess()) {
+            if (!addGroup(entry.getKey(), entry.getValue()).isSuccess()) {
                 transaction.updates.remove(entry.getKey());
                 return Rpcs.getRpcResult(false, null, Collections.<RpcError>emptySet());
             }

diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/MeterConsumerImpl.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/MeterConsumerImpl.java
index aa9d572d79724b27031b3aaa31193ec6d9d2577c..42d0897fb11ae85182f6a87e83f3015e191f716c 100644 (file)
--- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/MeterConsumerImpl.java
+++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/MeterConsumerImpl.java
@@ -242,6 +242,8 @@ public class MeterConsumerImpl implements IForwardingRulesManager {
         if (null != meterKey && validateMeter(meterUpdateDataObject, FRMUtil.operation.UPDATE).isSuccess()) {                UpdateMeterInputBuilder updateMeterInputBuilder = new UpdateMeterInputBuilder();
             updateMeterBuilder = new UpdatedMeterBuilder();
             updateMeterBuilder.fieldsFrom(meterUpdateDataObject);
+            updateMeterBuilder.setMeterId(new MeterId(meterUpdateDataObject.getId()));
+            
             updateMeterInputBuilder.setUpdatedMeter(updateMeterBuilder.build());
             meterService.updateMeter(updateMeterInputBuilder.build());
         } else {
@@ -267,7 +269,7 @@ public class MeterConsumerImpl implements IForwardingRulesManager {
             meterBuilder.setNode(meterRemoveDataObject.getNode());
             meterBuilder.setFlags(meterRemoveDataObject.getFlags());
             meterBuilder.setMeterBandHeaders(meterRemoveDataObject.getMeterBandHeaders());
-            meterBuilder.setMeterId(meterRemoveDataObject.getMeterId());
+            meterBuilder.setMeterId(new MeterId(meterRemoveDataObject.getId()));
             meterBuilder.setNode(meterRemoveDataObject.getNode());        
             meterService.removeMeter(meterBuilder.build());
         } else {