cyoi 0.6.1 → 0.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmEzZGE0MzhjNDVkOTZjOWIxYWNiOTFmZmYyZDQ3YjI2ZDIyMTA1Ng==
+    NWU4Y2U2YzZjMjI1ZmI0ZTdlNzM4OTA3ZjBhZmY2NmY2MjVlNGM5ZA==
   data.tar.gz: !binary |-
-    YjY0MWMxZTliYzA5YmQ0MWVjNjQ4ZTQ2ZGYzZTM2ZjhiMjBmZjBiYw==
+    MDhjN2E4NzE4ODgyOTk5ZDA4ODBhYTgxZWU0MzM4NmZiMjAyMDc3Yg==
 SHA512:
   metadata.gz: !binary |-
-    NjdmZTdlZGIzZjlkZTIyNWUzOGFjNWQ0MzNkYjc4M2NhYjhhMGRiY2VjODQ2
-    NWQ2NjdlYjI4MzE3NDRmZGIxNzhmMGMyMjE2MDZiZDRjMjNlYjcwNTU5MDU1
-    MGIwZTgzY2MxNDRhY2ZjMDA5ZTE3NDk5ZGI1MTU4Y2Y2YTRmZWE=
+    NGNjNTU4ZWMzMDA0M2JkMzRlMDRhYWJhYjZlMDFjNDVjYzVmYTIyNmI3NGIy
+    NGJmYTJjN2ZkOGYwOTcyNzYyZTI3NTI4OTVhNmQ1MTFjNzE3NThlNGZlYmMw
+    Yzc2NTExNTdiZWE3MTBiYWJmZmNkNmQ4MzdiYzY0YTcxMDJlODQ=
   data.tar.gz: !binary |-
-    MWE0N2Q5MmVjYTE3ZDQ1OTNiY2RlMjNlZjllNGZjNWE3MmQ2NTViOTk5ZTFi
-    ZGQxNWU4YjU0YzlkNzAxNDY1YmQyMDRmZmMyNzEzOTM3MTU1YTNhZjdhNWVi
-    Nzc2ZWNmMTcyNTM0OTA2OGNkNTQ1MTFiODBhN2E2ZGNiZmJhYzQ=
+    NTIzZTEyMWRhMjcyZmEyZDExMDM0MjRhMWJlODlkZDNmNzdhNWY3NWE2MTBl
+    NGExMWQ0NDhiYTZkYmQ2NjgyZjc2MjFjOTIxYTlmYWQ2MzhhYjBjZDk2ZTA1
+    ZWZhOTFjMmJkZThkODMzMjIzMDAwOGE0ZjRiOWNlZTcwODVhMDg=

data/.gitignore

@@ -15,4 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.DS_Store
+.DS_Store
+*.swp

data/ChangeLog.md

@@ -2,6 +2,10 @@
 
 Cyoi (choose-your-own-infrastructure) is a library to ask an end-user to choose an infrastructure (AWS, OpenStack, etc), region, and login credentials.
 
+## v0.7
+
+* vsphere provising
+
 ## v0.6
 
 * added `cyoi image` - AWS: public AMI for Ubuntu 13.04; OpenStack: choose an Image from menu

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in cyoi.gemspec
 gemspec
 
+gem "unf"
 group :development do
   gem "awesome_print"
   gem "rb-fsevent", "~> 0.9.1"

data/lib/cyoi/cli/auto_detection.rb

@@ -17,7 +17,7 @@ class Cyoi::Cli::AutoDetection::UI
     # Include "Alternate credentials" as the last option
     if aggregated_detector_choices.keys.size > 0
       hl.choose do |menu|
-        menu.prompt = "Choose an auto-detected infrastructure:  "
+        menu.prompt = "Choose an auto-detected infrastructure: "
         aggregated_detector_choices.each do |label, credentials|
           menu.choice(label) do
             attributes.set("name", credentials.delete("name"))

data/lib/cyoi/cli/auto_detection/auto_detection_fog.rb

@@ -75,6 +75,16 @@ class Cyoi::Cli::AutoDetection::AutoDetectionFog
         choice["openstack_region"] = profile[:openstack_region] if profile[:openstack_region]
         fog_choices["OpenStack (#{profile_name})"] = choice
       end
+      if profile[:vsphere_username]
+        fog_choices["vSphere (#{profile_name})"] = {
+          "name" => "vsphere",
+          "provider" => "vSphere",
+          "vsphere_username" => profile[:vsphere_username],
+          "vsphere_password" => profile[:vsphere_password],
+          "vsphere_server"   => profile[:vsphere_server],
+          "vsphere_expected_pubkey_hash" => profile[:vsphere_expected_pubkey_hash]
+        }
+      end
     end
     fog_choices
   end

data/lib/cyoi/cli/provider.rb

@@ -66,7 +66,8 @@ class Cyoi::Cli::Provider
       menu.prompt = "Choose your infrastructure: "
       menu.choice("AWS") { "aws" }
       menu.choice("OpenStack") { "openstack" }
+      menu.choice("vSphere") { "vsphere" }
     end
     save_settings!
   end
-end
+end

data/lib/cyoi/cli/provider_addresses/address_cli_vsphere.rb

@@ -0,0 +1,44 @@
+module Cyoi::Cli::Addresses; end
+class Cyoi::Cli::Addresses::AddressCliVsphere
+  attr_reader :provider_client
+  attr_reader :attributes
+  attr_reader :hl
+
+  def initialize(provider_client, attributes, highline)
+    @provider_client = provider_client
+    @hl = highline
+    @attributes = attributes.is_a?(Hash) ? ReadWriteSettings.new(attributes) : attributes
+    raise "@attributes must be ReadWriteSettings (or Hash)" unless @attributes.is_a?(ReadWriteSettings)
+  end
+
+  def perform_and_return_attributes
+    unless valid_address?
+      provision_address
+    end
+    export_attributes
+  end
+
+  # helper to export the complete nested attributes.
+  def export_attributes
+    attributes.to_nested_hash
+  end
+
+
+  def valid_address?
+    attributes["ip"]
+  end
+
+  def display_confirmation
+    puts "\n"
+    puts "Confirming: Using address #{attributes.ip}"
+  end
+
+  protected
+  def provision_address
+    print "Please specify network settings... "
+    attributes["ip"] = hl.ask("Public IP: ").to_s unless attributes.exists?("ip")
+    puts attributes.ip
+  end
+end
+
+Cyoi::Cli::Address.register_address_cli("vsphere", Cyoi::Cli::Addresses::AddressCliVsphere)

data/lib/cyoi/cli/provider_key_pair/key_pair_vsphere.rb

@@ -0,0 +1,57 @@
+class Cyoi::Cli::KeyPair; end
+class Cyoi::Cli::KeyPair::KeyPairCliVsphere
+  attr_reader :provider_client
+  attr_reader :attributes
+  attr_reader :hl
+
+  def initialize(provider_client, attributes, highline)
+    @provider_client = provider_client
+    @hl = highline
+    @attributes = attributes.is_a?(Hash) ? ReadWriteSettings.new(attributes) : attributes
+    raise "@attributes must be ReadWriteSettings (or Hash)" unless @attributes.is_a?(ReadWriteSettings)
+    raise "@attributes.name must be set" unless @attributes["name"]
+  end
+
+  def perform_and_return_attributes
+    unless valid?
+      #destroy_existing_key_pair
+      provision_key_pair
+    end
+    export_attributes
+  end
+
+  # helper to export the complete nested attributes.
+  def export_attributes
+    attributes.to_nested_hash
+  end
+
+  def valid?
+    attributes["name"] && attributes["fingerprint"] && attributes["private_key"]
+    #  provider_client.valid_key_pair_fingerprint?(key_pair_name, attributes.fingerprint)
+  end
+
+  def display_confirmation
+    puts "\n"
+    puts "Confirming: Using key pair #{key_pair_name}"
+  end
+
+  def key_pair_name
+    attributes.name
+  end
+
+  protected
+  def destroy_existing_key_pair
+    provider_client.delete_key_pair_if_exists(key_pair_name)
+  end
+
+  # provisions key pair from OpenStack and returns fog object KeyPair
+  def provision_key_pair
+    #if key_pair = provider_client.create_key_pair(key_pair_name)
+    # FIXME: Create a dummy keypair for now...
+      attributes["fingerprint"] = "Dummy Fingerprint!"
+      attributes["private_key"] = "Dummy Private Key!"
+    #end
+  end
+end
+
+Cyoi::Cli::KeyPair.register_key_pair_cli("vsphere", Cyoi::Cli::KeyPair::KeyPairCliVsphere)

data/lib/cyoi/cli/providers/provider_cli_vsphere.rb

@@ -0,0 +1,94 @@
+require "cyoi/cli/providers/provider_cli"
+class Cyoi::Cli::Providers::ProviderCliVsphere < Cyoi::Cli::Providers::ProviderCli
+  def perform_and_return_attributes
+    unless valid_infrastructure?
+      puts "\nUsing provider vSphere\n"
+      setup_credentials
+      setup_networking
+      setup_resources
+      setup_ntp
+      setup_vcenter
+    end
+    export_attributes
+  end
+
+  def setup_credentials
+    puts "\n"
+    attributes.set_default("credentials", {})
+    credentials = attributes.credentials
+    credentials["vsphere_username"] = hl.ask("Username: ").to_s unless credentials.exists?("vsphere_username")
+    credentials["vsphere_password"] = hl.ask("Password: ").to_s unless credentials.exists?("vsphere_password")
+    credentials["vsphere_server"] = hl.ask("Server: ").to_s unless credentials.exists?("vsphere_server")
+    credentials["vsphere_expected_pubkey_hash"] = h1.ask("Expected public key hash: ").to_s unless credentials.exists?("vsphere_expected_pubkey_hash")
+  end
+
+  def setup_networking
+    puts "\n"
+    attributes.set_default("network", {})
+    network = attributes.network
+    network["netmask"] = hl.ask("Netmask: ").to_s unless network.exists?("netmask")
+    network["gateway"] = hl.ask("Gateway: ").to_s unless network.exists?("gateway")
+    network["dns"] = hl.ask("DNS Server: ").to_s unless network.exists?("dns")
+    network["name"] = hl.ask("vCenter Port Group: ").to_s unless network.exists?("name")
+  end
+
+  def setup_resources
+    puts "\n"
+    attributes.set_default("resources", {})
+    resources = attributes.resources
+    resources["persistent_disk"] = hl.ask("Size of Persistent Volume (MB): ", Integer) unless resources.exists?("persistent_disk")
+    resources["ram"] = hl.ask("MicroBOSH Memory (MB): ", Integer) unless resources.exists?("ram")
+    resources["disk"] = hl.ask("MicroBOSH Local Disk (MB): ", Integer) unless resources.exists?("disk")
+    resources["cpu"] = hl.ask("MicroBOSH vCPUs: ", Integer) unless resources.exists?("cpu")
+  end
+
+  def setup_ntp
+    puts "\n"
+    attributes["ntps"] = hl.ask("NTP Server: ").to_s unless attributes.exists?("ntps")
+  end
+
+  def setup_vcenter
+    puts "\n"
+    attributes.set_default("datacenter", {})
+    datacenter = attributes.datacenter
+    datacenter["name"] = hl.ask("Datacenter: ").to_s unless datacenter.exists?("name")
+    datacenter["vm_folder"] = hl.ask("VM Folder: ").to_s unless datacenter.exists?("vm_folder")
+    datacenter["template_folder"] = hl.ask("Template Folder: ").to_s unless datacenter.exists?("template_folder")
+    datacenter["disk_path"] = hl.ask("Disk Path: ").to_s unless datacenter.exists?("disk_path")
+    datacenter["datastore_pattern"] = hl.ask("Datastore Pattern: ").to_s unless datacenter.exists?("datastore_pattern")
+    datacenter["persistent_datastore_pattern"] = hl.ask("Persistent Datastore Pattern: ").to_s unless datacenter.exists?("persistent_datastore_pattern")
+    datacenter["allow_mixed_datastores"] = hl.agree("Allow mixed datastores? (y/n): ") unless datacenter.exists?("allow_mixed_datastores")
+    datacenter["clusters"] = hl.ask("Clusters: ").to_s unless datacenter.exists?("clusters")
+  end
+
+  def valid_infrastructure?
+    attributes.exists?("credentials.vsphere_username") &&
+    attributes.exists?("credentials.vsphere_password") &&
+    attributes.exists?("credentials.vsphere_server") &&
+    attributes.exists?("credentials.vsphere_expected_pubkey_hash") &&
+    attributes.exists?("network.netmask") &&
+    attributes.exists?("network.gateway") &&
+    attributes.exists?("network.dns") &&
+    attributes.exists?("network.name") &&
+    attributes.exists?("ntps") &&
+    attributes.exists?("datacenter.name") &&
+    attributes.exists?("datacenter.vm_folder") &&
+    attributes.exists?("datacenter.template_folder") &&
+    attributes.exists?("datacenter.disk_path") &&
+    attributes.exists?("datacenter.datastore_pattern") &&
+    attributes.exists?("datacenter.persistent_datastore_pattern") &&
+    attributes.exists?("datacenter.allow_mixed_datastores") &&
+    attributes.exists?("datacenter.clusters") &&
+    attributes.exists?("resources.persistent_disk") &&
+    attributes.exists?("resources.ram") &&
+    attributes.exists?("resources.disk") &&
+    attributes.exists?("resources.cpu")
+  end
+
+  def display_confirmation
+    puts "\n"
+    puts "Confirming: Using vSphere"
+  end
+end
+
+Cyoi::Cli::Provider.register_provider_cli("vsphere", Cyoi::Cli::Providers::ProviderCliVsphere)

data/lib/cyoi/providers.rb

@@ -21,6 +21,12 @@ module Cyoi::Providers
         require "cyoi/providers/clients/openstack_provider_client"
         Cyoi::Providers::Clients::OpenStackProviderClient.new(attributes)
       end
+    when :vsphere
+      @vsphere_provider_client ||= begin
+        puts "vsphere!"
+        require "cyoi/providers/clients/vsphere_provider_client"
+        Cyoi::Providers::Clients::VsphereProviderClient.new(attributes)
+      end
     else
       nil
     end

data/lib/cyoi/providers/clients/vsphere_provider_client.rb

@@ -0,0 +1,15 @@
+module Cyoi; module Providers; module Clients; end; end; end
+
+require "cyoi/providers/clients/fog_provider_client"
+
+class Cyoi::Providers::Clients::VsphereProviderClient < Cyoi::Providers::Clients::FogProviderClient
+
+  # Construct a Fog::Compute object
+  # Uses +attributes+ which normally originates from +settings.provider+
+  def setup_fog_connection
+    configuration = Fog.symbolize_credentials(attributes.credentials)
+    configuration[:provider] = "vSphere"
+    @fog_compute = Fog::Compute.new(configuration)
+  end
+    
+end

data/lib/cyoi/version.rb

@@ -1,3 +1,3 @@
 module Cyoi
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/spec/integration/cli/provider/provider_aws_spec.rb

@@ -23,6 +23,7 @@ describe "cyoi provider aws" do
     assert_passing_with(<<-OUT)
 1. AWS
 2. OpenStack
+3. vSphere
 Choose your infrastructure: 
 Using provider AWS
 
@@ -63,7 +64,7 @@ Auto-detected infrastructure API credentials at ~/.fog (override with $FOG)
 3. AWS (starkandwayne)
 4. OpenStack (personal)
 5. Alternate credentials
-Choose an auto-detected infrastructure:  
+Choose an auto-detected infrastructure: 
 Using provider AWS
 
 
@@ -81,4 +82,4 @@ Confirming: Using AWS/ap-southeast-2
 
     settings.provider.region.should == "ap-southeast-2"
   end
-end
+end

data/spec/integration/cli/provider/provider_openstack_spec.rb

@@ -27,6 +27,7 @@ describe "cyoi provider openstack" do
     assert_passing_with(<<-OUT)
 1. AWS
 2. OpenStack
+3. vSphere
 Choose your infrastructure: 
 Using provider OpenStack
 Username: Password: Tenant: Authorization Token URL: OpenStack Region (optional): 
@@ -38,7 +39,7 @@ Confirming: Using OpenStack (user: USERNAME)
       "provider" => {
         "name" => "openstack",
         "credentials"=>{
-          "openstack_username"=>"USERNAME", "openstack_api_key"=>"PASSWORD", 
+          "openstack_username"=>"USERNAME", "openstack_api_key"=>"PASSWORD",
           "openstack_tenant"=>"TENANT", "openstack_auth_url"=>"TOKENURL/tokens",
           "openstack_region"=>""
         },
@@ -58,6 +59,7 @@ Confirming: Using OpenStack (user: USERNAME)
     assert_passing_with(<<-OUT)
 1. AWS
 2. OpenStack
+3. vSphere
 Choose your infrastructure: 
 Using provider OpenStack
 Username: Password: Tenant: Authorization Token URL: OpenStack Region (optional): 
@@ -79,10 +81,10 @@ Auto-detected infrastructure API credentials at ~/.fog (override with $FOG)
 3. AWS (starkandwayne)
 4. OpenStack (personal)
 5. Alternate credentials
-Choose an auto-detected infrastructure:  
+Choose an auto-detected infrastructure: 
 Using provider OpenStack
 OpenStack Region (optional): 
 Confirming: Using OpenStack (user: USERNAME)
     OUT
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyoi
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -142,19 +142,23 @@ files:
 - lib/cyoi/cli/provider.rb
 - lib/cyoi/cli/provider_addresses/address_cli_aws.rb
 - lib/cyoi/cli/provider_addresses/address_cli_openstack.rb
+- lib/cyoi/cli/provider_addresses/address_cli_vsphere.rb
 - lib/cyoi/cli/provider_image/image_cli_aws.rb
 - lib/cyoi/cli/provider_image/image_cli_base.rb
 - lib/cyoi/cli/provider_image/image_cli_openstack.rb
 - lib/cyoi/cli/provider_key_pair/key_pair_aws.rb
 - lib/cyoi/cli/provider_key_pair/key_pair_openstack.rb
+- lib/cyoi/cli/provider_key_pair/key_pair_vsphere.rb
 - lib/cyoi/cli/providers/provider_cli.rb
 - lib/cyoi/cli/providers/provider_cli_aws.rb
 - lib/cyoi/cli/providers/provider_cli_openstack.rb
+- lib/cyoi/cli/providers/provider_cli_vsphere.rb
 - lib/cyoi/providers.rb
 - lib/cyoi/providers/README.md
 - lib/cyoi/providers/clients/aws_provider_client.rb
 - lib/cyoi/providers/clients/fog_provider_client.rb
 - lib/cyoi/providers/clients/openstack_provider_client.rb
+- lib/cyoi/providers/clients/vsphere_provider_client.rb
 - lib/cyoi/providers/constants/aws_constants.rb
 - lib/cyoi/providers/constants/openstack_constants.rb
 - lib/cyoi/version.rb