From e578599e6e202d9a1e572a8c2b66a5ddd6b61a6c Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Tue, 12 Jul 2016 18:25:30 +0200
Subject: [PATCH] Fix testcase2

JIRA: SDNVPN-31

It seems due to the merge conflict, some of the lines got
reordered and the script failed.

Also, added the private key for the instances.

Change-Id: I58c3dfe5ba2d43e0749ca5cd08b3a87221a68b66
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---
 test/functest/id_rsa        | Bin 0 -> 426 bytes
 test/functest/testcase_2.py |  32 +++++++++++++++-----------------
 2 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 test/functest/id_rsa

diff --git a/test/functest/id_rsa b/test/functest/id_rsa
new file mode 100644
index 0000000000000000000000000000000000000000..d5904066490ba551896fdb7fb1f68a486b5876ed
GIT binary patch
literal 426
zcmV;b0agA0000Mbb7(Dcb724g00RL40RR91f_1G)FMI-Sb?NIZ2FkRJyp9Kli!nw6
zb`0!Ldnd$H0<-|Izz9A6YpUE@22d3icy>*(KBI82YzV;^i7q?zB?8U5@p0c5Xo*VS
z!Ndu`)q+?7Hv@BD^@DuJqh6A;WNx*y-z!i_O}(8M4yanGk*dUnczQOasJPgz2`HB>
z(fert004pke$UfI3?>i$Q(uSYT^}<lF-A>98`Gz5$7o@jbzB9Bl5Z09)Tj<ZGb}qv
z=b;#@l>A(2&qpg{M|`h``rq4Ix*yN=hk3u=`E`0L;s5`2)V^$Ya1jzTmVgi4_Q25Q
z4w~bJZ{=CgcwLBDp}B9GrX2%>&icclQ5=u!!BV)A5dZ)HLI9g}tP=_P!ozdip@@9{
zy?m(KB{D-+F}=3-hh6~;t>77tz*Ox7$9f>KeHOTU@yWs~H-fqvvXTAu$zc$$;j<?I
z002S&!N@X1v2FlMHOwb)ADV|7Lmb#KEo>{t2m{APmUHS%+e`|<sj5unocrC-aYqGe
UuhaP#E&B-&0DxAFS~L>2??Ax9ga7~l

literal 0
HcmV?d00001

diff --git a/test/functest/testcase_2.py b/test/functest/testcase_2.py
index 4a51111..76757d6 100644
--- a/test/functest/testcase_2.py
+++ b/test/functest/testcase_2.py
@@ -164,11 +164,26 @@ def create_instance(nova_client,
     # Retrieve IP of INSTANCE
     # instance_ip = instance.networks.get(network_id)[0]
 
+    logger.debug("Adding '%s' to security group '%s'..."
+                 % (name, SECGROUP_NAME))
+    os_utils.add_secgroup_to_instance(nova_client, instance.id, sg_id)
+
+    return instance
+
 
+def generate_userdata_common():
+    return ("#!/bin/sh\n"
+            "sudo mkdir -p /home/cirros/.ssh/\n"
+            "sudo chown cirros:cirros /home/cirros/.ssh/\n"
+            "sudo chown cirros:cirros /home/cirros/id_rsa\n"
+            "mv /home/cirros/id_rsa /home/cirros/.ssh/\n"
             "sudo echo ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgnWtSS98Am516e"
             "stBsq0jbyOB4eLMUYDdgzsUHsnxFQCtACwwAg9/2uq3FoGUBUWeHZNsT6jcK9"
             "sCMEYiS479CUCzbrxcd8XaIlK38HECcDVglgBNwNzX/WDfMejXpKzZG61s98rU"
             "ElNvZ0YDqhaqZGqxIV4ejalqLjYrQkoly3R+2k= "
+            "cirros@test1>/home/cirros/.ssh/authorized_keys\n"
+            "sudo chown cirros:cirros /home/cirros/.ssh/authorized_keys\n"
+            "chmod 700 /home/cirros/.ssh\n"
             "chmod 644 /home/cirros/.ssh/authorized_keys\n"
             "chmod 600 /home/cirros/.ssh/id_rsa\n"
             )
@@ -461,20 +476,3 @@ def main():
 
 if __name__ == '__main__':
     main()
-
-            "cirros@test1>/home/cirros/.ssh/authorized_keys\n"
-            "sudo chown cirros:cirros /home/cirros/.ssh/authorized_keys\n"
-            "chmod 700 /home/cirros/.ssh\n"
-            "sudo chown cirros:cirros /home/cirros/.ssh/\n"
-            "sudo chown cirros:cirros /home/cirros/id_rsa\n"
-            "mv /home/cirros/id_rsa /home/cirros/.ssh/\n"
-def generate_userdata_common():
-    return ("#!/bin/sh\n"
-            "sudo mkdir -p /home/cirros/.ssh/\n"
-    return instance
-
-
-    logger.debug("Adding '%s' to security group '%s'..."
-                 % (name, SECGROUP_NAME))
-    os_utils.add_secgroup_to_instance(nova_client, instance.id, sg_id)
-
-- 
2.16.6