From: Prem Sankar <prem.sankar.g@ericsson.com>
Date: Thu, 7 May 2015 23:04:03 +0000 (+0000)
Subject: Merge "Updated rpcResult for GetEgressPointer"
X-Git-Tag: release/lithium~46
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6943c5de03b68d749815fd6bb5b9bd015148202a;hp=-c;p=vpnservice.git

Merge "Updated rpcResult for GetEgressPointer"
---

6943c5de03b68d749815fd6bb5b9bd015148202a
diff --combined nexthopmgr/nexthopmgr-impl/src/main/java/org/opendaylight/vpnservice/nexthopmgr/NexthopManager.java
index 1b04ca03,8239e9a8..546e60f8
--- a/nexthopmgr/nexthopmgr-impl/src/main/java/org/opendaylight/vpnservice/nexthopmgr/NexthopManager.java
+++ b/nexthopmgr/nexthopmgr-impl/src/main/java/org/opendaylight/vpnservice/nexthopmgr/NexthopManager.java
@@@ -17,13 -17,13 +17,13 @@@ import com.google.common.base.Optional
  import com.google.common.util.concurrent.Futures;
  import com.google.common.util.concurrent.FutureCallback;
  
- //import org.opendaylight.controller.netconf.confignetconfconnector.mapping.rpc.Rpcs;
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
  import org.opendaylight.yangtools.yang.binding.DataObject;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
  import org.opendaylight.yangtools.yang.common.RpcResult;
+ import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
  import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.VpnInstances;
@@@ -79,6 -79,7 +79,6 @@@ public class NexthopManager implements 
      */
      public NexthopManager(final DataBroker db) {
          broker = db;
 -        createNexthopPointerPool();
      }
  
      @Override
@@@ -98,7 -99,7 +98,7 @@@
          this.idManager = idManager;
      }
  
 -    private void createNexthopPointerPool() {
 +    protected void createNexthopPointerPool() {
          CreateIdPoolInput createPool = new CreateIdPoolInputBuilder()
              .setPoolName("nextHopPointerPool")
              .setIdStart(1L)
@@@ -380,9 -381,11 +380,11 @@@
          GetEgressPointerOutputBuilder output = new GetEgressPointerOutputBuilder();
          output.setEgressPointer(egressGroupId);
  
-         RpcResult<GetEgressPointerOutput> result = null;
-         //Rpcs.<GetEgressPointerOutput> getRpcResult(false, output.build());
-         return Futures.immediateFuture(result); 
+         RpcResultBuilder<GetEgressPointerOutput> rpcResultBuilder = RpcResultBuilder.success();
+         rpcResultBuilder.withResult(output.build());
+ 
+         return Futures.immediateFuture(rpcResultBuilder.build());
+         
      }
  
      private <T extends DataObject> Optional<T> read(LogicalDatastoreType datastoreType,
@@@ -414,4 -417,4 +416,4 @@@
          Futures.addCallback(tx.submit(), DEFAULT_CALLBACK);
      }
  
--}
++}