cyoi 0.4.2 → 0.5.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDFmMTk5ZDdlZDU4NWRiNDk0YmMyODRhZTI2ODhkMmViOWNjMWI5MA==
+  data.tar.gz: !binary |-
+    MjA0ODI5M2QxOWQ3ZjI0MjI0ZmQzMzljYjA3NTUxYmU4MDcyYzM3YQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZWRmZTE2NGRhN2VjNzJhOWJhYWU1NDQ5YWVjNmIzMDE0MDIzNDg5Y2M1ODQw
+    NzMzYzg2Y2Q1ZWI0ZTE3NmZjNDFmNTE5ZjExMDZlOWQzZjU1YjhmZDljYWE0
+    YWY4MWIxOWQ4ZTUyZTU0MzBmZTZiMmNkYTJiOGI4NDNjNjM0YzE=
+  data.tar.gz: !binary |-
+    MjY2YjFjOTM1MDE2YzEwNDgwNTIwMDE3MmJjZTkzNDVjNzhmMWI5MDQ4MDVl
+    ODRlYWYzNzQwMjJjNjRkOGU2NTAxZDZhZTEyM2U4Mzk4NTYxYjFmZGI3MThh
+    MmE1YWI4OWE0NzkxNTJlYzM4MDQ2MTNlMWE1ODk2NzljYTM3NWM=

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.5
+
+* OpenStack implementation completed by Ferdy!
+
 ## v0.4
 
 * switch to using readwritesettings instead of fork of settingslogic

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

@@ -0,0 +1,44 @@
+module Cyoi::Cli::Addresses; end
+class Cyoi::Cli::Addresses::AddressCliOpenstack
+  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 "Acquiring a public IP address... "
+    attributes["ip"] = provider_client.provision_public_ip_address
+    puts attributes.ip
+  end
+end
+
+Cyoi::Cli::Address.register_address_cli("openstack", Cyoi::Cli::Addresses::AddressCliOpenstack)

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

@@ -0,0 +1,58 @@
+class Cyoi::Cli::KeyPair; end
+class Cyoi::Cli::KeyPair::KeyPairCliOpenstack
+  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
+    print "Acquiring a key pair #{key_pair_name}... "
+    if key_pair = provider_client.create_key_pair(key_pair_name)
+      attributes["fingerprint"] = key_pair.fingerprint
+      attributes["private_key"] = key_pair.private_key
+      puts "done"
+    end
+  end
+end
+
+Cyoi::Cli::KeyPair.register_key_pair_cli("openstack", Cyoi::Cli::KeyPair::KeyPairCliOpenstack)

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

@@ -4,7 +4,6 @@ class Cyoi::Cli::Providers::ProviderCliOpenStack < Cyoi::Cli::Providers::Provide
     unless valid_infrastructure?
       puts "\nUsing provider OpenStack\n"
       setup_credentials
-      choose_region
     end
     export_attributes
   end
@@ -17,11 +16,8 @@ class Cyoi::Cli::Providers::ProviderCliOpenStack < Cyoi::Cli::Providers::Provide
     credentials["openstack_api_key"] = hl.ask("Password: ").to_s unless credentials.exists?("openstack_api_key")
     credentials["openstack_tenant"] = hl.ask("Tenant: ").to_s unless credentials.exists?("openstack_tenant")
     credentials["openstack_auth_url"] = hl.ask("Authorization Token URL: ").to_s unless credentials.exists?("openstack_auth_url")
-  end
-
-  def choose_region
-    puts "\n"
-    attributes["region"] = hl.ask("OpenStack Region (optional): ").to_s
+    credentials["openstack_auth_url"] = credentials["openstack_auth_url"] + "/tokens" unless credentials["openstack_auth_url"].match(/\/tokens$/)
+    credentials["openstack_region"] = hl.ask("OpenStack Region (optional): ").to_s unless credentials.exists?("openstack_region")
   end
 
   def valid_infrastructure?
@@ -34,11 +30,7 @@ class Cyoi::Cli::Providers::ProviderCliOpenStack < Cyoi::Cli::Providers::Provide
 
   def display_confirmation
     puts "\n"
-    if attributes.region.size > 0
-      puts "Confirming: Using OpenStack/#{attributes.region}"
-    else
-      puts "Confirming: Using OpenStack"
-    end
+    puts "Confirming: Using OpenStack"
   end
 end
 

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

@@ -9,7 +9,8 @@ class Cyoi::Providers::Clients::OpenStackProviderClient < Cyoi::Providers::Clien
   # @return [String] provisions a new public IP address in target region
   # TODO nil if none available
   def provision_public_ip_address(options={})
-    address = fog_compute.addresses.create
+    pool = fog_compute.addresses.get_address_pools.first
+    address = fog_compute.addresses.create(:pool => pool["name"])
     address.ip
     # TODO catch error and return nil
   end
@@ -24,6 +25,16 @@ class Cyoi::Providers::Clients::OpenStackProviderClient < Cyoi::Providers::Clien
     sg.rules
   end
 
+  # Hook method for FogProviderClient#create_security_group
+  def port_open?(ip_permissions, port_range, protocol, ip_range)
+    ip_permissions && ip_permissions.find do |ip|
+      ip["ip_protocol"] == protocol \
+      && ip["ip_range"].select { |range| range["cidr"] == ip_range } \
+      && ip["from_port"] <= port_range.min \
+      && ip["to_port"] >= port_range.max
+    end
+  end
+
   # Hook method for FogProviderClient#create_security_group
   def authorize_port_range(sg, port_range, protocol, ip_range)
     sg.create_security_group_rule(port_range.min, port_range.max, protocol, ip_range)
@@ -53,8 +64,8 @@ class Cyoi::Providers::Clients::OpenStackProviderClient < Cyoi::Providers::Clien
   def setup_fog_connection
     configuration = Fog.symbolize_credentials(attributes.credentials)
     configuration[:provider] = "OpenStack"
-    unless attributes.region == openstack_constants.no_region_code
-      configuration[:openstack_region] = attributes.region
+    if attributes.credentials.openstack_region && attributes.credentials.openstack_region.empty?
+      configuration.delete(:openstack_region)
     end
     @fog_compute = Fog::Compute.new(configuration)
   end

data/lib/cyoi/providers/constants/openstack_constants.rb

@@ -5,8 +5,4 @@ module Cyoi; module Providers; module Constants; end; end; end
 module Cyoi::Providers::Constants::OpenStackConstants
   extend self
 
-  # explicit value representing "no region requested"
-  def no_region_code
-    "no-region-requested"
-  end
 end

data/lib/cyoi/version.rb

@@ -1,3 +1,3 @@
 module Cyoi
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/spec/integration/cli/address/address_openstack_spec.rb

@@ -0,0 +1,42 @@
+describe "cyoi address openstack" do
+  include Cyoi::Cli::Helpers::Settings
+  include SettingsHelper
+  include Aruba::Api
+  before { @settings_dir = File.expand_path("~/.cyoi_client_lib") }
+
+  it "fails nicely if provider.name missing" do
+    run_interactive(unescape("cyoi address #{settings_dir}"))
+    assert_failing_with("Please run 'cyoi provider' first")
+  end
+
+  describe "provider setup and" do
+    before do
+      setting "provider.name", "openstack"
+      setting "provider.credentials.openstack_username", "USERNAME"
+      setting "provider.credentials.openstack_api_key", "PASSWORD"
+      setting "provider.credentials.openstack_tenant", "TENANT"
+      setting "provider.credentials.openstack_auth_url", "TOKENURL"
+      setting "provider.credentials.openstack_region", "REGION"
+    end
+
+    it "address aleady assigned" do
+      pending("Fog::Compute::OpenStack.list_address_pools does not provide a mock test")
+      setting "provider.name", "openstack"
+      setting "provider.credentials.openstack_username", "USERNAME"
+      setting "provider.credentials.openstack_api_key", "PASSWORD"
+      setting "provider.credentials.openstack_tenant", "TENANT"
+      setting "provider.credentials.openstack_auth_url", "TOKENURL"
+      setting "provider.credentials.openstack_region", "REGION"
+      setting "address.ip", "1.2.3.4"
+      run_interactive(unescape("cyoi address #{settings_dir}"))
+      assert_passing_with("Confirming: Using address 1.2.3.4")
+    end
+
+    it "address is provisioned from OpenStack" do
+      pending("Fog::Compute::OpenStack.list_address_pools does not provide a mock test")
+      run_interactive(unescape("cyoi address #{settings_dir}"))
+      assert_passing_with("Confirming: Using address")
+    end
+  end
+
+end

data/spec/integration/cli/key_pair/key_pair_openstack_spec.rb

@@ -0,0 +1,33 @@
+describe "cyoi key_pair openstack" do
+  include Cyoi::Cli::Helpers::Settings
+  include SettingsHelper
+  include Aruba::Api
+  before { @settings_dir = File.expand_path("~/.cyoi_client_lib") }
+
+  it "fails nicely if provider.name missing" do
+    run_interactive(unescape("cyoi key_pair testname #{settings_dir}"))
+    assert_failing_with("Please run 'cyoi provider' first")
+  end
+
+  describe "name & provider setup and" do
+    before do
+      setting "provider.name", "openstack"
+      setting "provider.credentials.openstack_username", "USERNAME"
+      setting "provider.credentials.openstack_api_key", "PASSWORD"
+      setting "provider.credentials.openstack_tenant", "TENANT"
+      setting "provider.credentials.openstack_auth_url", "TOKENURL"
+      setting "provider.credentials.openstack_region", "REGION"
+      setting "name", "test-bosh"
+    end
+
+    it "create new key pair (didn't already exist in OpenStack)" do
+      run_interactive(unescape("cyoi key_pair testname #{settings_dir}"))
+      assert_passing_with(<<-OUT)
+Acquiring a key pair testname... done
+
+Confirming: Using key pair testname
+      OUT
+    end
+  end
+
+end

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

@@ -10,9 +10,9 @@ describe "cyoi provider openstack" do
     setting "provider.credentials.openstack_api_key", "PASSWORD"
     setting "provider.credentials.openstack_tenant", "TENANT"
     setting "provider.credentials.openstack_auth_url", "TOKENURL"
-    setting "provider.region", "us-west"
+    setting "provider.credentials.openstack_region", "REGION"
     run_interactive(unescape("cyoi provider #{settings_dir}"))
-    assert_passing_with("Confirming: Using OpenStack/us-west")
+    assert_passing_with("Confirming: Using OpenStack")
   end
 
   it "prompts for everything (no region)" do
@@ -30,8 +30,7 @@ describe "cyoi provider openstack" do
 Choose your infrastructure: 
 Using provider OpenStack
 
-Username: Password: Tenant: Authorization Token URL: 
-OpenStack Region (optional): 
+Username: Password: Tenant: Authorization Token URL: OpenStack Region (optional): 
 Confirming: Using OpenStack
     OUT
 
@@ -41,9 +40,9 @@ Confirming: Using OpenStack
         "name" => "openstack",
         "credentials"=>{
           "openstack_username"=>"USERNAME", "openstack_api_key"=>"PASSWORD", 
-          "openstack_tenant"=>"TENANT", "openstack_auth_url"=>"TOKENURL"
+          "openstack_tenant"=>"TENANT", "openstack_auth_url"=>"TOKENURL/tokens",
+          "openstack_region"=>""
         },
-        "region" => "",
       }
     }
   end
@@ -63,9 +62,8 @@ Confirming: Using OpenStack
 Choose your infrastructure: 
 Using provider OpenStack
 
-Username: Password: Tenant: Authorization Token URL: 
-OpenStack Region (optional): 
-Confirming: Using OpenStack/REGION
+Username: Password: Tenant: Authorization Token URL: OpenStack Region (optional): 
+Confirming: Using OpenStack
     OUT
   end
 
@@ -86,9 +84,8 @@ Auto-detected infrastructure API credentials at ~/.fog (override with $FOG)
 Choose an auto-detected infrastructure:  
 Using provider OpenStack
 
-
 OpenStack Region (optional): 
-Confirming: Using OpenStack/REGION
+Confirming: Using OpenStack
     OUT
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: cyoi
 version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: readwritesettings
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -155,7 +140,9 @@ files:
 - lib/cyoi/cli/key_pair.rb
 - 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_key_pair/key_pair_aws.rb
+- lib/cyoi/cli/provider_key_pair/key_pair_openstack.rb
 - lib/cyoi/cli/providers/provider_cli.rb
 - lib/cyoi/cli/providers/provider_cli_aws.rb
 - lib/cyoi/cli/providers/provider_cli_openstack.rb
@@ -169,7 +156,9 @@ files:
 - lib/cyoi/version.rb
 - spec/.DS_Store
 - spec/integration/cli/address/address_aws_spec.rb
+- spec/integration/cli/address/address_openstack_spec.rb
 - spec/integration/cli/key_pair/key_pair_aws_spec.rb
+- spec/integration/cli/key_pair/key_pair_openstack_spec.rb
 - spec/integration/cli/provider/provider_aws_spec.rb
 - spec/integration/cli/provider/provider_openstack_spec.rb
 - spec/spec_helper.rb
@@ -180,33 +169,26 @@ files:
 homepage: https://github.com/drnic/cyoi
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4128619338422380975
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4128619338422380975
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A library to ask an end-user to choose an infrastructure (AWS, OpenStack,
   etc), region, and login credentials.  This library was extracted from [inception-server](https://github.com/drnic/inception-server)
   for reuse by [bosh-bootstrap](https://github.com/StarkAndWayne/bosh-bootstrap).
@@ -216,7 +198,9 @@ summary: A library to ask an end-user to choose an infrastructure (AWS, OpenStac
 test_files:
 - spec/.DS_Store
 - spec/integration/cli/address/address_aws_spec.rb
+- spec/integration/cli/address/address_openstack_spec.rb
 - spec/integration/cli/key_pair/key_pair_aws_spec.rb
+- spec/integration/cli/key_pair/key_pair_openstack_spec.rb
 - spec/integration/cli/provider/provider_aws_spec.rb
 - spec/integration/cli/provider/provider_openstack_spec.rb
 - spec/spec_helper.rb