vagrant_filoo 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01d209f3223347ab6a53ec2e8a780933b5de19cf
-  data.tar.gz: 8d5ef55d30fec3f352fa31131c773c42ddcf28a6
+  metadata.gz: 12efe3a3e4db74434ea32a93b0547ffc8bc447e7
+  data.tar.gz: ae55dfdb5c7739676a41ed842910973d0ccf8c1d
 SHA512:
-  metadata.gz: c12e7747b81417ef62cc76a348763a806a43b76a73c18a24603df6c06f9779ca82d8d43b11aa233bafa9ec781faaa51e699bf7dfc70a15f19cb8463415046b85
-  data.tar.gz: fd549e5372956e5b3654015e8c8ea167aa32bd4214aea47968c9c9f66262f2ce9c56dde4c46c64bf1358cd4c2addee09569c1b23c67d7f46def9f163fd320863
+  metadata.gz: eaf643457f0d59dff07ca31df21eff65479f503cbac7c1ca63d5a3fa8f19a4a99c7c3090049f0445bd2476b2e7385084cd22f11955d5200e3b910f811f599c6a
+  data.tar.gz: 0fe12d2008eee79b91ea7b11686398200d78062b540b82cda806d386a94e808c71d6b85ee34c23a58fb3d9275d1fb603c714833a40ddc7e216e3e5a493e7e47a

data/README.md

@@ -1,4 +1,4 @@
-# vagrant_filoo 0.0.3
+# vagrant_filoo 0.0.4
 Vagrant filoo provisioner
 
 This is a Vagrant 1.7x plugin that adds an  provider for filoo hosting to Vagrant, allowing Vagrant to control and provision machines within the filoo public and private cloud.
@@ -55,7 +55,7 @@ Vagrant.configure("2") do |config|
    #filoo.filoo_api_key = ENV['FILOO_API_KEY']
 
    filoo.filoo_api_entry_point = "https://api.filoo.de/api/v1"
-   filoo.cd_image_name = "Debian 7.7 - 64bit"
+   filoo.cd_image_name = "Debian 8.0 - 64bit"
    filoo.type =  "dynamic"
    filoo.cpu = 1
    filoo.ram = 128
@@ -100,9 +100,10 @@ Vagrant.configure("2") do |config|
   # ... other stuff
 
   config.vm.provider :filoo do |filoo|
+    config.vm.hostname = "your-hostname"
     filoo.filoo_api_key = "foo"
     filoo.filoo_api_entry_point = "bar"
-    filoo.cd_image_name = "foo-bar"
+    filoo.cd_image_name = "SELECT FROM LIST BELOW"
   end
 end
 ```
@@ -126,7 +127,25 @@ Windows build: https://code.google.com/p/win-sshfs/
 See [Vagrant Synced folders: rsync](https://docs.vagrantup.com/v2/synced-folders/rsync.html)
 
 
-## Other Examples
+## filoo Images you can use
+
+* Debian 6.0 - 64bit
+* Endian 2.5.1 Firewall
+* BalanceNG V3.3 Loadbalancer
+* Ubuntu 12.04.4 LTS Server - 64bit
+* CentOS 6.3 - 64bit
+* Fedora 18 - 64bit
+* OpenSUSE 12.3 - 64bit
+* OpenSUSE 13.1 - 64bit
+* Fedora 20 - 64bit
+* Ubuntu 14.04 LTS Server - 64bit
+* CentOS 7.0 - 64bit
+* Debian 7.7 - 64bit
+* Debian 7.7 - 64bit + Froxlor
+* Ubuntu 15.04 Server - 64bit
+* Debian 8.0 - 64bit
+* OwnCloud 8.1.2 - 64 bit
+
 
 
 

data/lib/vagrant_filoo/action/create_server.rb

@@ -26,33 +26,15 @@ module VagrantPlugins
 
           imageId = "#{env[:images][config.cd_image_name]}".to_i
 
-          params = {
-            :type => config.type,
-            :cpu => config.cpu,
-            :ram => config.ram,
-            :hdd => config.hdd,
-            :cd_imageid => imageId,
-            :additional_nic => config.additional_nic
-          }
-
           env[:ui].info("vagrant_filoo creating_instance")
           env[:ui].info(" -- Type: #{config.type}")
           env[:ui].info(" -- CPUs: #{config.cpu}")
           env[:ui].info(" -- Ram: #{config.ram}")
           env[:ui].info(" -- Image Id: #{imageId}")
           env[:ui].info(" -- Image Name: #{config.cd_image_name}")
-          env[:result] = VagrantPlugins::Filoo::CloudCompute::createServer(params, @baseUrl, @apiKey)
+          env[:result] = VagrantPlugins::Filoo::CloudCompute::createServer(@baseUrl, @apiKey, config, imageId)
           env[:machine].id = env[:result]["vmid"]
           env[:ui].info(" -- Server created with config")
-          #env[:machine].name  = env[:result]["custom_vmname"]
-          #env[:result].each do |key, |
-          #  if value.kind_of?(String)
-          #    env[:ui].info("      #{key}: #{value}")
-          #  elsif value.kind_of?(Array)
-          #  elsif value.kind_of?(Hash)
-          #  end
-          #end
-          #env[:ui].info(" -- Server created, server state #{env[:result]}")
           env[:ui].info(" -- Server created with config")
           env[:ui].info(
             "#{JSON.pretty_generate(env[:result]).gsub!('{','').gsub!('}','').gsub!('"','').gsub!(',','').gsub!('[','').gsub!(']','')}")

data/lib/vagrant_filoo/cloud_compute.rb

@@ -24,7 +24,7 @@ module VagrantPlugins
       # Virtual Server Creation and checking #
       ########################################
 
-      CREATE_SERVER_TIMEOUT = 30
+      CREATE_SERVER_TIMEOUT = 300
       VALID_TYPES = ['dynamic','fixed']
       VALID_CPU_COUNTS = [1, 2, 3, 4, 5, 6, 7, 8]
       VALID_RAM = [128, 256, 512, 1024, 2048, 3072, 4096, 5120, 6144, 7186, 8192]
@@ -39,7 +39,15 @@ module VagrantPlugins
       #     -cd_imageid ID. Only for images with autoinstall=1.
       ####################################################################
 
-      def self.createServer(params, baseUrl, apiKey)
+      def self.createServer(baseUrl, apiKey, filooConfig, imageId)
+        params = {
+          :type => filooConfig.type,
+          :cpu => filooConfig.cpu,
+          :ram => filooConfig.ram,
+          :hdd => filooConfig.hdd,
+          :cd_imageid => imageId,
+          :additional_nic => filooConfig.additional_nic
+        }
         checkServerParams(params)
         createServerUrl = baseUrl +  CREATE_SERVER_RESOURCE
         jobId = call4JobId createServerUrl, apiKey, params
@@ -92,7 +100,9 @@ module VagrantPlugins
          end
          
          if params[:additional_nic]
-            self.addNic(vmid, baseUrl, apiKey)
+           self.addNic(vmid, baseUrl, apiKey)
+           self.stopInstance(vmid, baseUrl, apiKey)
+           self.startInstance(vmid, baseUrl, apiKey, filooConfig)
          end 
          serverStatus
       end
@@ -128,7 +138,7 @@ module VagrantPlugins
       end
       
       # Server removal
-      DELETE_SERVER_TIMEOUT = 30
+      DELETE_SERVER_TIMEOUT = 120
       
       def self.deleteServer(vmid, baseUrl, apiKey)
         deleteServereUrl = baseUrl +  DELETE_SERVER_RESOURCE
@@ -163,7 +173,7 @@ module VagrantPlugins
       
       # start server
       
-      START_INSTANCE_TIMEOUT = 60
+      START_INSTANCE_TIMEOUT = 120
       
       def self.startInstance(vmid, baseUrl, apiKey, filooConfig)
 
@@ -187,8 +197,14 @@ module VagrantPlugins
         
         if filooConfig.additional_nic && nicList.count < 1
           self.addNic(vmid, baseUrl, apiKey)
+          self.stopInstance(vmid, baseUrl, apiKey)
+          self.startInstance(vmid, baseUrl, apiKey, filooConfig)
         elsif !filooConfig.additional_nic && nicList.count > 0
-          self.deleteNic(vmid, baseUrl, apiKey)
+          raise VagrantPlugins::Filoo::Errors::ConfigError,
+                       message: "Provider parameter 'additional_nic' can not be reset to false, please set parameter 'additional_nic' back to true in Vagrantfile"
+          #self.deleteNic(vmid, baseUrl, apiKey)
+          #self.stopInstance(vmid, baseUrl, apiKey)
+          #self.startInstance(vmid, baseUrl, apiKey, filooConfig)
         end
         
         url = "#{baseUrl}#{START_RESOURCE}"
@@ -229,7 +245,7 @@ module VagrantPlugins
       
       # stop instance
       
-      STOP_INSTANCE_TIMEOUT = 60
+      STOP_INSTANCE_TIMEOUT = 120
       
       def self.stopInstance(vmid, baseUrl, apiKey)
         stopInstanceUrl = baseUrl +  STOP_RESOURCE
@@ -315,10 +331,9 @@ module VagrantPlugins
         rescue ArgumentError => e
           raise VagrantPlugins::Filoo::Errors::ConfigError, message: e.message
         end
-
       end
   
-      # add nic
+      # delete nic
       
       def self.deleteNic(vmid, baseUrl, apiKey)
 
@@ -327,7 +342,6 @@ module VagrantPlugins
         rescue ArgumentError => e
           raise VagrantPlugins::Filoo::Errors::ConfigError, message: e.message
         end
-
       end      
           
       # server status
@@ -468,6 +482,7 @@ module VagrantPlugins
          end
          sleep 3
        end
+       puts result
        result
      end
  
@@ -522,10 +537,11 @@ module VagrantPlugins
            end
            return   {:result => jobResult, :status => 'finished', jobid: jobId, job_command: returnVal['job_command'], job_param: returnVal['job_param']}
          when 'failed', 'aborted'
+           puts returnVal
            raise VagrantPlugins::Filoo::Errors::FilooJobFailedError,
-             jobid: returnVal['jobid'],
-             job_command: returnVal['job_command'],
-             job_param: returnVal['job_param'],
+             #jobid: returnVal['jobid'],
+             #job_command: returnVal['job_command'],
+             #job_param: returnVal['job_param'],
              message: "Job Execution Failed for Task #{returnVal['job_command']} with parameters #{returnVal['job_param']} and Job Id #{returnVal['jobid']}:" + resp.to_json
          when 'new', 'processing'
            return nil

data/lib/vagrant_filoo/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
     module Filoo
-        VERSION = '0.0.3'
+        VERSION = '0.0.4'
     end
 end

data/locales/en.yml

@@ -29,11 +29,9 @@ en:
           Error Code %{code}
           Description %{description}
       filoo_job_failed_error: |-
-          The remote processing of filoo job %{job_command} %{job_param} with uuid %{job_id} ended with status failed
+          The remote processing of filoo job ended with status failed or aborded
           Message %{message}
-          Command %{job_command}
-          Params %{job_param}
-          Job ID {job_id}
+          
       filoo_job_result_timeout_error: "The remote processing of filo job with uuid %{job_id} took more than the specified timeout of %{timeout} seconds. "
       gen_error: |-
           Configuration Error detected.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_filoo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Huf Secure Mobile GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client