Merge pull request #1023 from xiywang/access_deny_all_target_telnet

openflow_acl_test.xxx.telnet: Update main-vm name and passwd in cfg file

qemu/tests/cfg/openflow_acl_test.cfg

@@ -42,7 +42,6 @@
             access_cmd = ssh
             target_port = 22
             host_username = root
-            host_password = redhat
             del setup_cmd
             del stop_cmd
         - telnet:
@@ -63,7 +62,6 @@
             access_cmd = telnet
             target_port = 23
             host_username = root
-            host_password = redhat
             Windows:
                  quit_cmd = quit
                  copy_scripts = telnet.py wait_for_quit.py
@@ -79,7 +77,7 @@
                 access_cmd_linux = curl -L www.redhat.com --connect-timeout 10
                 access_cmd_windows = cd C:\lynx && lynx.exe --dump www.redhat.com
             ssh, telnet:
-                vms += " virt-tests-vm2"
+                vms = "virt-tests-vm1 virt-tests-vm2"
                 access_targets = virt-tests-vm2 localhost
                 extra_target = localhost
         - access_deny_special_target:
@@ -89,7 +87,7 @@
             setup_service = yes
             acl_extra_options = "tp_dst=TARGET_PORT nw_dst=NW_DST"
             access_targets = localhost virt-tests-vm2
-            vms += " virt-tests-vm2"
+            vms = "virt-tests-vm1 virt-tests-vm2"
             extra_target = localhost
             ftp, website:
                 setup_targets = localhost virt-tests-vm2
@@ -100,9 +98,8 @@
             priv_br_type = openvswitch
             setup_service = yes
             acl_extra_options = "tp_src=TARGET_PORT"
-            vms += " virt-tests-vm2"
-            extra_target = "localhost"
-            image_snapshot = yes
+            vms = "virt-tests-vm1 virt-tests-vm2"
+            extra_target = localhost
             ftp, website:
                 setup_targets = virt-tests-vm1
         - accessed_deny_special_target:
@@ -112,9 +109,8 @@
             priv_br_type = openvswitch
             setup_service = yes
             acl_extra_options = "tp_src=TARGET_PORT nw_dst=NW_DST"
-            vms += " virt-tests-vm2"
-            extra_target = "localhost"
-            image_snapshot = yes
+            vms = "virt-tests-vm1 virt-tests-vm2"
+            extra_target = localhost
             acl_disabled_virt-tests-vm2 = yes
             ftp, website:
                 setup_targets = virt-tests-vm1