From 85bb1f95ecf48197934b8151ee33f5d43f78ed29 Mon Sep 17 00:00:00 2001 From: Alex Fokin Date: Fri, 9 Sep 2016 19:24:19 +0400 Subject: [PATCH 1/5] vmapp_name --- .gitignore | 1 + README.md | 4 ++++ lib/kitchen/driver/vcair.rb | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9aea2dc..abcb354 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ tmp *.sw? *~ .env.sh +.idea diff --git a/README.md b/README.md index d4c0867..158e10c 100644 --- a/README.md +++ b/README.md @@ -67,10 +67,14 @@ platforms: - name: centos driver: catalog_name: Public Catalog + node_name: Linux-hostname + vmapp_name: VMapp-Linux image_name: CentOS64-64BIT - name: windows driver: catalog_name: Public Catalog + node_name: Windows-hostname + vmapp_name: VMapp-Windows image_name: W2K12-STD-R2-64BIT cpus: 2 memory: 4096 diff --git a/lib/kitchen/driver/vcair.rb b/lib/kitchen/driver/vcair.rb index e419e38..d61e4a8 100644 --- a/lib/kitchen/driver/vcair.rb +++ b/lib/kitchen/driver/vcair.rb @@ -242,6 +242,10 @@ def node_name config[:node_name] || generate_node_name end + def vmapp_name + config[:vmapp_name] || generate_node_name + end + def generate_node_name # SecureRandom.hex generates a string 2x the argument. # We need the name to be 15 chars or less to play nicely @@ -305,7 +309,7 @@ def validate_customization_script! end def instantiate - image.instantiate(node_name, instantiate_config) + image.instantiate(vmapp_name, instantiate_config) end def vapp From 24609a9833a397d7fc714ffcc11660628a99ea5c Mon Sep 17 00:00:00 2001 From: Alex Fokin Date: Tue, 13 Sep 2016 11:08:26 +0400 Subject: [PATCH 2/5] Changes for vcair_spec: calls instantiate on the image --- spec/vcair_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/vcair_spec.rb b/spec/vcair_spec.rb index c6aba73..dd4353f 100644 --- a/spec/vcair_spec.rb +++ b/spec/vcair_spec.rb @@ -699,7 +699,7 @@ it 'calls instantiate on the image' do allow(driver).to receive(:image).and_return(image) - allow(driver).to receive(:node_name).and_return('node') + allow(driver).to receive(:vmapp_name).and_return('node') allow(driver).to receive(:instantiate_config).and_return('config') expect(image).to receive(:instantiate).with('node', 'config') From 97f559c892d5fc28629fb3a174e948b35cf959b0 Mon Sep 17 00:00:00 2001 From: Alex Fokin Date: Tue, 13 Sep 2016 11:12:43 +0400 Subject: [PATCH 3/5] Changes for vcair_spec: calls instantiate on the image --- spec/vcair_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/vcair_spec.rb b/spec/vcair_spec.rb index dd4353f..b33c5c4 100644 --- a/spec/vcair_spec.rb +++ b/spec/vcair_spec.rb @@ -52,7 +52,7 @@ transport: transport, platform: platform, to_str: 'instance_str' - ) + ) end before do From 3493aa073b9575ba29cc642348da651aa6cfa62f Mon Sep 17 00:00:00 2001 From: Alex Fokin Date: Tue, 13 Sep 2016 11:27:52 +0400 Subject: [PATCH 4/5] Changes for vcair_spec: calls instantiate on the image --- spec/vcair_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/vcair_spec.rb b/spec/vcair_spec.rb index b33c5c4..dd4353f 100644 --- a/spec/vcair_spec.rb +++ b/spec/vcair_spec.rb @@ -52,7 +52,7 @@ transport: transport, platform: platform, to_str: 'instance_str' - ) + ) end before do From 0151a23056d6fb910e14f57b1ef6b34584fb0d00 Mon Sep 17 00:00:00 2001 From: Alex Fokin Date: Tue, 13 Sep 2016 15:00:59 +0400 Subject: [PATCH 5/5] Changes for vcair_spec: calls instantiate on the image --- spec/vcair_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/vcair_spec.rb b/spec/vcair_spec.rb index dd4353f..0a95449 100644 --- a/spec/vcair_spec.rb +++ b/spec/vcair_spec.rb @@ -51,8 +51,7 @@ logger: logger, transport: transport, platform: platform, - to_str: 'instance_str' - ) + to_str: 'instance_str') end before do