From: Jozef Behran <jbehran@cisco.com>
Date: Mon, 22 Feb 2016 11:47:11 +0000 (+0100)
Subject: Add more configurability to Netconf device configurator
X-Git-Tag: release/beryllium-sr1~67
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=f33441884ffe43d43c64bb5c198ac3c6550d4b8f

Add more configurability to Netconf device configurator

The Configure_Device_On_Netconf now got "address", "port",
"user" and "password" arguments that specify these
configuration options for the device. This is needed to be
able to connect to non-testtool devices which have real
authentication and live on different address:port than
the testtool ones live.

Change-Id: I22c541302bfc2c9d78eee18358654aaaa1baf052
Signed-off-by: Jozef Behran <jbehran@cisco.com>
---

diff --git a/csit/libraries/NetconfKeywords.robot b/csit/libraries/NetconfKeywords.robot
index a89e449732..36731719f9 100644
--- a/csit/libraries/NetconfKeywords.robot
+++ b/csit/libraries/NetconfKeywords.robot
@@ -37,9 +37,9 @@ Setup_NetconfKeywords
     NexusKeywords.Initialize_Artifact_Deployment_And_Usage
 
 Configure_Device_In_Netconf
-    [Arguments]    ${device_name}    ${device_type}=default    ${device_port}=${FIRST_TESTTOOL_PORT}
+    [Arguments]    ${device_name}    ${device_type}=default    ${device_port}=${FIRST_TESTTOOL_PORT}    ${device_address}=${TOOLS_SYSTEM_IP}    ${device_user}=admin    ${device_password}=topsecret
     [Documentation]    Tell Netconf about the specified device so it can add it into its configuration.
-    ${template_as_string}=    BuiltIn.Set_Variable    {'DEVICE_IP': '${TOOLS_SYSTEM_IP}', 'DEVICE_NAME': '${device_name}', 'DEVICE_PORT': '${device_port}'}
+    ${template_as_string}=    BuiltIn.Set_Variable    {'DEVICE_IP': '${device_address}', 'DEVICE_NAME': '${device_name}', 'DEVICE_PORT': '${device_port}', 'DEVICE_USER': '${device_user}', 'DEVICE_PASSWORD': '${device_password}'}
     NetconfViaRestconf.Put_Xml_Template_Folder_Via_Restconf    ${DIRECTORY_WITH_DEVICE_TEMPLATES}${/}${device_type}    ${template_as_string}
     Collections.Set_To_Dictionary    ${NetconfKeywords__mounted_device_types}    ${device_name}    ${device_type}
 
diff --git a/csit/variables/netconf/device/configure-via-topology/data.xml b/csit/variables/netconf/device/configure-via-topology/data.xml
index 9099d39b71..6c8b352604 100644
--- a/csit/variables/netconf/device/configure-via-topology/data.xml
+++ b/csit/variables/netconf/device/configure-via-topology/data.xml
@@ -2,8 +2,8 @@
   <node-id>$DEVICE_NAME</node-id>
   <host xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_IP</host>
   <port xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_PORT</port>
-  <username xmlns="urn:opendaylight:netconf-node-topology">admin</username>
-  <password xmlns="urn:opendaylight:netconf-node-topology">topsecret</password>
+  <username xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_USER</username>
+  <password xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_PASSWORD</password>
   <tcp-only xmlns="urn:opendaylight:netconf-node-topology">false</tcp-only>
   <keepalive-delay xmlns="urn:opendaylight:netconf-node-topology">0</keepalive-delay>
 </node>
diff --git a/csit/variables/netconf/device/default/data.xml b/csit/variables/netconf/device/default/data.xml
index 0bc5801961..295f00c35e 100644
--- a/csit/variables/netconf/device/default/data.xml
+++ b/csit/variables/netconf/device/default/data.xml
@@ -3,8 +3,8 @@
   <name>$DEVICE_NAME</name>
   <address xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">$DEVICE_IP</address>
   <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">$DEVICE_PORT</port>
-  <username xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">admin</username>
-  <password xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">topsecret</password>
+  <username xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">$DEVICE_USER</username>
+  <password xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">$DEVICE_PASSWORD</password>
   <tcp-only xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">false</tcp-only>
   <event-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netty">prefix:netty-event-executor</type>