From f1e225fcb3b17f1a54d2036513191ac38c63e6ad Mon Sep 17 00:00:00 2001
From: Denis Pauk <pauk.denis@gmail.com>
Date: Thu, 3 May 2018 13:15:41 +0300
Subject: [PATCH] 2.2.1->2.2.2, version repack

---
 CHANGELOG.txt                              |   2 +
 plugin.yaml                                |   4 +-
 setup.py                                   |   2 +-
 system_tests/resources/linux/snapshot.yaml | 115 +++++++++++++++++++++
 vsphere_plugin_common/__init__.py          |   2 +-
 5 files changed, 121 insertions(+), 4 deletions(-)
 create mode 100644 system_tests/resources/linux/snapshot.yaml

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3c8512d3..2dda38fe 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,5 @@
+2.2.2:
+  - Fix debug info about selected hosts.
 2.2.1:
   - Fix handling of VMs currently being cloned (VSPHERE-86)
 2.2.0:
diff --git a/plugin.yaml b/plugin.yaml
index e2f492fd..b8e8d574 100644
--- a/plugin.yaml
+++ b/plugin.yaml
@@ -6,8 +6,8 @@ plugins:
     vsphere:
         executor: central_deployment_agent
         package_name: cloudify-vsphere-plugin
-        package_version: '2.2.1'
-        source: https://github.com/cloudify-cosmo/cloudify-vsphere-plugin/archive/2.2.1.zip
+        package_version: '2.2.2'
+        source: https://github.com/cloudify-cosmo/cloudify-vsphere-plugin/archive/2.2.2.zip
 
 data_types:
     cloudify.datatypes.vsphere.Config:
diff --git a/setup.py b/setup.py
index 6da4c1a8..eaf4bbd7 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
 setuptools.setup(
     zip_safe=True,
     name='cloudify-vsphere-plugin',
-    version='2.2.1',
+    version='2.2.2',
     packages=[
         'vsphere_plugin_common',
         'vsphere_plugin_common.vendored_collections',
diff --git a/system_tests/resources/linux/snapshot.yaml b/system_tests/resources/linux/snapshot.yaml
new file mode 100644
index 00000000..3f228439
--- /dev/null
+++ b/system_tests/resources/linux/snapshot.yaml
@@ -0,0 +1,115 @@
+tosca_definitions_version: cloudify_dsl_1_3
+
+imports:
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-vsphere-plugin/2.2.2/plugin.yaml
+  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
+
+inputs:
+
+  vcenter_user:
+    type: string
+
+  vcenter_password:
+    type: string
+
+  vcenter_ip:
+    type: string
+
+  vcenter_port:
+    type: string
+    default: 443
+
+  vcenter_datacenter:
+    type: string
+    description: >
+       vcenter datacenter
+    default: Datacenter
+
+  vcenter_resource_pool:
+    description: >
+      Resource pool name
+    default: Resources
+
+  vsphere_auto_placement:
+    type: string
+    default: true
+
+  template_name:
+    type: string
+    description: >
+      "CentOS 7 template name"
+    default: "CentOS-7.2-x86_64-1511-tmpl"
+
+  vcenter_network:
+    type: string
+    description: >
+      vcenter network
+    default: Internal
+
+  vcenter_datastore:
+    type: string
+    description: >
+      vcenter datastore
+    default: datastore1
+
+  agent_user:
+    default: root
+    type: string
+
+  agent_group:
+    default: root
+
+  manager_network:
+    default: default
+
+  install_method:
+    default: remote
+
+  allowed_hosts:
+    default: []
+
+  allowed_clusters:
+    default: []
+
+  allowed_datastores:
+    default: []
+
+###############################################################################
+#  DSL section
+###############################################################################
+dsl_definitions:
+
+  connection_config: &connection_config
+    username: { get_input: vcenter_user }
+    password: {get_input: vcenter_password }
+    host: { get_input: vcenter_ip }
+    port: { get_input: vcenter_port }
+    datacenter_name: {get_input: vcenter_datacenter }
+    resource_pool_name: { get_input: vcenter_resource_pool }
+    auto_placement: { get_input: vsphere_auto_placement }
+    # allow_insecure: true
+
+node_templates:
+###############################################################################
+# vsphere section
+###############################################################################
+  vm_base:
+    type: cloudify.vsphere.nodes.Server
+    properties:
+      connection_config: *connection_config
+      os_family: linux
+      allowed_hosts: { get_input: allowed_hosts }
+      allowed_clusters: { get_input: allowed_clusters }
+      allowed_datastores: { get_input: allowed_datastores }
+      server:
+        name: other_vm
+        template: { get_input: template_name }
+        cpus: 1
+        memory: 1024
+      agent_config:
+        install_method: none
+      networking:
+        dns_servers:
+          - '8.8.8.8'
+        connect_networks:
+          - name: Internal
diff --git a/vsphere_plugin_common/__init__.py b/vsphere_plugin_common/__init__.py
index e9688f09..4c62da83 100644
--- a/vsphere_plugin_common/__init__.py
+++ b/vsphere_plugin_common/__init__.py
@@ -1365,7 +1365,7 @@ def find_candidate_hosts(self,
             hosts = [host for host in hosts if host.name in allowed_hosts]
             ctx.logger.debug(
                 'Filtered list of hosts to be considered: {hosts}'.format(
-                    hosts=', '.join(host_names),
+                    hosts=', '.join([host.name for host in hosts]),
                 )
             )