vagrant-rackspace 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzA0YzJmYjA0ZTg4OTU4YmJjOWU3ZjMwNTU1YzNkYWM4NDA2OTI3MA==
+    ODA5MmJhZGMzMzRlYmE2NTJmMGVmMWRkNTM2Y2ZjNzA4MWRmNzZkNg==
   data.tar.gz: !binary |-
-    YjE5MDEyNGQ3NmZiZjg2NTVjYWVhOGI3MGE4YTkzODFjMjJjODE0MA==
+    OWFkY2M1MTVlYTRhY2QyMDJkNzMyZmM1NGE3ODNjNjdjMTc4ZWYyNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmJiZTg2MDJkNTBlNjRjMDc2NjE3ZjZiOTg0N2MwZTUwN2VhYWZjYzY0M2Fl
-    ODQxNzRkNjNjOWZkOTNhOTVlNzM1NmJmNzFlOTUzZTAxNzhhZTMwMTQ4YjE2
-    OTc0YWViN2EyODc1NjcyMDBjOTIyOWM5ZDMzNTNlZWFkYjliMDI=
+    YzE1YjAwOGYwNTc1MjQxNzY0NmU5MjM1MmQzMTZjNGQ4ZTUwYjhmOGRmMzU1
+    NDM3OTU0NzVjZWQ0M2EzMWRjMzExZmEyYWFhZjNiMWQ3MmRiNTE5ZmMwNmZm
+    ZjRmOGJhNjJkOTc0YTMxYjI2MjZiNWYzNGE5N2I4M2QwNmIwMDE=
   data.tar.gz: !binary |-
-    Y2FiMjc4OGQ1YTA3YzY3NTQ4M2Y4ZTc3N2YyOTA4ODFmYTRjY2ZlMDkxN2M4
-    OGNiZmY1ZTQ2ODZjYjYxODQzNmQyMWQzMmNkMjg2YmI1MDQwMDNhMmI0Yzhl
-    NjMwZTM4ODRmYmYwMmQ5MTk2ZmY4OTRjMTVkNzFmYzQ4MjJmNjg=
+    YTllOWVkZTNiMGQ4ZWJkMTFiM2YzNzZkMmZkNjdlZjRlNzliZjhmNTlhYjVl
+    N2M2YmIzYmJhNThmYzFmY2ZmZDVmMTI3ODc3MjY5MTNjYWMyODZkNjRiOGIx
+    YWVjYjE0NDM2N2M5Mzk2YTZmMTcwZGI0NDg3YTNlN2Y4MTM0OTQ=

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+

data/CHANGELOG.md

@@ -1,5 +1,13 @@
-# 0.1.3 (September 6, 2013)
+# 0.1.4 (October 15, 2013)
+
+IMPROVEMENTS:
 
+  - Adds endpoint validation (rackspace_compute_url, rackspace_auth_url) [GH-39]
+  
+FEATURES:
+  - Adds ability to configure networks [GH-37]
+
+# 0.1.3 (September 6, 2013)
 
 IMPROVEMENTS:
 

data/Gemfile

@@ -7,4 +7,5 @@ group :development do
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
   gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+  gem 'coveralls', require: false
 end

data/README.md

@@ -125,6 +125,18 @@ supported with `vagrant-rackspace`, currently. If any of these are
 specified, Vagrant will emit a warning, but will otherwise boot
 the Rackspace server.
 
+However, you may attach a VM to an isolated [Cloud Network](http://www.rackspace.com/knowledge_center/article/getting-started-with-cloud-networks) (or Networks) using the `network` configuration option. Here's an example which adds two Cloud Networks and disables ServiceNet with the `:attach => false` option:
+
+```ruby
+config.vm.provider :rackspace do |rs|
+  rs.username = "mitchellh"
+  rs.api_key  = "foobarbaz"
+  rs.network '443aff42-be57-effb-ad30-c097c1e4503f'
+  rs.network '5e738e11-def2-4a75-ad1e-05bbe3b49efe'
+  rs.network :service_net, :attached => false
+end
+```
+
 ## Synced Folders
 
 There is minimal support for synced folders. Upon `vagrant up`,

data/lib/vagrant-rackspace/action/create_server.rb

@@ -45,6 +45,7 @@ module VagrantPlugins
           env[:ui].info(" -- Flavor: #{flavor.name}")
           env[:ui].info(" -- Image: #{image.name}")
           env[:ui].info(" -- Disk Config: #{config.disk_config}") if config.disk_config
+          env[:ui].info(" -- Networks: #{config.networks}") if config.networks
           env[:ui].info(" -- Name: #{server_name}")
 
           # Build the options for launching...
@@ -60,6 +61,7 @@ module VagrantPlugins
             ]
           }
           options[:disk_config] = config.disk_config if config.disk_config
+          options[:networks] = config.networks if config.networks
 
           # Create the server
           server = env[:rackspace_compute].servers.create(options)

data/lib/vagrant-rackspace/config.rb

@@ -81,6 +81,15 @@ module VagrantPlugins
        # This defaults to MANUAL
       attr_accessor :disk_config
 
+      # Cloud Networks to attach to the server
+      #
+      # @return [Array]
+      attr_accessor :networks
+
+      # Default Rackspace Cloud Network IDs
+      SERVICE_NET_ID = '11111111-1111-1111-1111-111111111111'
+      PUBLIC_NET_ID = '00000000-0000-0000-0000-000000000000'
+
       def initialize
         @api_key  = UNSET_VALUE
         @rackspace_region = UNSET_VALUE
@@ -93,6 +102,7 @@ module VagrantPlugins
         @server_name = UNSET_VALUE
         @username = UNSET_VALUE
         @disk_config = UNSET_VALUE
+        @networks = []
       end
 
       def finalize!
@@ -106,6 +116,7 @@ module VagrantPlugins
         @server_name = nil if @server_name == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
         @disk_config = nil if @disk_config == UNSET_VALUE
+        @networks = nil if @networks.empty?
 
         if @public_key_path == UNSET_VALUE
           @public_key_path = Vagrant.source_root.join("keys/vagrant.pub")
@@ -122,12 +133,39 @@ module VagrantPlugins
         end
       end
 
+      def network(net_id, options={})
+        # Eventually, this should accept options for network configuration,
+        # primarily the IP address, but at the time of writing these
+        # options are unsupported by Cloud Networks.
+        options = {:attached => true}.merge(options)
+
+        # Add the default Public and ServiceNet networks
+        if @networks.empty?
+          @networks = [PUBLIC_NET_ID, SERVICE_NET_ID]
+        end
+
+        net_id = SERVICE_NET_ID if net_id == :service_net
+
+        if options[:attached]
+          @networks << net_id unless @networks.include? net_id
+        else
+          @networks.delete net_id
+        end
+      end
+
       def validate(machine)
         errors = []
 
         errors << I18n.t("vagrant_rackspace.config.api_key_required") if !@api_key
         errors << I18n.t("vagrant_rackspace.config.username_required") if !@username
 
+        {
+          :rackspace_compute_url => @rackspace_compute_url,
+          :rackspace_auth_url => @rackspace_auth_url
+        }.each_pair do |key, value|
+          errors << I18n.t("vagrant_rackspace.config.invalid_uri", :key => key, :uri => value) unless value.nil? || valid_uri?(value)
+        end
+
         public_key_path = File.expand_path(@public_key_path, machine.env.root_path)
         if !File.file?(public_key_path)
           errors << I18n.t("vagrant_rackspace.config.public_key_not_found")
@@ -141,6 +179,13 @@ module VagrantPlugins
       def lon_region?
         rackspace_region && rackspace_region != UNSET_VALUE && rackspace_region.to_sym == :lon
       end
+
+      private
+
+      def valid_uri? value
+        uri = URI.parse value
+        uri.kind_of?(URI::HTTP)
+      end
     end
   end
 end

data/lib/vagrant-rackspace/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Rackspace
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/locales/en.yml

@@ -41,6 +41,8 @@ en:
         you specified a valid path.
       username_required: |-
         A username is required.
+      invalid_uri: |-
+        The value for %{key} is not a valid URI: %{uri}
 
     errors:
       create_bad_state: |-

data/spec/vagrant-rackspace/config_spec.rb

@@ -1,3 +1,13 @@
+if ENV['COVERAGE'] != 'false'
+  require 'simplecov'
+  require 'coveralls'
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+  SimpleCov.start
+end
+
 require "vagrant-rackspace/config"
 require 'fog'
 
@@ -22,6 +32,7 @@ describe VagrantPlugins::Rackspace::Config do
     its(:server_name) { should be_nil }
     its(:username) { should be_nil }
     its(:disk_config) { should be_nil }
+    its(:networks) { should be_nil }
   end
 
   describe "overriding defaults" do
@@ -42,10 +53,27 @@ describe VagrantPlugins::Rackspace::Config do
         subject.send(attribute).should == "foo"
       end
     end
+
+    it "should not default networks if overridden" do
+      net_id = "deadbeef-0000-0000-0000-000000000000"
+      subject.send(:network, net_id)
+      subject.finalize!
+      subject.send(:networks).should include(net_id)
+      subject.send(:networks).should include(VagrantPlugins::Rackspace::Config::PUBLIC_NET_ID)
+      subject.send(:networks).should include(VagrantPlugins::Rackspace::Config::SERVICE_NET_ID)
+    end
   end
 
   describe "validation" do
     let(:machine) { double("machine") }
+    let(:validation_errors) { subject.validate(machine)['RackSpace Provider'] }
+    let(:error_message) { double("error message") }
+
+    before(:each) do
+      machine.stub_chain(:env, :root_path).and_return '/'
+      subject.username = 'foo'
+      subject.api_key = 'bar'
+    end
 
     subject do
       super().tap do |o|
@@ -54,21 +82,52 @@ describe VagrantPlugins::Rackspace::Config do
     end
 
     context "with good values" do
-      it "should validate"
+      it "should validate" do
+        validation_errors.should be_empty
+      end
     end
 
     context "the API key" do
-      it "should error if not given"
+      it "should error if not given" do
+        subject.api_key = nil
+        I18n.should_receive(:t).with('vagrant_rackspace.config.api_key_required').and_return error_message
+        validation_errors.first.should == error_message
+      end
     end
 
     context "the public key path" do
-      it "should have errors if the key doesn't exist"
-      it "should not have errors if the key exists with an absolute path"
-      it "should not have errors if the key exists with a relative path"
+      it "should have errors if the key doesn't exist" do
+        subject.public_key_path = 'missing'
+        I18n.should_receive(:t).with('vagrant_rackspace.config.public_key_not_found').and_return error_message
+        validation_errors.first.should == error_message
+      end
+      it "should not have errors if the key exists with an absolute path" do
+        subject.public_key_path = File.expand_path 'locales/en.yml', Dir.pwd
+        validation_errors.should be_empty
+      end
+      it "should not have errors if the key exists with a relative path" do
+        machine.stub_chain(:env, :root_path).and_return '.'
+        subject.public_key_path = 'locales/en.yml'
+        validation_errors.should be_empty
+      end
     end
 
     context "the username" do
-      it "should error if not given"
+      it "should error if not given" do
+        subject.username = nil
+        I18n.should_receive(:t).with('vagrant_rackspace.config.username_required').and_return error_message
+        validation_errors.first.should == error_message
+      end
+    end
+
+    [:rackspace_compute_url, :rackspace_auth_url].each do |url|
+      context "the #{url}" do
+        it "should not validate if the URL is invalid" do
+          subject.send "#{url}=", 'baz'
+          I18n.should_receive(:t).with('vagrant_rackspace.config.invalid_uri', {:key => url, :uri => 'baz'}).and_return error_message
+          validation_errors.first.should == error_message
+        end
+      end
     end
   end
 
@@ -120,4 +179,18 @@ describe VagrantPlugins::Rackspace::Config do
       subject.send(:lon_region?).should be_true
     end
   end
+
+  describe "network" do
+    it "should remove SERVICE_NET_ID if :service_net is detached" do
+      subject.send(:network, :service_net, :attached => false)
+      subject.send(:networks).should_not include(VagrantPlugins::Rackspace::Config::SERVICE_NET_ID)
+    end
+
+    it "should not allow duplicate networks" do
+      net_id = "deadbeef-0000-0000-0000-000000000000"
+      subject.send(:network, net_id)
+      subject.send(:network, net_id)
+      subject.send(:networks).count(net_id).should == 1
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Mitchell Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt