From b6a6bcbe127f206fcc84cd7db734b890cbcb4c19 Mon Sep 17 00:00:00 2001
From: Anurag Chadha <anurag.chadha@hsc.com>
Date: Fri, 26 Mar 2021 14:43:41 +0530
Subject: [PATCH] [ONOS-8137] Bug fixed for driver not found in case of ipv6
 address being used in short notation

Change-Id: I8fd0922eb2cce98ecb5612979f0554ac2281351b
---
 .../main/java/org/onosproject/netconf/NetconfDeviceInfo.java  | 4 +++-
 .../onosproject/netconf/ctl/impl/NetconfControllerImpl.java   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfDeviceInfo.java b/protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfDeviceInfo.java
index 3ef4e602fc..17849fc80a 100644
--- a/protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfDeviceInfo.java
+++ b/protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfDeviceInfo.java
@@ -126,8 +126,9 @@ public class NetconfDeviceInfo {
     /**
      * Convenieince constructor that converts all known fields from NetCfg data.
      * @param netconfConfig NetCf configuration
+     * @param deviceId deviceId as per netcfg
      */
-    public NetconfDeviceInfo(NetconfDeviceConfig netconfConfig) {
+    public NetconfDeviceInfo(NetconfDeviceConfig netconfConfig, DeviceId deviceId) {
         checkArgument(!netconfConfig.username().isEmpty(), "Empty device name");
         checkArgument(netconfConfig.port() > 0, "Negative port");
         checkNotNull(netconfConfig.ip(), "Null ip address");
@@ -135,6 +136,7 @@ public class NetconfDeviceInfo {
         this.name = netconfConfig.username();
         this.password = netconfConfig.password();
         this.ipAddress = netconfConfig.ip();
+        this.deviceId = deviceId;
         this.port = netconfConfig.port();
         this.path = netconfConfig.path();
         if (netconfConfig.sshKey() != null && !netconfConfig.sshKey().isEmpty()) {
diff --git a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java
index c32004c248..cb0a71237b 100644
--- a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java
+++ b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java
@@ -370,7 +370,7 @@ public class NetconfControllerImpl implements NetconfController {
 
             if (netCfg != null) {
                 log.debug("Device {} is present in NetworkConfig", deviceId);
-                deviceInfo = new NetconfDeviceInfo(netCfg);
+                deviceInfo = new NetconfDeviceInfo(netCfg, deviceId);
             } else {
                 log.debug("Creating NETCONF device {}", deviceId);
                 deviceInfo = createDeviceInfo(deviceId);