Merge "* Pick destination ecmp component index after vrf translation …

…In case of service instance flow agent was calculating component nexthop index for forward flow after vrf translation, reverese flow and forward flow could use different vrf translation rule hence vrf translation has to be applied for reverese flow too and then set the ecmp index. Fix: Apply vrf translation then set ecmp index for both forward and reverse flow UT: Change the order of nexthop in ecmp flow and verify index gets set properly Closes-bug:#1539280" into R3.0

src/vnsw/agent/oper/nexthop.h

@@ -778,6 +778,9 @@ class TunnelNHKey : public NextHopKey {
     void set_tunnel_type(TunnelType tunnel_type) {
         tunnel_type_ = tunnel_type;
     }
+    const Ip4Address dip() const {
+        return dip_;
+    }
 private:
     friend class TunnelNH;
     VrfKey vrf_key_;