From 6d1d06e0f7e1c7dd1e379a70375ea28a5ca6268d Mon Sep 17 00:00:00 2001
From: Ganesh Nalawade <ganesh634@gmail.com>
Date: Tue, 7 Nov 2017 11:41:51 +0530
Subject: [PATCH] Fix junos netconf port issue in integration test (#32610)

---
 .../junos_netconf/tests/cli/changeport.yaml      | 16 ++++------------
 .../targets/junos_netconf/tests/cli/netconf.yaml |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/test/integration/targets/junos_netconf/tests/cli/changeport.yaml b/test/integration/targets/junos_netconf/tests/cli/changeport.yaml
index ef0c2288f06..73ec15e2747 100644
--- a/test/integration/targets/junos_netconf/tests/cli/changeport.yaml
+++ b/test/integration/targets/junos_netconf/tests/cli/changeport.yaml
@@ -12,7 +12,7 @@
 - name: Change port
   junos_netconf:
     state: present
-    netconf_port: 22
+    netconf_port: 8080
   register: result
 
 - assert:
@@ -22,23 +22,19 @@
 - name: idempotent tests
   junos_netconf:
     state: present
-    netconf_port: 22
+    netconf_port: 8080
   register: result
 
 - assert:
     that:
       - "result.changed == false"
 
-- name: wait for persistent socket to timeout, this ensures new socket creation with connection type netconf
-  pause:
-    seconds: 120
-
-- name: Ensure we can communicate over 22
+- name: Ensure we can communicate over 8080
   junos_command:
     rpcs:
     - get-software-information
     provider: "{{ netconf }}"
-    port: 22
+    port: 8080
 
 # This protects against the port override above not being honoured and a bug setting the port
 - name: Ensure we can NOT communicate over default port
@@ -53,10 +49,6 @@
       - "result.failed == true"
       - "'unable to open shell' in result.msg"
 
-- name: wait for persistent socket to timeout, this ensures new socket creation with connection type netconf
-  pause:
-    seconds: 120
-
 - name: Set back netconf to default port
   junos_netconf:
     state: present
diff --git a/test/integration/targets/junos_netconf/tests/cli/netconf.yaml b/test/integration/targets/junos_netconf/tests/cli/netconf.yaml
index ed4f91e6f0f..92c0a4f430a 100644
--- a/test/integration/targets/junos_netconf/tests/cli/netconf.yaml
+++ b/test/integration/targets/junos_netconf/tests/cli/netconf.yaml
@@ -45,7 +45,7 @@
 
 - name: wait for persistent socket to timeout
   pause:
-    seconds: 120
+    seconds: 150
 
 - name: Ensure we can NOT talk via netconf
   junos_command: