Fix the download fail and 'sshkey is not defined' problem in CI.

modification:
   Remove the proxy info in zte-pod1
   Fix 'sshkey is not defined' problem in CI

Change-Id: I291eb03fea3f31cd8b499c6ee86836caa9a0de71
Signed-off-by: zhifeng.jiang <jiang.zhifeng@zte.com.cn>

diff --git a/func/spawn_vm.py b/func/spawn_vm.py
index ec63230..15c2686 100644 (file)
--- a/func/spawn_vm.py
+++ b/func/spawn_vm.py
@@ -26,7 +26,6 @@ class SpawnVM(Env_setup):
     installer = ''\r
 \r
     def __init__(self, vm_info):\r
-        Env_setup.__init__(self)\r
         print 'SpawnVM Class initiated'\r
         vm_role_ip_dict = vm_info.copy()\r
         print 'Generating Heat Template\n'\r

diff --git a/test_cases/zte-pod1/compute/dhrystone_bm.yaml b/test_cases/zte-pod1/compute/dhrystone_bm.yaml
index 437dafd..15a40d4 100644 (file)
--- a/test_cases/zte-pod1/compute/dhrystone_bm.yaml
+++ b/test_cases/zte-pod1/compute/dhrystone_bm.yaml
@@ -17,12 +17,6 @@ Context:
 
   Virtual_Machines:
 
-  Proxy_Environment:
-      http_proxy: http://10.20.0.1:8118
-      https_proxy: http://10.20.0.1:8118
-      no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
-
-
 
 Test_Description:
   Test_category: "Compute"

diff --git a/test_cases/zte-pod1/compute/dhrystone_vm.yaml b/test_cases/zte-pod1/compute/dhrystone_vm.yaml
index 6f21342..9e3f211 100644 (file)
--- a/test_cases/zte-pod1/compute/dhrystone_vm.yaml
+++ b/test_cases/zte-pod1/compute/dhrystone_vm.yaml
@@ -20,11 +20,6 @@ Context:
       flavor: m1.large
       role: host
 
-  Proxy_Environment:
-    http_proxy: http://10.20.0.1:8118
-    https_proxy: http://10.20.0.1:8118
-    no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
-
 Test_Description:
   Test_category: "Compute"
   Benchmark: "dhrystone"

diff --git a/test_cases/zte-pod1/compute/dpi_bm.yaml b/test_cases/zte-pod1/compute/dpi_bm.yaml
index d1c5963..940307c 100644 (file)
--- a/test_cases/zte-pod1/compute/dpi_bm.yaml
+++ b/test_cases/zte-pod1/compute/dpi_bm.yaml
@@ -14,10 +14,6 @@ Context:
        role: host
   Virtual_Machines:
 
-  Proxy_Environment:
-     http_proxy: http://10.20.0.1:8118
-     https_proxy: http://10.20.0.1:8118
-     no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
 
 Test_Description:
   Test_category: "Compute"

diff --git a/test_cases/zte-pod1/compute/dpi_vm.yaml b/test_cases/zte-pod1/compute/dpi_vm.yaml
index d47b7f3..e61bf79 100644 (file)
--- a/test_cases/zte-pod1/compute/dpi_vm.yaml
+++ b/test_cases/zte-pod1/compute/dpi_vm.yaml
@@ -20,11 +20,6 @@ Context:
       role: 1Run
       flavor: m1.large
 
-  Proxy_Environment:
-     http_proxy: http://10.20.0.1:8118
-     https_proxy: http://10.20.0.1:8118
-     no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
-
 Test_Description:
   Test_category: "Compute"
   Benchmark: "dpi"

diff --git a/test_cases/zte-pod1/compute/ramspeed_bm.yaml b/test_cases/zte-pod1/compute/ramspeed_bm.yaml
index d9e1f17..f126a19 100644 (file)
--- a/test_cases/zte-pod1/compute/ramspeed_bm.yaml
+++ b/test_cases/zte-pod1/compute/ramspeed_bm.yaml
@@ -17,10 +17,6 @@ Context:
 
   Virtual_Machines:
 
-  Proxy_Environment:
-    http_proxy: http://10.20.0.1:8118
-    https_proxy: http://10.20.0.1:8118
-    no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
 
 
 Test_Description:

diff --git a/test_cases/zte-pod1/compute/ramspeed_vm.yaml b/test_cases/zte-pod1/compute/ramspeed_vm.yaml
index 942aa3f..7a2ef84 100644 (file)
--- a/test_cases/zte-pod1/compute/ramspeed_vm.yaml
+++ b/test_cases/zte-pod1/compute/ramspeed_vm.yaml
@@ -20,10 +20,6 @@ Context:
       flavor: m1.large
       role: host
 
-  Proxy_Environment:
-    http_proxy: http://10.20.0.1:8118
-    https_proxy: http://10.20.0.1:8118
-    no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
 
 Test_Description:
   Test_category: "Compute"

diff --git a/test_cases/zte-pod1/compute/ssl_bm.yaml b/test_cases/zte-pod1/compute/ssl_bm.yaml
index e4f608e..95d5384 100644 (file)
--- a/test_cases/zte-pod1/compute/ssl_bm.yaml
+++ b/test_cases/zte-pod1/compute/ssl_bm.yaml
@@ -14,12 +14,6 @@ Context:
       role: host
   Virtual_Machines:
 
-  Proxy_Environment:
-    http_proxy: http://10.20.0.1:8118
-    https_proxy: http://10.20.0.1:8118
-    no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
-
-
 Test_Description:
   Test_category: "Compute"
   Benchmark: "ssl"

diff --git a/test_cases/zte-pod1/compute/ssl_vm.yaml b/test_cases/zte-pod1/compute/ssl_vm.yaml
index cc97ecf..6004590 100644 (file)
--- a/test_cases/zte-pod1/compute/ssl_vm.yaml
+++ b/test_cases/zte-pod1/compute/ssl_vm.yaml
@@ -19,10 +19,6 @@ Context:
       flavor: 'm1.large'
       role: host
 
-  Proxy_Environment:
-    http_proxy: http://10.20.0.1:8118
-    https_proxy: http://10.20.0.1:8118
-    no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
 
 Test_Description:
   Test_category: "Compute"

diff --git a/test_cases/zte-pod1/compute/whetstone_bm.yaml b/test_cases/zte-pod1/compute/whetstone_bm.yaml
index 6c703de..bf14ea3 100644 (file)
--- a/test_cases/zte-pod1/compute/whetstone_bm.yaml
+++ b/test_cases/zte-pod1/compute/whetstone_bm.yaml
@@ -16,12 +16,6 @@ Context:
       role: host
   Virtual_Machines:
 
-  Proxy_Environment:
-    http_proxy: http://10.20.0.1:8118
-    https_proxy: http://10.20.0.1:8118
-    no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
-
-
 Test_Description:
   Test_category: "Compute"
   Benchmark: "whetstone"

diff --git a/test_cases/zte-pod1/compute/whetstone_vm.yaml b/test_cases/zte-pod1/compute/whetstone_vm.yaml
index bcde58c..9f12597 100644 (file)
--- a/test_cases/zte-pod1/compute/whetstone_vm.yaml
+++ b/test_cases/zte-pod1/compute/whetstone_vm.yaml
@@ -20,10 +20,6 @@ Context:
       flavor: m1.large
       role: host
 
-  Proxy_Environment:
-    http_proxy: http://10.20.0.1:8118
-    https_proxy: http://10.20.0.1:8118
-    no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
 
 Test_Description:
   Test_category: "Compute"

diff --git a/test_cases/zte-pod1/network/iperf_bm.yaml b/test_cases/zte-pod1/network/iperf_bm.yaml
index 5b2126f..e022d4a 100644 (file)
--- a/test_cases/zte-pod1/network/iperf_bm.yaml
+++ b/test_cases/zte-pod1/network/iperf_bm.yaml
@@ -21,11 +21,6 @@ Context:
 
   Virtual_Machines:
 
-  Proxy_Environment:
-    http_proxy: http://10.20.0.1:8118
-    https_proxy: http://10.20.0.1:8118
-    no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
-
 Test_Description:
   Test_category: "network"
   Benchmark: "iperf"

diff --git a/test_cases/zte-pod1/network/iperf_vm.yaml b/test_cases/zte-pod1/network/iperf_vm.yaml
index f03b5b6..57e09e0 100644 (file)
--- a/test_cases/zte-pod1/network/iperf_vm.yaml
+++ b/test_cases/zte-pod1/network/iperf_vm.yaml
@@ -27,11 +27,6 @@ Context:
       role: 2-host
       flavor: m1.large
 
-  Proxy_Environment:
-    http_proxy: http://10.20.0.1:8118
-    https_proxy: http://10.20.0.1:8118
-    no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
-
 Test_Description:
   Test_category: "network"
   Benchmark: "iperf"

diff --git a/test_cases/zte-pod1/network/iperf_vm_2.yaml b/test_cases/zte-pod1/network/iperf_vm_2.yaml
index 649adf8..c3cd6b3 100644 (file)
--- a/test_cases/zte-pod1/network/iperf_vm_2.yaml
+++ b/test_cases/zte-pod1/network/iperf_vm_2.yaml
@@ -28,10 +28,6 @@ Context:
       role: 2-host
       flavor: m1.large
 
-  Proxy_Environment:
-    http_proxy: http://10.20.0.1:8118
-    https_proxy: http://10.20.0.1:8118
-    no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
 
 Test_Description:
   Test_category: "network"

diff --git a/test_cases/zte-pod1/storage/fio_bm.yaml b/test_cases/zte-pod1/storage/fio_bm.yaml
index d07623c..e940e9b 100644 (file)
--- a/test_cases/zte-pod1/storage/fio_bm.yaml
+++ b/test_cases/zte-pod1/storage/fio_bm.yaml
@@ -17,10 +17,6 @@ Context:
 
   Virtual_Machines:
 
-  Proxy_Environment:
-    http_proxy: http://10.20.0.1:8118
-    https_proxy: http://10.20.0.1:8118
-    no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
 
 
 Test_Description:

diff --git a/test_cases/zte-pod1/storage/fio_vm.yaml b/test_cases/zte-pod1/storage/fio_vm.yaml
index 3e2f917..65a1e67 100644 (file)
--- a/test_cases/zte-pod1/storage/fio_vm.yaml
+++ b/test_cases/zte-pod1/storage/fio_vm.yaml
@@ -20,10 +20,6 @@ Context:
       flavor: m1.large
       role: host
 
-  Proxy_Environment:
-    http_proxy: http://10.20.0.1:8118
-    https_proxy: http://10.20.0.1:8118
-    no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
 
 Test_Description:
   Test_category: "Storage"