From 4299fcebb2f4f750a6ca9d216cf06a9ad30724a2 Mon Sep 17 00:00:00 2001 From: Matt Peperell Date: Mon, 10 Aug 2015 12:05:47 +0100 Subject: [PATCH] Add VMware support --- README.md | 2 +- parser.go | 1 + parser_test.go | 32 ++++++++++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b054342..c065e57 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This is a little Go app which generates an dynamic [Ansible] [ansible] inventory from a [Terraform] [tf] state file. It allows one to spawn a bunch of instances with Terraform, then (re-)provision them with Ansible. It's pretty neat. -Currently, only **AWS**, **DigitalOcean**, and **CloudStack** are supported. +Currently, only **AWS**, **DigitalOcean**, **CloudStack** and **VMware** are supported. # Installation diff --git a/parser.go b/parser.go index 23631b1..e54b630 100644 --- a/parser.go +++ b/parser.go @@ -22,6 +22,7 @@ func init() { "public_ip", // AWS "private_ip", // AWS "ipaddress", // CS + "ip_address", // VMware } } diff --git a/parser_test.go b/parser_test.go index 35d22e3..33aa39e 100644 --- a/parser_test.go +++ b/parser_test.go @@ -67,6 +67,22 @@ const exampleStateFile = ` "ipaddress": "10.2.1.5" } } + }, + "vsphere_virtual_machine.five": { + "type": "vsphere_virtual_machine", + "primary": { + "id": "aaaaaaaa", + "attributes": { + "datacenter": "dddddddd", + "host": "hhhhhhhh", + "id": "aaaaaaaa", + "image": "Ubunutu 14.04 LTS", + "ip_address": "10.20.30.40", + "linked_clone": "false", + "name": "nnnnnn", + "power_on": "true" + } + } } } } @@ -90,11 +106,12 @@ func TestResources(t *testing.T) { assert.Nil(t, err) inst := s.resources() - assert.Equal(t, 4, len(inst)) + assert.Equal(t, 5, len(inst)) assert.Equal(t, "aws_instance", inst["one"].Type) assert.Equal(t, "aws_instance", inst["two"].Type) assert.Equal(t, "digitalocean_droplet", inst["three"].Type) assert.Equal(t, "cloudstack_instance", inst["four"].Type) + assert.Equal(t, "vsphere_virtual_machine", inst["five"].Type) } func TestAddress(t *testing.T) { @@ -105,11 +122,12 @@ func TestAddress(t *testing.T) { assert.Nil(t, err) inst := s.resources() - assert.Equal(t, 4, len(inst)) + assert.Equal(t, 5, len(inst)) assert.Equal(t, "10.0.0.1", inst["one"].Address()) assert.Equal(t, "50.0.0.1", inst["two"].Address()) assert.Equal(t, "192.168.0.3", inst["three"].Address()) assert.Equal(t, "10.2.1.5", inst["four"].Address()) + assert.Equal(t, "10.20.30.40", inst["five"].Address()) } func TestIsSupported(t *testing.T) { @@ -147,4 +165,14 @@ func TestIsSupported(t *testing.T) { }, } assert.Equal(t, true, r.isSupported()) + + r = resourceState{ + Type: "vsphere_virtual_machine", + Primary: instanceState{ + Attributes: map[string]string{ + "ip_address": "10.20.30.40", + }, + }, + } + assert.Equal(t, true, r.isSupported()) }