vagrant-1cloud 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6b158d2a5ebd6ba2844225d9b1b8a5f01e30a36
-  data.tar.gz: 579da12b738510cdb4ec94000480543108f5c130
+  metadata.gz: f707ed0657b4714d685b8430fc3b29b8d941373e
+  data.tar.gz: e3366df7e2408f5932631877ec9cbbf5c9b8fbc8
 SHA512:
-  metadata.gz: cb6b3ab49082434521372f91dbc3aaecffbee9840537cd095b10712d748d9ab042e89e5ddc6418d3d0b94b766e27df6288dd52339e99250a56538f5953b115db
-  data.tar.gz: 5ebf0e8bafad0d97d9e741cb51f7171be1337c6facaacb75e46afc148e488f1e91c516fa707d8450736ffc3232e6c098cbd8090dc8a4325c9e7600bda6b1ab36
+  metadata.gz: 9651c55c3be75ea4d99ca8577f6a205f3231f0930fef12bb4361824bcda99b9cf0e17bf53fe001f783fc0f843341c12fb160bea43c89520d5bfae3a1f2ba3e7a
+  data.tar.gz: d31e13aadf3cd4eeb66efc5b02d7425873d3035a1674da296c15ed71207599df852768d6f31b45cce04f67d9a8a85897876831a43a979a89d8133d7b877d8d0c

data/README.md

@@ -12,6 +12,7 @@ Features include:
 - Setup a SSH public key for authentication
 - Create a new user account during VPS creation
 - Create private network
+- Add VPS to private network
 - Rebuild VPS
 
 
@@ -97,6 +98,7 @@ The provider supports the following Vagrant sub-commands:
 - `vagrant reload` - Reboots the VPS instance.
 - `vagrant status` - Outputs the status (active, off, not created) for the VPS instance.
 - `vagrant create-network` - Creates private network.
+- `vagrant add-network` - Adds VPS to specified private network.
 - `vagrant rebuild` - Rebuilds the VPS.
 
 Troubleshooting

data/lib/vagrant-1cloud/actions.rb

@@ -22,15 +22,15 @@ module VagrantPlugins
           builder.use ConfigValidate
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
-            when :not_created
-              env[:ui].info I18n.t('vagrant_1cloud.info.not_created')
-            else
-              b.use Call, DestroyConfirm do |env2, b2|
-                if env2[:result]
-                  b2.use Destroy
-                  b2.use ProvisionerCleanup if defined?(ProvisionerCleanup)
+              when :not_created
+                env[:ui].info I18n.t('vagrant_1cloud.info.not_created')
+              else
+                b.use Call, DestroyConfirm do |env2, b2|
+                  if env2[:result]
+                    b2.use Destroy
+                    b2.use ProvisionerCleanup if defined?(ProvisionerCleanup)
+                  end
                 end
-              end
             end
           end
         end
@@ -41,12 +41,12 @@ module VagrantPlugins
           builder.use ConfigValidate
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
-            when :Active
-              b.use SSHExec
-            when :off
-              env[:ui].info I18n.t('vagrant_1cloud.info.off')
-            when :not_created
-              env[:ui].info I18n.t('vagrant_1cloud.info.not_created')
+              when :Active
+                b.use SSHExec
+              when :off
+                env[:ui].info I18n.t('vagrant_1cloud.info.off')
+              when :not_created
+                env[:ui].info I18n.t('vagrant_1cloud.info.not_created')
             end
           end
         end
@@ -73,14 +73,30 @@ module VagrantPlugins
           builder.use ConfigValidate
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
-            when :Active
-              b.use Provision
-              b.use ModifyProvisionPath
-              b.use SyncedFolders
-            when :off
-              env[:ui].info I18n.t('vagrant_1cloud.info.off')
-            when :not_created
-              env[:ui].info I18n.t('vagrant_1cloud.info.not_created')
+              when :Active
+                b.use Provision
+                b.use ModifyProvisionPath
+                b.use SyncedFolders
+              when :off
+                env[:ui].info I18n.t('vagrant_1cloud.info.off')
+              when :not_created
+                env[:ui].info I18n.t('vagrant_1cloud.info.not_created')
+            end
+          end
+        end
+      end
+
+      def self.addnet
+        return Vagrant::Action::Builder.new.tap do |builder|
+          builder.use ConfigValidate
+          builder.use Call, CheckState do |env, b|
+            case env[:machine_state]
+              when :Active
+                b.use PrivateNetwork
+              when :off
+                env[:ui].info I18n.t('vagrant_1cloud.info.off')
+              when :not_created
+                env[:ui].info I18n.t('vagrant_1cloud.info.not_created')
             end
           end
         end
@@ -91,18 +107,18 @@ module VagrantPlugins
           builder.use ConfigValidate
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
-            when :Active
-              env[:ui].info I18n.t('vagrant_1cloud.info.already_active')
-            when :off
-              b.use PowerOn
-              b.use provision
-            when :not_created
-              b.use SetupKey
-              b.use Create
-              b.use PrivateNetwork
-              b.use SetupSudo
-              b.use SetupUser
-              b.use provision
+              when :Active
+                env[:ui].info I18n.t('vagrant_1cloud.info.already_active')
+              when :off
+                b.use PowerOn
+                b.use provision
+              when :not_created
+                b.use SetupKey
+                b.use Create
+                b.use PrivateNetwork
+                b.use SetupSudo
+                b.use SetupUser
+                b.use provision
             end
           end
         end
@@ -113,16 +129,16 @@ module VagrantPlugins
           builder.use ConfigValidate
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
-            when :Active
-              if env[:force_halt] 
-                b.use PowerOff
-              else
-                b.use ShutDown
-              end
-            when :off
-              env[:ui].info I18n.t('vagrant_1cloud.info.already_off')
-            when :not_created
-              env[:ui].info I18n.t('vagrant_1cloud.info.not_created')
+              when :Active
+                if env[:force_halt]
+                  b.use PowerOff
+                else
+                  b.use ShutDown
+                end
+              when :off
+                env[:ui].info I18n.t('vagrant_1cloud.info.already_off')
+              when :not_created
+                env[:ui].info I18n.t('vagrant_1cloud.info.not_created')
             end
           end
         end
@@ -133,13 +149,13 @@ module VagrantPlugins
           builder.use ConfigValidate
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
-            when :Active
-              b.use Reload
-              b.use provision
-            when :off
-              env[:ui].info I18n.t('vagrant_1cloud.info.off')
-            when :not_created
-              env[:ui].info I18n.t('vagrant_1cloud.info.not_created')
+              when :Active
+                b.use Reload
+                b.use provision
+              when :off
+                env[:ui].info I18n.t('vagrant_1cloud.info.off')
+              when :not_created
+                env[:ui].info I18n.t('vagrant_1cloud.info.not_created')
             end
           end
         end

data/lib/vagrant-1cloud/actions/create.rb

@@ -24,7 +24,7 @@ module VagrantPlugins
             :RAM => @machine.provider_config.ram,
             :DCLocation => @machine.provider_config.region,
             :ImageID => @machine.provider_config.image,
-            :Name => @machine.config.vm.hostname || @machine.name,
+            :Name => @machine.name,
             :SshKeys => ssh_key_id,
             :isHighPerformance => @machine.provider_config.hi_perf
           }.delete_if { |k, v| v.nil? })
@@ -58,7 +58,7 @@ module VagrantPlugins
 
             ifdown -a
             export INTERFACE=eth0
-            export MATCHADDR=$(ifconfig -a | grep eth0 | awk '{print $NF}')
+            export MATCHADDR=$(ifconfig eth0 | awk 'NR==1{print $NF}')
             export MATCHID=$(udevadm info /sys/class/net/eth0 | grep P: | awk -F/ '{print $(NF-2)}')
             /lib/udev/write_net_rules
             udevadm control --reload-rules && udevadm trigger

data/lib/vagrant-1cloud/actions/destroy.rb

@@ -18,6 +18,7 @@ module VagrantPlugins
           @client.delete("/server/#{@machine.id}")
 
           env[:ui].info I18n.t('vagrant_1cloud.info.destroying')
+          @client.wait_for_destroy(env, @machine.id)
 
           # set the machine id to nil to cleanup local vagrant state
           @machine.id = nil

data/lib/vagrant-1cloud/actions/private_network.rb

@@ -26,8 +26,17 @@ module VagrantPlugins
 
             raise "Private network #{net} is not created" if !private_network
 
+            # Checking if machine is already added to network
+            result = @client.request("/server/#{@machine.id}")
+            linked_network = result['body']['LinkedNetworks'].find { |network| network['NetworkID'] == private_network['ID'] }
+
+            if linked_network
+                env[:ui].info I18n.t('vagrant_1cloud.info.already_connected', network: net)
+                next
+            end
+
             # Adding server to specified network
-            result = @client.post("/Server/#{@machine.id}/Action", {
+            result = @client.post("/server/#{@machine.id}/Action", {
                 :Type => "AddNetwork",
                 :NetworkID => private_network['ID']
             })

data/lib/vagrant-1cloud/commands/add_network.rb

@@ -0,0 +1,59 @@
+require 'optparse'
+
+module VagrantPlugins
+  module OneCloud
+    module Commands
+      class AddNetwork < Vagrant.plugin('2', :command)
+
+        # Show description when `vagrant list-commands` is triggered
+        def self.synopsis
+          "plugin: vagrant-1cloud: adds VPS to specific private network"
+        end
+
+        def execute
+          options = {}
+
+          optparse = OptionParser.new do |opts|
+            opts.banner = 'Usage: vagrant add-network [vm-name] [options]'
+
+            opts.on('-n', '--net NETNAME', 'Network name') do |net|
+              options[:Net] = net
+            end
+
+            options[:IP] = nil
+            opts.on('-i', '--ip [IP]', 'Private IP address') do |ip|
+              options[:IP] = ip
+            end
+
+            opts.on('-h', '--help', 'Display this screen') do
+              puts opts
+              exit
+            end
+          end
+
+          begin
+            optparse.parse!
+            mandatory = [:Net]
+            missing = mandatory.select{ |param| options[param].nil? }
+            unless missing.empty?
+              raise OptionParser::MissingArgument.new(missing.join(', '))
+            end
+          rescue OptionParser::InvalidOption, OptionParser::MissingArgument
+            puts $!.to_s
+            puts optparse
+            exit
+          end
+
+          argv = parse_options(optparse)
+
+          with_target_vms(argv) do |machine|
+            machine.provider_config.private_net = {options[:Net] => options[:IP]}
+            machine.action(:addnet)
+          end
+
+          0
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-1cloud/helpers/client.rb

@@ -94,6 +94,43 @@ module VagrantPlugins
           end
         end
 
+        def wait_for_destroy(env, id)
+          retryable(:tries => 400, :sleep => 10) do
+            # stop waiting if interrupted
+            next if env[:interrupted]
+
+            # check action status
+            begin
+              result = @client.send(:get) do |req|
+                req.url "/server/#{id}"
+                req.headers['Authorization'] = "Bearer #{@config.token}"
+              end
+            rescue Faraday::Error::ConnectionFailed => e
+              # TODO this is suspect but because faraday wraps the exception
+              #      in something generic there doesn't appear to be another
+              #      way to distinguish different connection errors :(
+              if e.message =~ /certificate verify failed/
+                raise Errors::CertificateError
+              end
+              raise e
+            end
+            begin
+              body = JSON.parse(%Q[{"body":#{result.body}}])
+              @logger.info "Response: #{body}"
+            rescue JSON::ParserError => e
+              raise(Errors::JSONError, {
+                  :message => e.message,
+                  :path => path,
+                  :params => params,
+                  :response => result.body
+              })
+            end
+            result = Result.new(body)
+            yield result if block_given?
+            raise 'Destroy is not completed' if result['body']['Message'] != 'Server not found'
+          end
+        end
+
         def wait_for_network(env, net_id)
           retryable(:tries => 400, :sleep => 10) do
             # stop waiting if interrupted

data/lib/vagrant-1cloud/plugin.rb

@@ -22,6 +22,11 @@ module VagrantPlugins
         Commands::Rebuild
       end
 
+      command("add-network") do
+        require_relative 'commands/add_network'
+        Commands::AddNetwork
+      end
+
       command("create-network") do
         require_relative 'commands/create_network'
         Commands::CreateNetwork

data/lib/vagrant-1cloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OneCloud
-    VERSION = '1.0.8'
+    VERSION = '1.1.0'
   end
 end

data/locales/en.yml

@@ -27,6 +27,7 @@ en:
       request: "Request: %{path}"
       params: "Parameters: %{params}"
       response: "Response: %{body}"
+      already_connected: "VPS is already connected to %{network} network"
     config:
       token: "Token is required"
       private_key: "SSH private key path is required"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-1cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - Bulat Yusupov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -79,6 +79,7 @@ files:
 - lib/vagrant-1cloud/actions/setup_sudo.rb
 - lib/vagrant-1cloud/actions/setup_user.rb
 - lib/vagrant-1cloud/actions/shut_down.rb
+- lib/vagrant-1cloud/commands/add_network.rb
 - lib/vagrant-1cloud/commands/create_network.rb
 - lib/vagrant-1cloud/commands/rebuild.rb
 - lib/vagrant-1cloud/config.rb