fog-arubacloud 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 88c790de974160334d358ad8fad1e18dc2a9f5aa
-  data.tar.gz: 89521fecc210e6a731f9fb28767b3e0ca4fc77d7
+SHA256:
+  metadata.gz: ffa635004717fc04fec344b20fd32351155d890a61d81feb1a024de92ac818d0
+  data.tar.gz: 222d0047f68b9082a59e5d20a64226d2ce08726bc6ac82f036f0f205c2dd3b61
 SHA512:
-  metadata.gz: c7b017637c6468689aa1d7878c6ec53b44e6ae3b2565860a039629885ba24500902381102ead5828aa211cbfdefcf494d1ecf8d1bbd699e3ffc61572ca0a1225
-  data.tar.gz: a6b068a8d74e4c1c33e14d6267ee7fa2b099a812fe1a662ca4034fe768acc39c45d76835775b08aa9390dcac207027be646f419ea406f3bf8c60a99cb2015622
+  metadata.gz: 5bd96f4d0cf62987126ab6e59ad71df609b54dd344f9a1f67ddf857a138f62859f9301512a52b1fb86170e54f38e2dc663fb79ed217fbd4da91b77a136c29688
+  data.tar.gz: c14069bb59ab739dbe82f36ff9e76cded50b592e3ecb0b7a4cc6985caf19f2b883649baefbbf914971ff9b8c0e593f839ddfb07d4b9442c7a780c844a57e17b8

data/README.md

@@ -3,6 +3,7 @@
 [![Code Climate](https://codeclimate.com/github/fog/fog-arubacloud/badges/gpa.svg)](https://codeclimate.com/github/fog/fog-arubacloud)
 [![Test Coverage](https://codeclimate.com/github/fog/fog-arubacloud/badges/coverage.svg)](https://codeclimate.com/github/fog/fog-arubacloud/coverage)
 [![Gitter](https://badges.gitter.im/fog/fog-arubacloud.svg)](https://gitter.im/fog/fog-arubacloud?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=body_badge)
+[![Build Status](https://travis-ci.org/fog/fog-arubacloud.svg?branch=master)](https://travis-ci.org/fog/fog-arubacloud)
 
 Module for the 'fog' gem to support ArubaCloud IaaS Service
 
@@ -28,9 +29,8 @@ TODO: Write usage instructions here
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/fog-arubacloud/fork )
+1. Fork it ( https://github.com/fog/fog-arubacloud/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
-# fog-arubacloud
+5. Create new Pull Request

data/Rakefile

@@ -7,18 +7,112 @@ require 'rake/testtask'
 require File.dirname(__FILE__) + '/lib/fog/arubacloud'
 
 task :default => :test
-mock = ENV['FOG_MOCK'] || 'true'
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+GEM_NAME = "#{name}"
+
+def version
+  Fog::ArubaCloud::VERSION
+end
+
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
+def gemspec_file
+  "#{name}.gemspec"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+end
 
 Rake::TestTask.new do |t|
   t.pattern = File.join('spec', '**', '*_spec.rb')
   t.libs << 'spec'
+  t.verbose = true
 end
 
 namespace :test do
-  task :arubacloud_specs do
-    sh('export FOG_MOCK=false && bundle exec rspec spec/fog/arubacloud/*_spec.rb')
+  mock = 'true' || ENV['FOG_MOCK']
+  task :travis do
+    ENV['COVERAGE'] = 'false' if RUBY_PLATFORM == 'java'
+    sh("export FOG_MOCK=#{mock} && bundle exec rake")
+  end
+end
+
+task :release => %w(release:prepare release:publish)
+
+namespace :release do
+  task :preflight do
+    unless `git branch` =~ /^\* master$/
+      puts 'You must be on the master branch to release!'
+      exit!
+    end
+    if `git tag` =~ /^\* v#{version}$/
+      puts "Tag v#{version} already exists!"
+      exit!
+    end
+  end
+
+  task :prepare => :preflight do
+    Rake::Task[:build].invoke
+    sh "gem install pkg/#{name}-#{version}.gem"
+    Rake::Task[:git_mark_release].invoke
+  end
+
+  task :publish do
+    Rake::Task[:git_push_release].invoke
+    Rake::Task[:gem_push].invoke
+  end
+end
+
+task :git_mark_release do
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+end
+
+task :git_push_release do
+  sh 'git push origin master'
+  sh "git push origin v#{version}"
+end
+
+task :gem_push do
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+desc "Build fog-#{version}.gem"
+task :build => :gemspec do
+  sh 'mkdir -p pkg'
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} gemfiles"
+end
+task :gem => :build
+
+desc "Updates the gemspec and runs 'validate'"
+task :gemspec => :validate do
+  spec = File.read(gemspec_file)
+
+  replace_header(spec, :name)
+  replace_header(spec, :version)
+  replace_header(spec, :date)
+
+  File.open(gemspec_file, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec_file}"
+end
+
+desc 'Run before pushing out the code'
+task :validate do
+  libfiles = Dir['lib/*'] - %W(lib/#{name}.rb lib/#{name} lib/tasks)
+  unless libfiles.empty?
+    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+    #exit!
   end
-  task :travis => [:arubacloud_specs] do
-    sh("export FOG_MOCK=#{mock} && bundle exec shindont")
+  unless Dir['VERSION*'].empty?
+    puts 'A `VERSION` file at root level violates Gem best practices.'
+    exit!
   end
 end

data/{lib/fog/arubacloud/examples → examples}/create_pro_server.rb

@@ -29,12 +29,12 @@ rnd_string = SecureRandom.hex(2)
 
 # Create a Pro VM
 ## Create first disk
-disk0 = service.disks.create({
+disk0 = service.disks.create_loadbalancer({
                                  :size => 20,
                                  :virtual_disk_type => 0
                              }).get_hash
 ## Create second disk
-disk1 = service.disks.create({
+disk1 = service.disks.create_loadbalancer({
                                  :size => 30,
                                  :virtual_disk_type => 1
                              }).get_hash
@@ -42,7 +42,7 @@ disk1 = service.disks.create({
 disks = [disk0, disk1]
 
 ## Create the virtual machine
-server = service.servers.create({
+server = service.servers.create_loadbalancer({
                                     :name           => "testpro#{rnd_string}",
                                     :vm_type        => 'pro',
                                     :admin_passwd   => 'Prova123',

data/{lib/fog/arubacloud/examples → examples}/get_objects.rb

@@ -11,7 +11,7 @@ require 'optparse'
 
 options = {}
 OptionParser.new do |opts|
-  opts.banner = 'Usage: get_servers.rb [options]'
+  opts.banner = 'Usage: get_objects.rb [options]'
   opts.on('-uUSERNAME', '--username=USERNAME', 'ArubaCloud Username') { |n| options[:username] = n}
   opts.on('-pPASSWORD', '--password=PASSWORD', 'ArubaCloud Password') { |p| options[:password] = p}
 end.parse!

data/{lib/fog/arubacloud/examples → examples}/vm_operations.rb

@@ -29,7 +29,7 @@ servers = service.servers
 # Poweroff and delete every VM in a Datacenter
 servers.each do |s|
   puts("Powering Off and Deleting VM: #{s.name}...")
-  next if s.state == Fog::Compute::ArubaCloud::Server::CREATING
+  next if s.state == Fog::ArubaCloud::Compute::Server::CREATING
   s.power_off unless s.stopped?
   until s.stopped?
     s.get_server_details

data/fog-arubacloud.gemspec

@@ -5,13 +5,13 @@ require 'fog/arubacloud/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'fog-arubacloud'
-  spec.version       = Fog::Arubacloud::VERSION
-  spec.authors       = ['Alessio Rocchi']
-  spec.email         = ['alessio.rocchi@staff.aruba.it']
+  spec.version       = Fog::ArubaCloud::VERSION
+  spec.authors       = ['Aruba S.p.A.']
+  spec.email         = ['cloudsdk@staff.aruba.it']
   spec.summary       = %q{Module for the 'fog' gem to support ArubaCloud}
   spec.description   = %q{This library can be used as a module for 'fog' or a standalone provider to use
                        the ArubaCloud IaaS in applications}
-  spec.homepage      = 'https://www.github.com/blackms/fog-arubacloud'
+  spec.homepage      = 'https://www.github.com/ArubaCloud/fog-arubacloud'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'fog-core'
-  spec.add_dependency 'fog-json'
+  spec.add_runtime_dependency 'fog-core', '~> 1.32'
+  spec.add_runtime_dependency 'fog-json', '~> 1.0'
 
-  spec.add_development_dependency('bundler')
-  spec.add_development_dependency('rake')
-  spec.add_development_dependency('rspec')
-  spec.add_development_dependency('webmock')
-  spec.add_development_dependency('shindo')
-  spec.add_development_dependency('minitest')
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'shindo'
+  spec.add_development_dependency 'minitest'
 end

data/lib/fog/arubacloud/compute/models/custom_template.rb

@@ -0,0 +1,60 @@
+# coding: utf-8
+#
+# Author:: Dangleterre Michaël
+# © Copyright ArubaCloud.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/model'
+require 'fog/arubacloud/error'
+
+
+module Fog
+  module ArubaCloud
+    class Compute
+      class Custom_Template < Fog::Model
+        identity :id,  :aliases => 'id'
+
+        attribute :appliancetypeid, :aliases => 'appliancetypeid'
+        attribute :architecturetypeid, :aliases => 'architecturetypeid'
+        attribute :osfamilyid, :aliases => 'osfamilyid'
+        attribute :osversion, :aliases => 'osversion'
+        attribute :revision, :aliases => 'revision'
+        attribute :defaultvalue, :aliases => 'defaultvalue'
+        attribute :maxvalue, :aliases => 'maxvalue'
+        attribute :minvalue, :aliases => 'minvalue'
+        attribute :resourcetype, :aliases => 'resourcetype'
+        attribute :templateboundid, :aliases => 'templateboundid'
+        attribute :templatedescription, :aliases => 'templatedescription'
+        attribute :templateexternaldescription, :aliases => 'templateexternaldescription'
+        attribute :templatepassword, :aliases => 'templatepassword'
+        attribute :templateusername, :aliases => 'templateusername'
+        attribute :virtualmachineid, :aliases => 'virtualmachineid'
+
+        def initialize(attributes = {})
+          @service = attributes[:service]
+        end # initialize
+
+        def create
+          requires :appliancetypeid, :architecturetypeid, :osfamilyid, :osversion, :revision, :defaultvalue, :maxvalue, :minvalue, :resourcetype, :templateboundid,:templatedescription, :templateexternaldescription, :templatepassword, :templateusername, :virtualmachineid
+          data = :attributes
+          service.create_custom_template(data)
+        end # create
+
+        def edit
+          requires :appliancetypeid, :architecturetypeid, :osfamilyid, :osversion, :revision, :defaultvalue, :maxvalue, :minvalue, :resourcetype, :templateboundid,:templatedescription, :templateexternaldescription, :templatepassword, :templateusername, :virtualmachineid
+          data = :attributes
+          service.edit_custom_template(data)
+        end # edit
+
+        def delete
+          requires :id
+          data = :attributes
+          service.delete_custom_template(data)
+        end # delete
+
+      end # Custom_Template
+    end # Compute
+  end # ArubaCloud
+end # Fog

data/lib/fog/arubacloud/compute/models/custom_templates.rb

@@ -0,0 +1,19 @@
+#
+# Author:: Dangleterre Michaël
+# © Copyright ArubaCloud.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/collection'
+require 'fog/arubacloud/compute/models/custom_templates'
+
+module Fog
+  module ArubaCloud
+    class Compute
+      class Custom_Templates < Fog::Collection
+        model Fog::ArubaCloud::Compute::Custom_Templates
+      end
+    end
+  end
+end

data/lib/fog/arubacloud/{models/compute → compute/models}/disk.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 #
 # Author:: Alessio Rocchi (<alessio.rocchi@staff.aruba.it>)
 # © Copyright ArubaCloud.
@@ -9,8 +10,8 @@ require 'fog/core/model'
 require 'fog/arubacloud/error'
 
 module Fog
-  module Compute
-    class ArubaCloud
+  module ArubaCloud
+    class Compute
       class Disk < Fog::Model
         attribute :size
         attribute :virtual_disk_type
@@ -42,6 +43,6 @@ module Fog
         end
 
       end #Disk
-    end #ArubaCloud
-  end #Compute
-end #Fog
+    end # Compute
+  end # ArubaCloud
+end #Fog

data/lib/fog/arubacloud/{models/compute → compute/models}/disks.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 #
 # Author:: Alessio Rocchi (<alessio.rocchi@staff.aruba.it>)
 # © Copyright ArubaCloud.
@@ -6,14 +7,13 @@
 #
 
 require 'fog/core/collection'
-require 'fog/arubacloud/models/compute/ip'
+require 'fog/arubacloud/compute/models/disk'
 
 module Fog
-  module Compute
-    class ArubaCloud
-
+  module ArubaCloud
+    class Compute
       class Disks < Fog::Collection
-        model Fog::Compute::ArubaCloud::Disk
+        model Fog::ArubaCloud::Compute::Disk
 
         # Dummy Method, only to maintain fog structure, it returns nothings.
         # @return [Nil]
@@ -26,6 +26,6 @@ module Fog
         end
       end #Disks
 
-    end #ArubaCloud
-  end #Compute
+    end # Compute
+  end # ArubaCloud
 end #Fog

data/lib/fog/arubacloud/{models/compute → compute/models}/ip.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 #
 # Author:: Alessio Rocchi (<alessio.rocchi@staff.aruba.it>)
 # © Copyright ArubaCloud.
@@ -9,8 +10,8 @@ require 'fog/core/model'
 require 'fog/arubacloud/error'
 
 module Fog
-  module Compute
-    class ArubaCloud
+  module ArubaCloud
+    class Compute
       class IP < Fog::Model
         identity :id, :aliases => 'ResourceId'
 
@@ -40,6 +41,6 @@ module Fog
         end
 
       end #IP
-    end #ArubaCloud
-  end #Compute
-end #Fog
+    end # Compute
+  end # ArubaCloud
+end #Fog

data/lib/fog/arubacloud/{models/compute → compute/models}/ips.rb

@@ -6,17 +6,17 @@
 #
 
 require 'fog/core/collection'
-require 'fog/arubacloud/models/compute/ip'
+require 'fog/arubacloud/compute/models/ip'
 
 module Fog
-  module Compute
-    class ArubaCloud
+  module ArubaCloud
+    class Compute
 
       class Ips < Fog::Collection
-        model Fog::Compute::ArubaCloud::IP
+        model Fog::ArubaCloud::Compute::IP
 
         # Returns list of Ip Addresses
-        # @return [Fog::Compute::ArubaCloud::Ips]
+        # @return [Fog::ArubaCloud::Compute::Ips]
         # @raise [Fog::ArubaCloud::Errors::NotFound]
         def all
           data = service.get_purchased_ip_addresses
@@ -26,7 +26,7 @@ module Fog
 
         # Returns a single IpAddress object
         # @param ip [String]
-        # @return [Fog::Compute::ArubaCloud::IP]
+        # @return [Fog::ArubaCloud::Compute::IP]
         # @raise [Fog::ArubaCloud::Errors::NotFound]
         def get(ip)
           # TODO: Implement single item retrieve

data/lib/fog/arubacloud/compute/models/loadbalancer.rb

@@ -0,0 +1,135 @@
+# coding: utf-8
+#
+# Author:: Dangleterre Michaël
+# © Copyright ArubaCloud.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/model'
+require 'fog/arubacloud/error'
+
+module Fog
+  module ArubaCloud
+    class Compute
+      class LoadBalancer < Fog::Model
+        identity :id, :aliases => 'id'
+
+        attribute :name, :aliases => 'name'
+        #attribute :rules, :aliases => 'rules'
+        attribute :starttime, :aliases => 'starttime'
+        attribute :endtime, :aliases => 'endtime'
+        attribute :ipaddress, :aliases => 'ipaddress'
+        attribute :notificationcontacts, :aliases => 'notificationcontacts'
+        attribute :contactvalue, :aliases => 'ContactValue'
+        attribute :loadbalancercontactid, :aliases => 'LoadBalancerContactID'
+        attribute :type, :aliases => 'type'
+        attribute :contactid, :aliases => 'contactid'
+        attribute :ipaddressesresourceid, :aliases => 'ipaddressesresourceid'
+        attribute :healthchecknotification, :aliases => 'healthchecknotification'
+        attribute :newrule, :aliases => 'newrule'
+        attribute :ruleid, :aliases => 'ruleid'
+        attribute :balancetype, :aliases => 'balancetype'
+        attribute :certificate, :aliases => 'certificate'
+        attribute :creationdate, :aliases => 'creationdate'
+        attribute :instanceport, :aliases => 'instanceport'
+        attribute :loadbalancerport, :aliases => 'loadbalancerport'
+        attribute :protocol, :aliases => 'protocol'
+
+        ignore_attributes :loadbalancerclassofserviceid, :rules
+
+        def initialize(attributes = {})
+          @service = attributes[:service]
+          super
+        end # initialize
+
+        def create_loadbalancer
+          requires :name, :ipaddressesresourceid, :balancetype, :certificate, :creationdate, :ruleid, :instanceport,
+                   :loadbalancerport, :protocol, :contactvalue, :loadbalancercontactid, :type
+          data = attributes
+          service.create_loadbalancer(data)
+        end # create
+
+        def remove_loadbalancer
+          requires :id
+          data = attributes
+          service.remove_loadbalancer(data)
+        end # remove
+
+        def get_loadbalancer
+          requires :id
+          response = service.get_loadbalancer(id)
+          new_attributes = response['Value']
+          merge_attributes(new_attributes)
+        end # get
+
+        def modify_loadbalancer
+          requires :id, :name, :healthchecknotification
+          data = attributes
+          service.modify_loadbalancer(data)
+        end # edit
+
+        def get_lb_stats
+          requires :id, :starttime, :endtime
+          data = attributes
+          response = service.get_lb_stats(data)
+          new_attributes = response['Value']
+          merge_attributes(new_attributes)
+        end # get stats
+
+        def get_lb_loads
+          requires :id, :starttime, :endtime
+          data = attributes
+          response = service.get_lb_loads(data)
+          new_attributes = response['Value']
+          merge_attributes(new_attributes)
+        end # get loads
+
+        def add_lb_rule
+          requires :id, :newrule
+          data = attributes
+          service.add_lb_rule(data)
+        end # add rule
+
+        def remove_instance
+          requires :id, :ipaddress
+          data = attributes
+          service.remove_instance(data)
+        end # remove instance
+
+        def add_instance
+          requires :id, :ipaddress
+          data = attributes
+          service.add_instance(data)
+        end # add instance
+
+        def get_notifications
+          requires :id, :starttime, :endtime, :ruleid
+          data = attributes
+          response = service.get_notifications(data)
+          new_attributes = response['Value']
+          merge_attributes(new_attributes)
+        end # get notifications
+
+        def add_contact
+          requires :id, :notificationcontacts
+          data = attributes
+          service.add_contact(data)
+        end # add contact
+
+        def remove_contact
+          requires :id, :contactid
+          data = attributes
+          service.remove_contact(data)
+        end # remove contact
+
+        def enable_loadbalancer
+          requires :id
+          data = attributes
+          service.enable_loadbalancer(data)
+        end
+
+      end # LoadBalancer
+    end # Compute
+  end # ArubaCloud
+end # Fog

data/lib/fog/arubacloud/compute/models/loadbalancers.rb

@@ -0,0 +1,21 @@
+# coding: utf-8
+#
+# Author:: Dangleterre Michaël
+# © Copyright ArubaCloud.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/collection'
+require 'fog/arubacloud/compute/models/loadbalancer'
+
+
+module Fog
+  module ArubaCloud
+    class Compute
+      class LoadBalancers < Fog::Collection
+        model Fog::ArubaCloud::Compute::LoadBalancer
+      end # Load Balancers
+    end # Compute
+  end # ArubaCloud
+end # Fog

data/lib/fog/arubacloud/{models/compute → compute/models}/network_adapter.rb

@@ -9,8 +9,8 @@ require 'fog/core/model'
 require 'fog/arubacloud/error'
 
 module Fog
-  module Compute
-    class ArubaCloud
+  module ArubaCloud
+    class Compute
       class NetworkAdapter < Fog::Model
         identity :id, :aliases => 'Id'
 

data/lib/fog/arubacloud/{models/compute → compute/models}/network_adapters.rb

@@ -6,14 +6,14 @@
 #
 
 require 'fog/core/collection'
-require 'fog/arubacloud/models/compute/network_adapter'
+require 'fog/arubacloud/compute/models/network_adapter'
 
 
 module Fog
-  module Compute
-    class ArubaCloud
+  module ArubaCloud
+    class Compute
       class NetworkAdapters < Fog::Collection
-        model Fog::Compute::ArubaCloud::NetworkAdapter
+        model Fog::ArubaCloud::Compute::NetworkAdapter
       end
     end
   end