bosh_openstack_cpi 0.0.7 → 1.5.0.pre.1113

metadata

@@ -1,96 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 1.5.0.pre.1113
+  prerelease: 6
 platform: ruby
 authors:
-- Piston Cloud Computing
+- Piston Cloud Computing / VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 1.5.0.pre.1113
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 1.5.0.pre.1113
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 1.5.0.pre.1113
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 1.5.0.pre.1113
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.5.0.pre.1113
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.5.0.pre.1113
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -107,8 +107,10 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.2
-description: BOSH OpenStack CPI
-email: info@pistoncloud.com
+description: ! 'BOSH OpenStack CPI
+
+  cfd471'
+email: support@cloudfoundry.com
 executables:
 - bosh_openstack_console
 extensions: []
@@ -120,35 +122,17 @@ files:
 - lib/cloud/openstack/cloud.rb
 - lib/cloud/openstack/dynamic_network.rb
 - lib/cloud/openstack/helpers.rb
+- lib/cloud/openstack/manual_network.rb
 - lib/cloud/openstack/network.rb
 - lib/cloud/openstack/network_configurator.rb
-- lib/cloud/openstack/registry_client.rb
+- lib/cloud/openstack/tag_manager.rb
 - lib/cloud/openstack/version.rb
 - lib/cloud/openstack/vip_network.rb
 - README.md
 - USAGE.md
-- bosh_cpi.md
-- Rakefile
-- spec/assets/sample_config.yml
-- spec/integration/cpi_test.rb
-- spec/spec_helper.rb
-- spec/unit/attach_disk_spec.rb
-- spec/unit/cloud_spec.rb
-- spec/unit/configure_networks_spec.rb
-- spec/unit/create_disk_spec.rb
-- spec/unit/create_stemcell_spec.rb
-- spec/unit/create_vm_spec.rb
-- spec/unit/delete_disk_spec.rb
-- spec/unit/delete_stemcell_spec.rb
-- spec/unit/delete_vm_spec.rb
-- spec/unit/detach_disk_spec.rb
-- spec/unit/helpers_spec.rb
-- spec/unit/network_configurator_spec.rb
-- spec/unit/reboot_vm_spec.rb
-- spec/unit/set_vm_metadata_spec.rb
-- spec/unit/validate_deployment_spec.rb
-homepage: http://www.pistoncloud.com
-licenses: []
+homepage: https://github.com/cloudfoundry/bosh
+licenses:
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -158,36 +142,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: BOSH OpenStack CPI
-test_files:
-- spec/assets/sample_config.yml
-- spec/integration/cpi_test.rb
-- spec/spec_helper.rb
-- spec/unit/attach_disk_spec.rb
-- spec/unit/cloud_spec.rb
-- spec/unit/configure_networks_spec.rb
-- spec/unit/create_disk_spec.rb
-- spec/unit/create_stemcell_spec.rb
-- spec/unit/create_vm_spec.rb
-- spec/unit/delete_disk_spec.rb
-- spec/unit/delete_stemcell_spec.rb
-- spec/unit/delete_vm_spec.rb
-- spec/unit/detach_disk_spec.rb
-- spec/unit/helpers_spec.rb
-- spec/unit/network_configurator_spec.rb
-- spec/unit/reboot_vm_spec.rb
-- spec/unit/set_vm_metadata_spec.rb
-- spec/unit/validate_deployment_spec.rb
-has_rdoc: 
+test_files: []

data/Rakefile

@@ -1,62 +0,0 @@
-# Copyright (c) 2012 Piston Cloud Computing, Inc.
-
-$:.unshift(File.expand_path("../../rake", __FILE__))
-
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __FILE__)
-
-require "rubygems"
-require "bundler"
-Bundler.setup(:default, :test)
-
-require "rake"
-begin
-  require "rspec/core/rake_task"
-rescue LoadError
-end
-
-begin
-  require "bundler_task"
-rescue LoadError
-end
-
-begin
-  require "ci_task"
-rescue LoadError
-end
-
-gem_helper = Bundler::GemHelper.new(Dir.pwd)
-
-desc "Build CPI gem into the pkg directory"
-task "build" do
-  gem_helper.build_gem
-end
-
-if defined?(BundlerTask)
-  BundlerTask.new
-
-  desc "Build and install CPI into system gems"
-  task "install" do
-    Rake::Task["bundler:install"].invoke
-    gem_helper.install_gem
-  end
-end
-
-if defined?(RSpec)
-  namespace :spec do
-    desc "Run Unit Tests"
-    rspec_task = RSpec::Core::RakeTask.new(:unit) do |t|
-      t.pattern = "spec/unit/**/*_spec.rb"
-      t.rspec_opts = %w(--format progress --colour)
-    end
-
-    if defined?(CiTask)
-      CiTask.new do |task|
-        task.rspec_task = rspec_task
-      end
-    end
-  end
-
-  desc "Run tests"
-  task :spec => %w(spec:unit)
-  task :default => :spec
-end

data/bosh_cpi.md

@@ -1,82 +0,0 @@
-#OpenStack CPI Implementation #
-OpenStack CPI is an implementation of BOSH CPI. It allows BOSH to interface with various services in OpenStack like glance, controller and registry. In the sections below we outline the implementation details for each of the method in CPI interface.
-
-##Initialize ##
-
-Implementation of `def initialize(options)` method. 
-
-1. Validate the `options` passed to this method
-2. In the second step the parameters are extracted from `options` object to populate the following properties 
-	+ `@agent_properties`	
-	+ `@openstack_properties`
-	+ `@registry_propertiess`
-3. Populate the `openstack_params` and connect to remove Nova Service
-	1. Instantiate `Fog::Compute` instance
-	2. `Fog::Compute::OpenStack` instance is created
-	3. A New `Fog::Connection` object connects with the remove Nova Compute Service
-4. Populate the `glance_params`and connect to remove Glance service
-       1.  Instantiate `Fog::Image` instance
-       2.  `Fog::Image::OpenStack` instance is created
-       3.  A New `Fog::Connection` object connects with the remove Glance Service
-5. Instantiate `Registry_Client`.
-
-Figure below shows the flow of control.
-
-![openstack_cpi_initialize](https://raw.github.com/piston/openstack-bosh-cpi/master/images/openstack_cpi_initialize.png)
-
-##Create Stemcell ##
-
-Implementation of method `create_stemcell(image_path, cloud_properties)`
-Steps outlined below are the flow control implemented to extract and upload kernel image, ramdisk and stem cell image.
-
-1. Extract parameters from the `cloud_properties`. Check if `kernel_file` parameter exists, instantiate `kernel_image` object
-2. Construct `kernel_params`
-3. Upload `kernel_image` to glance service by calling the method `upload_image(kernel_params)`
-4. If params contain `ramdisk_file` 
-5. Instantiate ramdisk_image object and populate `ramdisk_parama`
-6. Upload the `ramdisk_image` to glance service by calling `upload(ramdisk_params)`
-7. Populate `image_params` for the stem cell to be uploaded to glance service
-8. Call the method `upload_image(image_params)` 
-
-Figure below shows the flow control for the method `create_stemcell(image_path, cloud_properties)`
-
-![openstack_cpi_createstemcell](https://raw.github.com/piston/openstack-bosh-cpi/master/images/openstack_cpi_createstemcell.png)
-
-##Delete Stemcell
-
-![openstack_cpi_deletestemcell](https://raw.github.com/piston/openstack-bosh-cpi/master/images/openstack_cpi_deletestemcell.png)
-
-##Create VM ##
-
-![openstack_cpi_create_vm](https://raw.github.com/piston/openstack-bosh-cpi/master/images/openstack_cpi_create_vm.png)
-
-##Delete VM ##
-
-Implementation of `delete_vm(server_id)`. This method deletes the VM created in Nova Compute.
-
-1. Get the `server_id` of the VM to be deleted
-	* 1.1, 1.2 : Send the request `get_server_details` to Compute API Server through  `Fog::Connection`
-2.  If `server` object returned is not null call `server.destroy`. This will send `delete_server` request to Nova Compute.
-	* 2.1, 2.2 : Create and send the `delete_server` request through `Fog::Connection` 
-3.  Delete the settings from Registry by calling `delete_settings` method.
-
-Figure below shows the flow control for `delete_vm` method
-
-![openstack_cpi_delete_vm](https://raw.github.com/piston/openstack-bosh-cpi/master/images/openstack_cpi_delete_vm.png)
-
-##Create Disk ##
-
-1. Check if size passed is integer, is greater than 1024 and less than 1024*1000, else throw an error
-2. Create `volume_params`
-3. Call `create()volume_params)` on `Fog::Compute` service
-     1. `create_volume` request on `Fog::Volume::OpenStack` 
-     2. Opens a `Fog::Connection` request to access the remote service and create a volume.
-
-Figure below shows the flow control of `create_disk` method
-
-![openstack_cpi_create_disk](https://raw.github.com/piston/openstack-bosh-cpi/master/images/openstack_cpi_create_disk.png)
-
-##Delete Disk##
-
-This method deletes the volume created in OpenStack Nova Volume 
-![openstack_cpi_delete_disk](https://raw.github.com/piston/openstack-bosh-cpi/master/images/openstack_cpi_delete_disk.png)

data/lib/cloud/openstack/registry_client.rb

@@ -1,127 +0,0 @@
-# Copyright (c) 2012 Piston Cloud Computing, Inc.
-
-module Bosh::OpenStackCloud
-  ##
-  # Represents OpenStack Registry Client. It performs CRUD operations against
-  # the OpenStack Registry.
-  #
-  # Settings example:
-  # settings = {
-  #   "vm" => {
-  #     "name" => server_name
-  #   },
-  #   "agent_id" => agent_id,
-  #   "networks" => network_spec,
-  #   "disks" => {
-  #     "system" => "/dev/vda",
-  #     "ephemeral" => "/dev/vdb",
-  #     "persistent" => {"volume_id" => device_name}
-  #   }
-  # }
-  class RegistryClient
-    include Helpers
-
-    attr_reader :endpoint
-    attr_reader :user
-    attr_reader :password
-
-    ##
-    # Creates a new Registry client
-    #
-    # @param [String] endpoint Registry endpoint URL
-    # @param [String] user Registry user
-    # @param [String] password Registry password
-    def initialize(endpoint, user, password)
-      @endpoint = endpoint
-
-      unless @endpoint =~ /^http:\/\//
-        @endpoint = "http://#{@endpoint}"
-      end
-
-      @user = user
-      @password = password
-      auth = Base64.encode64("#{@user}:#{@password}").gsub("\n", "")
-
-      @headers = {
-        "Accept" => "application/json",
-        "Authorization" => "Basic #{auth}"
-      }
-
-      @client = HTTPClient.new
-    end
-
-    ##
-    # Update server settings in the registry
-    #
-    # @param [String] server_id OpenStack server id
-    # @param [Hash] settings New agent settings
-    # @return [Boolean]
-    def update_settings(server_id, settings)
-      unless settings.is_a?(Hash)
-        raise ArgumentError, "Invalid settings format, " \
-                             "Hash expected, #{settings.class} given"
-      end
-
-      payload = Yajl::Encoder.encode(settings)
-      url = "#{@endpoint}/servers/#{server_id}/settings"
-
-      response = @client.put(url, {:body => payload, :header => @headers})
-      if response.status != 200
-        cloud_error("Cannot update settings for `#{server_id}', " \
-                    "got HTTP #{response.status}")
-      end
-
-      true
-    end
-
-    ##
-    # Read server settings from the registry
-    #
-    # @param [String] server_id OpenStack server id
-    # @return [Hash] Agent settings
-    def read_settings(server_id)
-      url = "#{@endpoint}/servers/#{server_id}/settings"
-
-      response = @client.get(url, {:header => @headers})
-      if response.status != 200
-        cloud_error("Cannot read settings for `#{server_id}', " \
-                    "got HTTP #{response.status}")
-      end
-
-      body = Yajl::Parser.parse(response.body)
-      unless body.is_a?(Hash)
-        cloud_error("Invalid registry response, Hash expected, " \
-                    "got #{body.class}: #{body}")
-      end
-
-      settings = Yajl::Parser.parse(body["settings"])
-      unless settings.is_a?(Hash)
-        cloud_error("Invalid settings format, " \
-                    "Hash expected, got #{settings.class}: " \
-                    "#{settings}")
-      end
-
-      settings
-    rescue Yajl::ParseError
-      cloud_error("Cannot parse settings for `#{server_id}'")
-    end
-
-    ##
-    # Delete server settings from the registry
-    #
-    # @param [String] server_id OpenStack server id
-    # @return [Boolean]
-    def delete_settings(server_id)
-      url = "#{@endpoint}/servers/#{server_id}/settings"
-
-      response = @client.delete(url, {:header => @headers})
-      if response.status != 200
-        cloud_error("Cannot delete settings for `#{server_id}', " \
-                    "got HTTP #{response.status}")
-      end
-
-      true
-    end
-
-  end
-end