From: Sam Hague <shague@redhat.com>
Date: Mon, 11 Dec 2017 21:25:55 +0000 (-0500)
Subject: Copy dhcp files
X-Git-Tag: pre-potassium~1035
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F66357%2F8;p=integration%2Ftest.git

Copy dhcp files

Depends-on: https://git.opendaylight.org/gerrit/66364

Change-Id: Ib222fee32b0a53e4a6186cd0618c25d8a76b6e62
Signed-off-by: Sam Hague <shague@redhat.com>
---

diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 95dddbeeb1..106fdcd4d2 100644
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -384,6 +384,7 @@ Get VM IPs
     \    BuiltIn.Run Keyword If    "${status}" == "FAIL"    Collections.Append To List    ${vm_ips}    None
     \    ${rc}    ${vm_console_output}=    BuiltIn.Run Keyword If    "${status}" == "FAIL"    Run And Return Rc And Output    openstack console log show ${vm}
     \    BuiltIn.Run Keyword If    "${status}" == "FAIL"    BuiltIn.Log    ${vm_console_output}
+    Copy DHCP Files From Control Node
     [Return]    @{vm_ips}    ${ips_and_console_log[1]}
 
 Collect VM IPv6 SLAAC Addresses
@@ -1198,3 +1199,13 @@ OpenStack Suite Teardown
     ...    benefit automatically.
     OpenStack Cleanup All
     SSHLibrary.Close All Connections
+
+Copy DHCP Files From Control Node
+    [Documentation]    Copy the current DHCP files to the robot vm. The keyword must be called
+    ...    after the subnet(s) are created and before the subnet(s) are deleted.
+    ${suite_} =    BuiltIn.Evaluate    """${SUITE_NAME}""".replace(" ","_").replace("/","_").replace(".","_")
+    ${dstdir} =    Set Variable    /tmp/qdhcp/${suite_}
+    OperatingSystem.Create Directory    ${dstdir}
+    Get ControlNode Connection
+    BuiltIn.Run Keyword And Ignore Error    SSHLibrary.Get Directory    /opt/stack/data/neutron/dhcp    ${dstdir}    recursive=True
+    SSHLibrary.Close Connection
diff --git a/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot b/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot
index 366f185a9d..692c5a9bd7 100644
--- a/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot
+++ b/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot
@@ -111,6 +111,7 @@ Create Nova VMs
     : FOR    ${index}    IN RANGE    0    ${LOOP_COUNT}
     \    ${status}    ${message}    Run Keyword And Ignore Error    BuiltIn.Should Not Contain    @{VM_IPS}[${index}]    None
     \    Run Keyword If    '${status}' == 'FAIL'    DevstackUtils.Write Commands Until Prompt    openstack console log show @{VM_INSTANCES}[${index}]    30s
+    OpenStackOperations.Copy DHCP Files From Control Node
     BuiltIn.Set Suite Variable    ${VM_IP_NET10}
     BuiltIn.Set Suite Variable    ${VM_IP_NET20}
     BuiltIn.Should Not Contain    ${VM_IP_NET10}    None